Supporting Python 2.6

cool-RR · cool-RR · commit 913a0f5b6292 · 2015-07-18T21:32:20.000+03:00
diff --git a/source_py2/test_python_toolbox/test_cheat_hashing.py b/source_py2/test_python_toolbox/test_cheat_hashing.py
@@ -18,7 +18,7 @@ def test_cheat_hash():
         [1, 2, 3.4],
         (1, 2, 3.4),
         {1: 2, 3: 4.5},
-        {1, 2, 3.4},
+        set((1, 2, 3.4)),
         [1, [1, 2], 3],
         [1, {frozenset((1, 2)): 'meow'}, 3],
         sum,
diff --git a/source_py2/test_python_toolbox/test_combi/test_comb_space.py b/source_py2/test_python_toolbox/test_combi/test_comb_space.py
@@ -18,8 +18,8 @@ def test():
         'du', 'db', 'br', ('d', 'u'), Comb('du', comb_space)
     )
     things_not_in_comb_space = (
-        'dx', 'dub', ('d', 'x'), {'d', 'u', 'b'}, Comb('dux', comb_space),
-        Comb('du', CombSpace('other', 2)), {'d', 'u'}, 'ud', 'rb',
+        'dx', 'dub', ('d', 'x'), set(('d', 'u', 'b')), Comb('dux', comb_space),
+        Comb('du', CombSpace('other', 2)), set(('d', 'u')), 'ud', 'rb',
         Comb('bu', comb_space)
     )
     
diff --git a/source_py2/test_python_toolbox/test_combi/test_extensive.py b/source_py2/test_python_toolbox/test_combi/test_extensive.py
@@ -59,8 +59,8 @@ def __init__(self, iterable_or_length, domain=None, n_elements=None,
                                                              len(self.sequence)
         self.domain = (domain or
               sequence_tools.CuteRange(self.sequence_length))[:self.n_elements]
-        self.fixed_map = {key: value for key, value in fixed_map.items() if key
-                          in self.domain}
+        self.fixed_map = dict((key, value) for key, value in fixed_map.items()
+                              if key in self.domain)
         self.degrees = \
                       degrees or sequence_tools.CuteRange(self.sequence_length)
         self.is_combination = is_combination
@@ -174,10 +174,10 @@ def _check_variation_selection(variation_selection, perm_space_type,
         kwargs['is_combination'] = is_combination
         
     if purified_fixed_map != NO_ARGUMENT:
-        kwargs['fixed_map'] = actual_fixed_map = {
-            actual_domain[key]: sequence[value] for key, value
+        kwargs['fixed_map'] = actual_fixed_map = dict(
+            (actual_domain[key], sequence[value]) for key, value
                            in purified_fixed_map.items() if key < len(sequence)
-        }
+        )
     else:
         actual_fixed_map = {}
         
@@ -320,10 +320,10 @@ def _check_variation_selection(variation_selection, perm_space_type,
             else:
                 assert type(perm) == Perm
         
-        if variation_selection.variations <= {
+        if variation_selection.variations <= set((
             perming.variations.Variation.DAPPLIED,
             perming.variations.Variation.RAPPLIED,
-            perming.variations.Variation.COMBINATION,}:
+            perming.variations.Variation.COMBINATION)):
             assert perm.nominal_perm_space == perm_space
         assert perm.nominal_perm_space == \
                                    perm_space._nominal_perm_space_of_perms == \

Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,8 @@ def test():`
`18`	`18`	`'du', 'db', 'br', ('d', 'u'), Comb('du', comb_space)`
`19`	`19`	`)`
`20`	`20`	`things_not_in_comb_space = (`
`21`		`- 'dx', 'dub', ('d', 'x'), {'d', 'u', 'b'}, Comb('dux', comb_space),`
`22`		`- Comb('du', CombSpace('other', 2)), {'d', 'u'}, 'ud', 'rb',`
	`21`	`+ 'dx', 'dub', ('d', 'x'), set(('d', 'u', 'b')), Comb('dux', comb_space),`
	`22`	`+ Comb('du', CombSpace('other', 2)), set(('d', 'u')), 'ud', 'rb',`
`23`	`23`	`Comb('bu', comb_space)`
`24`	`24`	`)`
`25`	`25`