-

cool-RR · cool-RR · commit e9355bdff92c · 2012-12-25T03:18:25.000+02:00
diff --git a/docs/installation.txt b/docs/installation.txt
@@ -13,8 +13,8 @@ Installing the Python Toolbox
 Requirements
 ============
 
-* Python, version 2.5 or above. If you're new to Python, `download version 2.7
-  <http://python.org/download/releases/2.7.2>`_.
+* Python, version 2.6 or 2.7 or above. If you're new to Python, `download
+  version 2.7 <http://python.org/download/releases/2.7.2>`_.
  
 * `distribute`_.
 
diff --git a/python_toolbox/nifty_collections/lazy_tuple.py b/python_toolbox/nifty_collections/lazy_tuple.py
@@ -14,12 +14,13 @@
 from python_toolbox.third_party import abcs_collection
 
 from python_toolbox import cute_iter_tools
-from python_toolbox.infinity import infinity
 from python_toolbox import decorator_tools
 from python_toolbox import comparison_tools
 from python_toolbox import sequence_tools
 
 
+infinity = float('inf')
+
 class _SENTINEL(object):
     '''Sentinel used to detect the end of an iterable.'''
     
diff --git a/python_toolbox/sequence_tools.py b/python_toolbox/sequence_tools.py
@@ -8,10 +8,12 @@
 
 from python_toolbox.nifty_collections import Counter
 from python_toolbox import math_tools
-from python_toolbox.infinity import infinity
 from python_toolbox.third_party import abcs_collection
 
 
+infinity = float('inf')
+
+
 def are_equal_regardless_of_order(seq1, seq2):
     '''
     Return whether the two sequences are equal in the elements they contain,
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
@@ -14,10 +14,6 @@
 def test_instantiate_without_subclassing():
     '''Test you can't instantiate a class with an `AbstractStaticMethod`.'''
     
-    if sys.version_info[:2] <= (2, 5):
-        raise nose.SkipTest("Python 2.5 and below can't enforce abstract "
-                            "methods.")
-    
     class A(object):
         __metaclass__ = abc.ABCMeta
         
diff --git a/test_python_toolbox/test_arguments_profile.py b/test_python_toolbox/test_arguments_profile.py
@@ -480,8 +480,6 @@ def func(a, b, c=3, d=4, **kwargs):
         pass
     assert sys.version_info[0] == 2
     assert sys.version_info[1] >= 5
-    if sys.version_info[1] == 5:
-        raise nose.SkipTest("Python 2.5 can't compile this test.")
         
         
     a2 = ArgumentsProfile(func, 7, ({'a': 'b'},), set([1, (3, 4)]),
@@ -491,13 +489,9 @@ def func(a, b, c=3, d=4, **kwargs):
         (('meow', [1, 2, {1: [1, 2]}]),)
     )
     
-    
-    
-    # Python 2.5 can't compile the following, so we're compiling it dynamically
-    # so as to not prevent Python 2.5 from being able to compile this module:
-    exec("a3 = ArgumentsProfile(func, *(), b=({'a': 'b'},),"
-                               "c=set([1, (3, 4)]), a=7,"
-                               "meow=[1, 2, {1: [1, 2]}])")
+    a3 = ArgumentsProfile(func, *(), b=({'a': 'b'},),
+                          c=set([1, (3, 4)]), a=7,
+                          meow=[1, 2, {1: [1, 2]}])
     assert a3.args == (7, ({'a': 'b'},), set([1, (3, 4)]))
     assert a3.kwargs == OrderedDict(
         (('meow', [1, 2, {1: [1, 2]}]),)
diff --git a/test_python_toolbox/test_context_management/test_abstractness.py b/test_python_toolbox/test_context_management/test_abstractness.py
@@ -17,8 +17,6 @@ def test_abstractness():
     '''
     A non-abstract-overriding `ContextManager` subclass can't be instantiated.
     '''
-    if sys.version_info[:2] <= (2, 5):
-        raise nose.SkipTest("Python 2.5 doesn't enforce abstractness.")
     
     class EmptyContextManager(ContextManager):
         pass
diff --git a/test_python_toolbox/test_cute_iter_tools/test_is_iterable.py b/test_python_toolbox/test_cute_iter_tools/test_is_iterable.py
@@ -5,11 +5,13 @@
 
 import nose.tools
 
-from python_toolbox.infinity import infinity
 from python_toolbox import cute_iter_tools
 from python_toolbox.cute_iter_tools import is_iterable
 
 
+infinity = float('inf')
+
+
 def test():
     '''Test basic workings of `is_iterable`.'''
     
diff --git a/test_python_toolbox/test_cute_iter_tools/test_shorten.py b/test_python_toolbox/test_cute_iter_tools/test_shorten.py
@@ -5,11 +5,13 @@
 
 import nose.tools
 
-from python_toolbox.infinity import infinity
 from python_toolbox import cute_iter_tools
 from python_toolbox.cute_iter_tools import shorten
 
 
+infinity = float('inf')
+
+
 def test():
     '''Test basic workings of `shorten`.'''
     my_range = [0, 1, 2, 3, 4]
diff --git a/test_python_toolbox/test_sequence_tools/test_parse_slice.py b/test_python_toolbox/test_sequence_tools/test_parse_slice.py
@@ -4,11 +4,13 @@
 '''Testing module for `sequence_tools.parse_slice`.'''
 
 from python_toolbox import math_tools
-from python_toolbox.infinity import infinity
 
 from python_toolbox.sequence_tools import parse_slice
 
 
+infinity = float('inf')
+
+
 def test():
     '''Test the basic workings of `parse_slice`.'''
     
diff --git a/test_python_toolbox/test_sleek_reffing/test_cute_sleek_value_dict/test_generic_dict_tests.py b/test_python_toolbox/test_sleek_reffing/test_cute_sleek_value_dict/test_generic_dict_tests.py
@@ -655,9 +655,6 @@ def test_empty_presized_dict_in_freelist(self):
     def test_container_iterator(self):
         # Bug #3680: tp_traverse was not implemented for dictiter objects
 
-        if sys.version_info[:2] == (2, 5):
-            raise nose.SkipTest('Bug 3680 will not be fixed in Python 2.5')
-        
         class C(object):
             pass
         iterators = (CuteSleekValueDict.iteritems,
