Skip to content

Commit 86f90e3

Browse files
cool-RRcool-RR
committed
-
1 parent 7eadd63 commit 86f90e3

File tree

14 files changed

+15
-646
lines changed

14 files changed

+15
-646
lines changed

‎README.markdown‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ If you want to be informed on new releases of the Python Toolbox, sign up for
5858

5959
# Python versions #
6060

61-
The Python Toolbox supports Python versions 2.6 and 2.7.
61+
The Python Toolbox supports Python versions 2.7 and 3.3+.
6262

63-
It's tested on both CPython and PyPy 2.1. (Which runs Python 2.7.)
63+
It's tested on both CPython and PyPy 2.1.
6464

6565
# Current state #
6666

‎docs/installation.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Installing the Python Toolbox
1313
Requirements
1414
============
1515

16-
* Python, version 2.6 or 2.7 or above. If you're new to Python, `download
16+
* Python, version 2.7 or 3.3 or above. If you're new to Python, `download
1717
version 2.7 <http://python.org/download/releases/2.7.2>`_.
1818

1919
* `Setuptools`_.

‎setup.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111

1212
### Confirming correct Python version: ########################################
1313
# #
14-
if sys.version_info[1] <= 5:
14+
if sys.version_info[1] <= 6:
1515
raise Exception(
1616
"You're using Python <= 2.5, but this package requires either Python "
17-
"2.6, 2.7, or 3.3+, so you can't use it unless you upgrade your "
17+
"2.7, or 3.3 or above, so you can't use it unless you upgrade your "
1818
"Python version."
1919
)
2020
# #
@@ -126,8 +126,9 @@ def get_packages():
126126
'License :: OSI Approved :: MIT License',
127127
'Operating System :: OS Independent',
128128
'Programming Language :: Python',
129-
'Programming Language :: Python :: 2.6',
130129
'Programming Language :: Python :: 2.7',
130+
'Programming Language :: Python :: 3.3',
131+
'Programming Language :: Python :: 3.4',
131132
'Topic :: Software Development :: Libraries :: Python Modules',
132133
'Topic :: Utilities'
133134
]

‎source_py3/python_toolbox/_bootstrap/__init__.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,4 @@
33

44
'''A bootstrap package for `python_toolbox`. See module `bootstrap` here.'''
55

6-
from . import bootstrap
7-
from . import bootstrap_py2exe
6+
from . import bootstrap

‎source_py3/python_toolbox/_bootstrap/bootstrap.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
### Confirming correct Python version: ########################################
77
# #
8-
if sys.version_info[0] >= 2:
8+
if sys.version_info[0] == 2:
99
raise Exception("This is a Python 3.x distribution of `python_toolbox`, "
1010
"and you're using Python 2.x. Please get the Python 2.x "
1111
"distribution.")

‎source_py3/python_toolbox/_bootstrap/bootstrap_py2exe/__init__.py‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)