Skip to content

Future-proof for Py4.0 #457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 6, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/future/backports/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()


Expand Down
2 changes: 1 addition & 1 deletion src/future/moves/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
2 changes: 1 addition & 1 deletion src/future/utils/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/html/parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 *
2 changes: 1 addition & 1 deletion src/past/translation/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/past/utils/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down