Supporting Python 2.6

cool-RR · cool-RR · commit 791c2b93fb57 · 2015-07-18T19:59:20.000+03:00
diff --git a/source_py2/python_toolbox/logic_tools.py b/source_py2/python_toolbox/logic_tools.py
@@ -123,7 +123,7 @@ def get_equivalence_classes(iterable, key=None, container=set,
         key_function = comparison_tools.process_key_function_or_attribute_name(
             key
         )
-        d = {key: key_function(key) for key in iterable}
+        d = set((key, key_function(key)) for key in iterable)
     #                                                                         #
     ### Finished pre-processing input. ########################################
     
diff --git a/source_py2/python_toolbox/zip_tools.py b/source_py2/python_toolbox/zip_tools.py
@@ -8,6 +8,7 @@
 import cStringIO as string_io_module
 import os
 import re
+import contextlib
 try:
     import pathlib
 except:
@@ -40,8 +41,8 @@ def zip_folder(source_folder, zip_path, ignored_patterns=()):
     
     internal_pure_path = pathlib.PurePath(source_folder.name)
             
-    with zip_module.ZipFile(str(zip_path), 'w', zip_module.ZIP_DEFLATED) \
-                                                                   as zip_file:
+    with contextlib.closing(zip_module.ZipFile(str(zip_path), 'w',
+                                         zip_module.ZIP_DEFLATED)) as zip_file:
         
         for root, subfolders, files in os.walk(str(source_folder)):
             root = pathlib.Path(root)
@@ -70,8 +71,8 @@ def zip_in_memory(files):
     Files should be given as tuples of `(file_path, file_contents)`.
     '''
     zip_stream = string_io_module.StringIO()
-    with zip_module.ZipFile(zip_stream, mode='w',
-                            compression=zip_module.ZIP_DEFLATED) as zip_file:
+    with contextlib.closing(zip_module.ZipFile(zip_stream, mode='w',
+                            compression=zip_module.ZIP_DEFLATED)) as zip_file:
         assert isinstance(zip_file, zip_module.ZipFile)
         for file_name, file_data in files:
             zip_file.writestr(file_name, file_data)
@@ -85,8 +86,8 @@ def unzip_in_memory(zip_archive):
     Files are returned as tuples of `(file_path, file_contents)`.
     '''    
     zip_stream = string_io_module.StringIO(zip_archive)
-    with zip_module.ZipFile(zip_stream, mode='r',
-                            compression=zip_module.ZIP_DEFLATED) as zip_file:
+    with contextlib.closing(zip_module.ZipFile(zip_stream, mode='r',
+                             compression=zip_module.ZIP_DEFLATED)) as zip_file:
         assert isinstance(zip_file, zip_module.ZipFile)
         return tuple((file_name, zip_file.read(file_name)) for file_name in
                      zip_file.namelist())
diff --git a/source_py2/test_python_toolbox/test_dict_tools/test_devour_keys.py b/source_py2/test_python_toolbox/test_dict_tools/test_devour_keys.py
@@ -9,6 +9,6 @@
 def test():
     '''Test the basic workings of `devour_keys`.'''
     my_dict = {1: 2, 3: 4, 5: 6,}
-    assert set(dict_tools.devour_keys(my_dict)) == {1, 3, 5}
+    assert set(dict_tools.devour_keys(my_dict)) == set((1, 3, 5))
     assert not my_dict
     
diff --git a/source_py2/test_python_toolbox/test_nifty_collections/test_frozen_ordered_dict.py b/source_py2/test_python_toolbox/test_nifty_collections/test_frozen_ordered_dict.py
@@ -22,11 +22,12 @@ def test():
                                                                      set('123')
     assert set(frozen_ordered_dict.values()) == set('abc')
     assert set(frozen_ordered_dict.items()) == \
-                                          {('1', 'a'), ('2', 'b'), ('3', 'c'),}
+                                     set((('1', 'a'), ('2', 'b'), ('3', 'c'),))
     assert frozen_ordered_dict['1'] == 'a'
     with cute_testing.RaiseAssertor(exception_type=LookupError):
         frozen_ordered_dict['missing value']
-    assert {frozen_ordered_dict, frozen_ordered_dict} == {frozen_ordered_dict}
+    assert set((frozen_ordered_dict, frozen_ordered_dict)) == \
+                                                    set((frozen_ordered_dict,))
     assert {frozen_ordered_dict: frozen_ordered_dict} == \
                                      {frozen_ordered_dict: frozen_ordered_dict}
     assert isinstance(hash(frozen_ordered_dict), int)
diff --git a/source_py2/test_python_toolbox/test_zip_tools/test_zip_folder.py b/source_py2/test_python_toolbox/test_zip_tools/test_zip_folder.py
@@ -37,13 +37,13 @@ def test():
         assert zip_file_path.is_file()
         
         # Got two options here because of PyPy shenanigans:
-        assert result == {
+        assert result == set((
             ('folder_to_zip/some_file.txt', b'hello there!'), 
             ('folder_to_zip/some_other_file.txt', b'hello there again!'), 
-        } or result == {
+        )) or result == set((
             ('folder_to_zip/some_file.txt', 'hello there!'), 
             ('folder_to_zip/some_other_file.txt', 'hello there again!'), 
-        }
+        ))
         
         import gc; gc.collect() # Making PyPy happy.
         

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ def get_equivalence_classes(iterable, key=None, container=set,`
`123`	`123`	`key_function = comparison_tools.process_key_function_or_attribute_name(`
`124`	`124`	`key`
`125`	`125`	`)`
`126`		`- d = {key: key_function(key) for key in iterable}`
	`126`	`+ d = set((key, key_function(key)) for key in iterable)`
`127`	`127`	`# #`
`128`	`128`	`### Finished pre-processing input. ########################################`
`129`	`129`