Skip to content

Commit 4de6dc8

Browse files
authored
Merge pull request #457 from jmadler/bug276
Future-proof for Py4.0
2 parents d94fb35 + 23989c4 commit 4de6dc8

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

src/future/backports/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from future.standard_library import import_top_level_modules
1111

1212

13-
if sys.version_info[0] == 3:
13+
if sys.version_info[0] >= 3:
1414
import_top_level_modules()
1515

1616

src/future/moves/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
__future_module__ = True
55
from future.standard_library import import_top_level_modules
66

7-
if sys.version_info[0] == 3:
7+
if sys.version_info[0] >= 3:
88
import_top_level_modules()

src/future/utils/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
import inspect
5656

5757

58-
PY3 = sys.version_info[0] == 3
58+
PY3 = sys.version_info[0] >= 3
5959
PY35_PLUS = sys.version_info[0:2] >= (3, 5)
6060
PY36_PLUS = sys.version_info[0:2] >= (3, 6)
6161
PY2 = sys.version_info[0] == 2

src/html/parser.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import sys
33
__future_module__ = True
44

5-
if sys.version_info[0] == 3:
5+
if sys.version_info[0] >= 3:
66
raise ImportError('Cannot import module from python-future source folder')
77
else:
88
from future.moves.html.parser import *

src/past/translation/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ def install_hooks(include_paths=(), exclude_paths=()):
432432
_hook.include(include_paths)
433433
_hook.exclude(exclude_paths)
434434
# _hook.debug = debug
435-
enable = sys.version_info[0] >= 3 # enabled for all 3.x
435+
enable = sys.version_info[0] >= 3 # enabled for all 3.x+
436436
if enable and _hook not in sys.meta_path:
437437
sys.meta_path.insert(0, _hook) # insert at beginning. This could be made a parameter
438438

src/past/utils/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import sys
1717
import numbers
1818

19-
PY3 = sys.version_info[0] == 3
19+
PY3 = sys.version_info[0] >= 3
2020
PY2 = sys.version_info[0] == 2
2121
PYPY = hasattr(sys, 'pypy_translation_info')
2222

0 commit comments

Comments
 (0)