-

cool-RR · cool-RR · commit 599cb45d3f47 · 2012-12-25T03:08:19.000+02:00
diff --git a/README.markdown b/README.markdown
@@ -56,7 +56,7 @@ If you want to be informed on new releases of the Python Toolbox, sign up for
 
 # Python versions #
  
-The Python Toolbox supports Python versions 2.5, 2.6 and 2.7.
+The Python Toolbox supports Python versions 2.6 and 2.7.
 
 It's tested on both CPython and PyPy.
 
diff --git a/python_toolbox/third_party/abc.py b/python_toolbox/third_party/abc.py
diff --git a/python_toolbox/third_party/abcs_collection.py b/python_toolbox/third_party/abcs_collection.py
@@ -10,7 +10,7 @@
 bootstrapping issues.  Unit tests are in test_collections.
 """
 
-from .abc import ABCMeta, abstractmethod
+from abc import ABCMeta, abstractmethod
 import sys
 
 __all__ = ["Hashable", "Iterable", "Iterator",
diff --git a/setup.py b/setup.py
@@ -12,11 +12,13 @@
 ### Confirming correct Python version: ########################################
 #                                                                             #
 if sys.version_info[0] >= 3:
-    raise Exception("Python 3.x is not supported")
-if sys.version_info[1] <= 4:
+    raise Exception("Python 3.x is not supported, only Python 2.6 and Python "
+                    "2.7.")
+if sys.version_info[1] <= 5:
     raise Exception(
-        "You're using Python <=2.4, but this package requires Python 2.5 and "
-        "upwards, so you can't use it unless you upgrade your Python version."
+        "You're using Python <=2.5, but this package requires either Python "
+        "2.6 or Python 2.7, so you can't use it unless you upgrade your "
+        "Python version."
     )
 #                                                                             #
 ### Finished confirming correct Python version. ###############################
@@ -121,7 +123,6 @@ def get_packages():
     'License :: OSI Approved :: MIT License',
     'Operating System :: OS Independent', 
     'Programming Language :: Python',
-    'Programming Language :: Python :: 2.5',
     'Programming Language :: Python :: 2.6',
     'Programming Language :: Python :: 2.7',
     'Topic :: Software Development :: Libraries :: Python Modules',
@@ -131,7 +132,7 @@ def get_packages():
 
 setuptools.setup(
     name='python_toolbox',
-    version='0.3',
+    version='0.4',
     requires=['distribute'],
     test_suite='nose.collector',
     install_requires=['distribute'],
