Supporting Python 2.6

cool-RR · cool-RR · commit cb971c9c5e05 · 2015-07-18T20:17:11.000+03:00
diff --git a/source_py2/python_toolbox/combi/perming/perm_space.py b/source_py2/python_toolbox/combi/perming/perm_space.py
@@ -424,7 +424,7 @@ def _unsliced_length(self):
                 return calculate_length_of_recurrent_perm_space(
                     self.n_elements - len(self.fixed_map),
                     nifty_collections.FrozenBagBag(
-                        collections.Counter(self.free_values).values()
+                        nifty_collections.Bag(self.free_values).values()
                     )                    
                 )
             else:
diff --git a/source_py2/python_toolbox/sequence_tools/misc.py b/source_py2/python_toolbox/sequence_tools/misc.py
@@ -30,7 +30,8 @@ def are_equal_regardless_of_order(seq1, seq2):
 
     Currently will fail for items that have problems with comparing.
     '''
-    return collections.Counter(seq1) == collections.Counter(seq2)
+    from python_toolbox import nifty_collections
+    return nifty_collections.Bag(seq1) == nifty_collections.Bag(seq2)
 
 
 def flatten(iterable):
@@ -224,9 +225,10 @@ def get_recurrences(sequence):
     
     The values of the dict are the numbers of repititions of each item.    
     '''
+    from python_toolbox import nifty_collections
     return dict(
         (item, n_recurrences) for item, n_recurrences in
-        collections.Counter(sequence).most_common() if n_recurrences >= 2
+        nifty_collections.Bag(sequence).most_common() if n_recurrences >= 2
     )
 
     
diff --git a/source_py2/test_python_toolbox/test_combi/test_perm_space.py b/source_py2/test_python_toolbox/test_combi/test_perm_space.py
@@ -3,9 +3,10 @@
 
 import pickle
 import itertools
-import functools
 import math
 
+from python_toolbox.third_party import functools
+
 from python_toolbox import cute_testing
 from python_toolbox import math_tools
 from python_toolbox import cute_iter_tools
diff --git a/source_py2/test_python_toolbox/test_random_tools/test_shuffled.py b/source_py2/test_python_toolbox/test_random_tools/test_shuffled.py
@@ -22,4 +22,4 @@ def test():
     assert my_range == list(range(50))
     
     # Immutable sequences work too:
-    assert set(random_tools.shuffled((1, 2, 3))) == {1, 2, 3}
+    assert set(random_tools.shuffled((1, 2, 3))) == set((1, 2, 3))
diff --git a/source_py2/test_python_toolbox/test_sleek_reffing/test_cute_sleek_value_dict/tests.py b/source_py2/test_python_toolbox/test_sleek_reffing/test_cute_sleek_value_dict/tests.py
@@ -19,7 +19,7 @@
 def test():
     '''Test the basic workings of `CuteSleekValueDict`.'''
     volatile_things = [A(), 1, 4.5, 'meow', u'woof', [1, 2], (1, 2), {1: 2},
-                       {1, 2, 3}]
+                       set((1, 2, 3))]
     unvolatile_things = [__builtins__, list, type, sum]
     
     # Using len(csvd) as our key; just to guarantee we're not running over an
@@ -56,7 +56,7 @@ def test():
         
 def test_one_by_one():
     volatile_things = [A(), 1, 4.5, 'meow', u'woof', [1, 2], (1, 2), {1: 2},
-                       {1, 2, 3}]
+                       set((1, 2, 3))]
     unvolatile_things = [__builtins__, list, type, sum]
     
     # Using len(csvd) as our key; just to guarantee we're not running over an
diff --git a/source_py2/test_python_toolbox/test_sleek_reffing/test_sleek_call_args.py b/source_py2/test_python_toolbox/test_sleek_reffing/test_sleek_call_args.py
@@ -39,7 +39,7 @@ def test_unhashable():
     '''Test `SleekCallArgs` on unhashable arguments.'''
     sca_dict = {}
     
-    args = ([1, 2], {1: [1, 2]}, {'a', 1})
+    args = ([1, 2], {1: [1, 2]}, set(('a', 1)))
     sca1 = SleekCallArgs(sca_dict, f, *args)
     hash(sca1)
     sca_dict[sca1] = 'meow'
@@ -52,7 +52,7 @@ def test_unhashable():
         'a': {1: 2},
         'b': [
             set(),
-            {frozenset((3, 4))}
+            set((frozenset((3, 4))))
         ]
     }
     sca2 = SleekCallArgs(sca_dict, f, **kwargs)
diff --git a/source_py2/test_python_toolbox/test_sleek_reffing/test_sleek_ref.py b/source_py2/test_python_toolbox/test_sleek_reffing/test_sleek_ref.py
@@ -21,7 +21,7 @@ def test_sleek_ref():
     '''Test the basic workings of `SleekRef`.'''
 
     volatile_things = [A(), 1, 4.5, 'meow', u'woof', [1, 2], (1, 2), {1: 2},
-                       {1, 2, 3}, (None, 3, {None: 4})]
+                       set((1, 2, 3)), (None, 3, {None: 4})]
     unvolatile_things = [__builtins__, type, sum, None]
     # (Used to have `list` here too but Pypy 2.0b choked on it.)
     
diff --git a/source_py2/test_python_toolbox/test_string_cataloging/test.py b/source_py2/test_python_toolbox/test_string_cataloging/test.py
@@ -13,5 +13,5 @@ def test():
     assert string_cataloging.integer_to_string(y) == 'zwei'
     assert string_cataloging.integer_to_string(z) == 'drei'
     
-    assert {string_cataloging.string_to_integer('zwei') for i in xrange(10)} \
-                                                                         == {y}
+    assert set((string_cataloging.string_to_integer('zwei')
+                for i in xrange(10))) == set((y,))

Original file line number	Diff line number	Diff line change
`@@ -424,7 +424,7 @@ def _unsliced_length(self):`
`424`	`424`	`return calculate_length_of_recurrent_perm_space(`
`425`	`425`	`self.n_elements - len(self.fixed_map),`
`426`	`426`	`nifty_collections.FrozenBagBag(`
`427`		`- collections.Counter(self.free_values).values()`
	`427`	`+ nifty_collections.Bag(self.free_values).values()`
`428`	`428`	`)`
`429`	`429`	`)`
`430`	`430`	`else:`