Skip to content

Commit 7eadd63

Browse files
committed
-
1 parent 5029ea5 commit 7eadd63

File tree

2 files changed

+9
-20
lines changed

2 files changed

+9
-20
lines changed

source_py2/python_toolbox/_bootstrap/bootstrap.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,15 @@
66
### Confirming correct Python version: ########################################
77
# #
88
if sys.version_info[0] >= 3:
9-
raise Exception("Python 3.x is not supported, only Python 2.6 and Python "
10-
"2.7.")
9+
raise Exception("This is a Python 2.x distribution of `python_toolbox`, "
10+
"and you're using Python 3.x. Please get the Python 3.x "
11+
"distribution.")
1112
if sys.version_info[1] <= 5:
1213
raise Exception(
1314
"You're using Python <= 2.5, but this package requires either Python "
14-
"2.6 or Python 2.7, so you can't use it unless you upgrade your "
15-
"Python version."
15+
"2.6 or Python 2.7, (or Python 3.3+ on a different distribution,) so "
16+
"you can't use it unless you upgrade your Python version."
1617
)
1718
# #
1819
### Finished confirming correct Python version. ###############################
1920

20-
21-
#frozen = getattr(sys, 'frozen', None)
22-
#is_pypy = ('__pypy__' in sys.builtin_module_names)

source_py3/python_toolbox/_bootstrap/bootstrap.py

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,9 @@
55

66
### Confirming correct Python version: ########################################
77
# #
8-
if sys.version_info[0] >= 3:
9-
raise Exception("Python 3.x is not supported, only Python 2.6 and Python "
10-
"2.7.")
11-
if sys.version_info[1] <= 5:
12-
raise Exception(
13-
"You're using Python <= 2.5, but this package requires either Python "
14-
"2.6 or Python 2.7, so you can't use it unless you upgrade your "
15-
"Python version."
16-
)
8+
if sys.version_info[0] >= 2:
9+
raise Exception("This is a Python 3.x distribution of `python_toolbox`, "
10+
"and you're using Python 2.x. Please get the Python 2.x "
11+
"distribution.")
1712
# #
1813
### Finished confirming correct Python version. ###############################
19-
20-
21-
#frozen = getattr(sys, 'frozen', None)
22-
#is_pypy = ('__pypy__' in sys.builtin_module_names)

0 commit comments

Comments
 (0)