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()
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