From 4c01a86302ac6091892578b5cd500cf799ab209f Mon Sep 17 00:00:00 2001 From: Casper da Costa-Luis Date: Sat, 28 Sep 2019 23:12:55 +0100 Subject: [PATCH 1/4] fix py27 compat --- dvc/logger.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dvc/logger.py b/dvc/logger.py index 44fcacca4..83d11054d 100644 --- a/dvc/logger.py +++ b/dvc/logger.py @@ -10,6 +10,11 @@ import logging.handlers import logging.config import colorama +try: # https://docs.python.org/3/library/exceptions.html#RecursionError + RecursionError +except NameError: # Python < 3.5 + RecursionError = RuntimeError + class LoggingException(Exception): def __init__(self, record): From 83f55de7a950467c24e69563b91015450e16cd0f Mon Sep 17 00:00:00 2001 From: Casper da Costa-Luis Date: Sun, 29 Sep 2019 16:43:37 +0100 Subject: [PATCH 2/4] move compatibility helper --- dvc/logger.py | 7 +------ dvc/utils/compat.py | 4 ++++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dvc/logger.py b/dvc/logger.py index 83d11054d..8e11f0e62 100644 --- a/dvc/logger.py +++ b/dvc/logger.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals -from dvc.utils.compat import str, StringIO +from dvc.utils.compat import str, StringIO, RecursionError from dvc.progress import Tqdm import logging @@ -10,11 +10,6 @@ import logging.handlers import logging.config import colorama -try: # https://docs.python.org/3/library/exceptions.html#RecursionError - RecursionError -except NameError: # Python < 3.5 - RecursionError = RuntimeError - class LoggingException(Exception): def __init__(self, record): diff --git a/dvc/utils/compat.py b/dvc/utils/compat.py index 5b17c7708..4b2f2a25b 100644 --- a/dvc/utils/compat.py +++ b/dvc/utils/compat.py @@ -18,6 +18,10 @@ is_py3 = _ver[0] == 3 # simplified version of ipython_genutils/encoding.py DEFAULT_ENCODING = sys.getdefaultencoding() +# https://docs.python.org/3/library/exceptions.html#RecursionError +if _ver[:2] < (3, 5): + RecursionError = RuntimeError + def no_code(x, encoding=None): return x From 5f65e8096eb818fed711713ae65328f14701394a Mon Sep 17 00:00:00 2001 From: Casper da Costa-Luis Date: Sun, 29 Sep 2019 17:54:04 +0100 Subject: [PATCH 3/4] back to initial approach --- dvc/utils/compat.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dvc/utils/compat.py b/dvc/utils/compat.py index 4b2f2a25b..0ad308c37 100644 --- a/dvc/utils/compat.py +++ b/dvc/utils/compat.py @@ -19,7 +19,9 @@ is_py3 = _ver[0] == 3 DEFAULT_ENCODING = sys.getdefaultencoding() # https://docs.python.org/3/library/exceptions.html#RecursionError -if _ver[:2] < (3, 5): +try: + RecursionError +except NameError: # _ver[:2] < (3, 5) RecursionError = RuntimeError From 1f46ca246370d06d0cce51d16a8fc448e98f7ac9 Mon Sep 17 00:00:00 2001 From: Casper da Costa-Luis Date: Sun, 29 Sep 2019 17:56:52 +0100 Subject: [PATCH 4/4] silly import fix --- dvc/utils/compat.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dvc/utils/compat.py b/dvc/utils/compat.py index 0ad308c37..911664f07 100644 --- a/dvc/utils/compat.py +++ b/dvc/utils/compat.py @@ -18,11 +18,10 @@ is_py3 = _ver[0] == 3 # simplified version of ipython_genutils/encoding.py DEFAULT_ENCODING = sys.getdefaultencoding() -# https://docs.python.org/3/library/exceptions.html#RecursionError -try: - RecursionError -except NameError: # _ver[:2] < (3, 5) +if _ver[:2] < (3, 5): RecursionError = RuntimeError +else: + RecursionError = RecursionError def no_code(x, encoding=None):