Supporting Python 2.6

cool-RR · cool-RR · commit 3e280193c70c · 2015-07-18T20:21:40.000+03:00
diff --git a/source_py2/python_toolbox/emitting/emitter.py b/source_py2/python_toolbox/emitting/emitter.py
@@ -246,7 +246,8 @@ def _get_callable_outputs(self):
     
     def _get_emitter_outputs(self):
         '''Get the direct emitter outputs of this emitter.'''
-        return {output for output in self._outputs if isinstance(output, Emitter)}
+        return set((output for output in self._outputs
+                    if isinstance(output, Emitter)))
         
     def get_total_callable_outputs(self):
         '''
diff --git a/source_py2/test_python_toolbox/test_caching/test_cache.py b/source_py2/test_python_toolbox/test_caching/test_cache.py
@@ -114,7 +114,7 @@ def test_unhashable_arguments():
     
     f = cache()(counting_func)
     
-    x = {1, 2}
+    x = set((1, 2))
     
     assert f(x) == f(x)
     
diff --git a/source_py2/test_python_toolbox/test_nifty_collections/test_various_ordered_sets.py b/source_py2/test_python_toolbox/test_nifty_collections/test_various_ordered_sets.py
@@ -21,15 +21,15 @@ def test_operations(self):
         
     def test_bool(self):
         assert bool(self.ordered_set_type({})) is False
-        assert bool(self.ordered_set_type({0})) is True
+        assert bool(self.ordered_set_type(set((0,)))) is True
         assert bool(self.ordered_set_type(range(5))) is True
         
         
 class BaseMutableOrderedSetTestCase(BaseOrderedSetTestCase):
     __test__ = False
     def test_sort(self):
         ordered_set = self.ordered_set_type([5, 61, 2, 7, 2])
-        assert ordered_set != {5, 61, 2, 7}
+        assert ordered_set != set((5, 61, 2, 7))
         ordered_set.move_to_end(61)
         assert list(ordered_set) == [5, 2, 7, 61]
         ordered_set.sort()
@@ -103,10 +103,10 @@ def test_hashable(self):
             FrozenOrderedSet(range(3)): 3,
         }
         assert len(d) == 3
-        assert set(d.values()) == {1, 2, 3}
+        assert set(d.values()) == set((1, 2, 3))
         assert d[FrozenOrderedSet(range(2))] == 2
         d[FrozenOrderedSet(range(2))] = 20
-        assert set(d.values()) == {1, 20, 3}
+        assert set(d.values()) == set((1, 20, 3))
         
 
 class EmittingOrderedSetTestCase(BaseMutableOrderedSetTestCase):
diff --git a/source_py2/test_python_toolbox/test_pickle_tools/test_compressing.py b/source_py2/test_python_toolbox/test_pickle_tools/test_compressing.py
@@ -16,7 +16,7 @@
 my_messy_object = (
     'Whatever',
     {1: 2,}, 
-    {3, 4}, 
+    set((3, 4)), 
     frozenset([3, 4]),
     ((((((((((((())))))))))))),
     u'unicode_too',
