From d46114296993eb52fbe96e5cfc198c181c1ee665 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20de=20Chaumont=20Quitry?= Date: Tue, 7 Jan 2020 11:27:31 +0100 Subject: [PATCH 1/2] When available, use inspect.getfullargspec instead of inspect.getargspec. The former is only available in Python3, in which getargspec was deprecated. This allows to get rid of a deprecation warning. Both return a namedtuple with an equivalent "args" attribute, so the functionality is unchanged. --- .../backend/event_processing/event_file_loader.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tensorboard/backend/event_processing/event_file_loader.py b/tensorboard/backend/event_processing/event_file_loader.py index 3a1d52bdf0..74f228d15d 100644 --- a/tensorboard/backend/event_processing/event_file_loader.py +++ b/tensorboard/backend/event_processing/event_file_loader.py @@ -60,10 +60,14 @@ def Load(self): """ logger.debug("Loading events from %s", self._file_path) + # getargspec is deprecated in Python3, use getfullargspec if it exists. + try: + getmaybefullargspec = inspect.getfullargspec + except AttributeError: + getmaybefullargspec = inspect.getargspec # pylint: disable=deprecated-method + # GetNext() expects a status argument on TF <= 1.7. - get_next_args = inspect.getargspec( - self._reader.GetNext - ).args # pylint: disable=deprecated-method + get_next_args = getmaybefullargspec(self._reader.GetNext).args # First argument is self legacy_get_next = len(get_next_args) > 1 From 58e9f5cf6e9152b2cc5a806d8734f8652bef3ada Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20de=20Chaumont=20Quitry?= Date: Tue, 7 Jan 2020 11:47:39 +0100 Subject: [PATCH 2/2] Changes so that black --check succeeds. --- tensorboard/backend/event_processing/event_file_loader.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tensorboard/backend/event_processing/event_file_loader.py b/tensorboard/backend/event_processing/event_file_loader.py index 74f228d15d..7f9b9ac273 100644 --- a/tensorboard/backend/event_processing/event_file_loader.py +++ b/tensorboard/backend/event_processing/event_file_loader.py @@ -62,12 +62,12 @@ def Load(self): # getargspec is deprecated in Python3, use getfullargspec if it exists. try: - getmaybefullargspec = inspect.getfullargspec + getargspec = inspect.getfullargspec except AttributeError: - getmaybefullargspec = inspect.getargspec # pylint: disable=deprecated-method + getargspec = inspect.getargspec # pylint: disable=deprecated-method # GetNext() expects a status argument on TF <= 1.7. - get_next_args = getmaybefullargspec(self._reader.GetNext).args + get_next_args = getargspec(self._reader.GetNext).args # First argument is self legacy_get_next = len(get_next_args) > 1