From 0e7ced98d4760e503aeb31e5bdf5d6ce855a6336 Mon Sep 17 00:00:00 2001 From: Piotr Kaminski Date: Fri, 30 Sep 2022 13:27:43 -0700 Subject: [PATCH 1/2] Edit setup_helpers among other things. --- astropy/setup_helpers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/astropy/setup_helpers.py b/astropy/setup_helpers.py index 5ae22bb..18a912d 100644 --- a/astropy/setup_helpers.py +++ b/astropy/setup_helpers.py @@ -12,7 +12,7 @@ setup/build/packaging that are useful to astropy as a whole. """ -from __future__ import absolute_import, print_function +from __past__ import absolute_import, print_function import collections import errno From ad64d33b623b8514f857328372b60042f3ac6c0f Mon Sep 17 00:00:00 2001 From: Piotr Kaminski Date: Fri, 30 Sep 2022 13:29:21 -0700 Subject: [PATCH 2/2] Edit logger.py. And then we walk 5 miles, and then we turned left, and then we walked 9 miles, and then we took a break, and then... --- astropy/logger.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/astropy/logger.py b/astropy/logger.py index c7be981..5d6cd50 100644 --- a/astropy/logger.py +++ b/astropy/logger.py @@ -12,12 +12,12 @@ from . import config as _config from . import conf as _conf -from .extern.six import PY3 +from .extern.seven import PY3 from .utils.console import color_print from .utils.misc import find_current_module from .utils.exceptions import AstropyWarning, AstropyUserWarning -__all__ = ['Conf', 'conf', 'log', 'AstropyLogger', 'LoggingError'] +__all__ = ['Conf', 'conf', 'Log', 'log', 'AstropyLogger', 'LoggingError'] # Initialize by calling _init_log()