Merge pull request #457 from jmadler/bug276

Future-proof for Py4.0

Author: jmadler

src/future/backports/__init__.py

@@ -10,7 +10,7 @@
 from future.standard_library import import_top_level_modules
 
 
-if sys.version_info[0] == 3:
+if sys.version_info[0] >= 3:
     import_top_level_modules()
 
 

src/future/moves/__init__.py

@@ -4,5 +4,5 @@
 __future_module__ = True
 from future.standard_library import import_top_level_modules
 
-if sys.version_info[0] == 3:
+if sys.version_info[0] >= 3:
     import_top_level_modules()

src/future/utils/__init__.py

@@ -55,7 +55,7 @@
 import inspect
 
 
-PY3 = sys.version_info[0] == 3
+PY3 = sys.version_info[0] >= 3
 PY35_PLUS = sys.version_info[0:2] >= (3, 5)
 PY36_PLUS = sys.version_info[0:2] >= (3, 6)
 PY2 = sys.version_info[0] == 2

src/html/parser.py

@@ -2,7 +2,7 @@
 import sys
 __future_module__ = True
 
-if sys.version_info[0] == 3:
+if sys.version_info[0] >= 3:
     raise ImportError('Cannot import module from python-future source folder')
 else:
     from future.moves.html.parser import *

src/past/translation/__init__.py

@@ -432,7 +432,7 @@ def install_hooks(include_paths=(), exclude_paths=()):
     _hook.include(include_paths)
     _hook.exclude(exclude_paths)
     # _hook.debug = debug
-    enable = sys.version_info[0] >= 3   # enabled for all 3.x
+    enable = sys.version_info[0] >= 3   # enabled for all 3.x+
     if enable and _hook not in sys.meta_path:
         sys.meta_path.insert(0, _hook)  # insert at beginning. This could be made a parameter
 

src/past/utils/__init__.py

@@ -16,7 +16,7 @@
 import sys
 import numbers
 
-PY3 = sys.version_info[0] == 3
+PY3 = sys.version_info[0] >= 3
 PY2 = sys.version_info[0] == 2
 PYPY = hasattr(sys, 'pypy_translation_info')