-

cool-RR · cool-RR · commit c2750fc34cbf · 2012-12-25T03:13:02.000+02:00
diff --git a/docs/topics/index.txt b/docs/topics/index.txt
@@ -45,7 +45,6 @@ explaining what it's good for and the basics of using it.
    gc-tools
    identities
    import-tools
-   infinity
    introspection-tools
    logic-tools
    math-tools
diff --git a/docs/topics/infinity.txt b/docs/topics/infinity.txt
diff --git a/python_toolbox/_bootstrap/bootstrap.py b/python_toolbox/_bootstrap/bootstrap.py
@@ -12,11 +12,13 @@
 ### Confirming correct Python version: ########################################
 #                                                                             #
 if sys.version_info[0] >= 3:
-    raise Exception("Python 3.x is not supported")
+    raise Exception("Python 3.x is not supported, only Python 2.6 and Python "
+                    "2.7.")
 if sys.version_info[1] <= 4:
     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. ###############################
diff --git a/python_toolbox/caching/cache.py b/python_toolbox/caching/cache.py
@@ -13,9 +13,10 @@
 from python_toolbox import decorator_tools
 
 from python_toolbox.sleek_reffing import SleekCallArgs
-from python_toolbox.infinity import infinity
 from python_toolbox.nifty_collections import OrderedDict
 
+infinity = float('inf')
+
 
 class CLEAR_ENTIRE_CACHE(object):
     '''Sentinel object for clearing the entire cache'''
diff --git a/python_toolbox/cheat_hashing/cheat_hash.py b/python_toolbox/cheat_hashing/cheat_hash.py
@@ -7,11 +7,10 @@
 See its documentation for more details.
 '''
 
-from python_toolbox.infinity import infinity
-
 from .cheat_hash_functions import (cheat_hash_dict, cheat_hash_object, 
                                    cheat_hash_sequence, cheat_hash_set)
 
+infinity = float('inf')
 
 dispatch_map = {
     object: cheat_hash_object,
diff --git a/python_toolbox/context_management/context_manager.py b/python_toolbox/context_management/context_manager.py
@@ -11,7 +11,7 @@
 
 import sys
 import types
-from python_toolbox.third_party import abc
+import abc
 
 from python_toolbox import decorator_tools
 
diff --git a/python_toolbox/context_management/context_manager_type.py b/python_toolbox/context_management/context_manager_type.py
@@ -7,7 +7,7 @@
 See its documentation for more information.
 '''
 
-from python_toolbox.third_party import abc
+import abc
 
 from .context_manager_type_type import ContextManagerTypeType
 
diff --git a/python_toolbox/context_management/delegating_context_manager.py b/python_toolbox/context_management/delegating_context_manager.py
@@ -7,7 +7,7 @@
 See its documentation for more information.
 '''
 
-from python_toolbox.third_party import abc
+import abc
 
 from python_toolbox import proxy_property
 
diff --git a/python_toolbox/context_management/reentrant_context_manager.py b/python_toolbox/context_management/reentrant_context_manager.py
@@ -7,7 +7,7 @@
 See its documentation for more information.
 '''
 
-from python_toolbox.third_party import abc
+import abc
 
 from python_toolbox import caching
 from python_toolbox.proxy_property import ProxyProperty
diff --git a/python_toolbox/cute_iter_tools.py b/python_toolbox/cute_iter_tools.py
@@ -10,7 +10,8 @@
 import itertools
 import __builtin__
 
-from python_toolbox.infinity import infinity
+
+infinity = float('inf')
 
 
 def consecutive_pairs(iterable, wrap_around=False):
diff --git a/python_toolbox/freezing/freezer.py b/python_toolbox/freezing/freezer.py
@@ -7,7 +7,7 @@
 See its documentation for more information.
 '''
 
-from python_toolbox.third_party import abc
+import abc
 
 from python_toolbox import context_management
 from python_toolbox import proxy_property
diff --git a/python_toolbox/infinity.py b/python_toolbox/infinity.py
diff --git a/python_toolbox/wx_tools/widgets/cute_window/bind_savvy_evt_handler/name_parser.py b/python_toolbox/wx_tools/widgets/cute_window/bind_savvy_evt_handler/name_parser.py
@@ -7,7 +7,7 @@
 See its documentation for more information.
 '''
 
-from python_toolbox.third_party import abc
+import abc
 
 from python_toolbox import abc_tools
 from python_toolbox import sequence_tools
diff --git a/setup.py b/setup.py
@@ -16,7 +16,7 @@
                     "2.7.")
 if sys.version_info[1] <= 5:
     raise Exception(
-        "You're using Python <=2.5, but this package requires either Python "
+        "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."
     )
diff --git a/test_python_toolbox/test_abc_tools/test_abstract_static_method.py b/test_python_toolbox/test_abc_tools/test_abstract_static_method.py
@@ -4,11 +4,11 @@
 '''Testing module for `python_toolbox.abc_tools.AbstractStaticMethod`.'''
 
 import sys
+import abc
 
 import nose
 
 from python_toolbox.abc_tools import AbstractStaticMethod
-from python_toolbox.third_party import abc
 
 
 def test_instantiate_without_subclassing():
diff --git a/test_python_toolbox/test_persistent/test_cross_process_persistent.py b/test_python_toolbox/test_persistent/test_cross_process_persistent.py
@@ -8,7 +8,7 @@
 import copy
 import pickle
 import cPickle
-from python_toolbox.third_party import abc
+import abc
 
 import nose
 
