-

cool-RR · cool-RR · commit fda5f3c58321 · 2013-09-14T22:57:03.000+03:00
diff --git a/source_py2/test_python_toolbox/test_caching/test_cache.py b/source_py2/test_python_toolbox/test_caching/test_cache.py
@@ -115,15 +115,17 @@ def test_unhashable_arguments():
     
     f = cache()(counting_func)
     
+    x = set((1, 2))
     
-    assert f(set((1, 2))) == f(set((1, 2)))
+    assert f(x) == f(x)
     
-    assert f(7, set((1, 2))) != f(8, set((1, 2)))
+    assert f(7, x) != f(8, x)
     
     assert f('boo') != f(meow='frrr')
     
-    assert f(meow={1: [1, 2], 2: frozenset([3, 'b'])}) == \
-           f(1, meow={1: [1, 2], 2: frozenset([3, 'b'])})
+    y = {1: [1, 2], 2: frozenset([3, 'b'])}
+    
+    assert f(meow=y) == f(1, meow=y)
     
     
 def test_helpful_message_when_forgetting_parentheses():
diff --git a/source_py3/python_toolbox/zip_tools.py b/source_py3/python_toolbox/zip_tools.py
@@ -8,7 +8,7 @@
 import contextlib
 import zipfile as zip_module
 import os.path
-import io as string_io_module
+import io
 import re
 import fnmatch
 
@@ -35,9 +35,8 @@ def zip_folder(folder, zip_path, ignored_patterns=()):
     zip_name = os.path.splitext(os.path.split(zip_path)[1])[0]
     source_folder_name = os.path.split(source_folder)[1]
             
-    with contextlib.closing(
-        zip_module.ZipFile(zip_path, 'w', zip_module.ZIP_DEFLATED)
-        ) as zip_file:
+    with zip_module.ZipFile(zip_path, 'w', zip_module.ZIP_DEFLATED) \
+                                                                   as zip_file:
         
         for root, subfolders, files in os.walk(source_folder):
             
@@ -63,9 +62,9 @@ def zip_in_memory(files):
     
     Files should be given as tuples of `(file_path, file_contents)`.
     '''
-    zip_stream = string_io_module.StringIO()
-    with contextlib.closing(zip_module.ZipFile(zip_stream, mode='w',
-                            compression=zip_module.ZIP_DEFLATED)) as zip_file:
+    zip_stream = io.BytesIO()
+    with 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)
@@ -78,9 +77,9 @@ 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 contextlib.closing(zip_module.ZipFile(zip_stream, mode='r',
-                            compression=zip_module.ZIP_DEFLATED)) as zip_file:
+    zip_stream = io.BytesIO(zip_archive)
+    with 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_py3/test_python_toolbox/test_caching/test_cache.py b/source_py3/test_python_toolbox/test_caching/test_cache.py
@@ -115,15 +115,17 @@ def test_unhashable_arguments():
     
     f = cache()(counting_func)
     
+    x = set((1, 2))
     
-    assert f(set((1, 2))) == f(set((1, 2)))
+    assert f(x) == f(x)
     
-    assert f(7, set((1, 2))) != f(8, set((1, 2)))
+    assert f(7, x) != f(8, x)
     
     assert f('boo') != f(meow='frrr')
     
-    assert f(meow={1: [1, 2], 2: frozenset([3, 'b'])}) == \
-           f(1, meow={1: [1, 2], 2: frozenset([3, 'b'])})
+    y = {1: [1, 2], 2: frozenset([3, 'b'])}
+    
+    assert f(meow=y) == f(1, meow=y)
     
     
 def test_helpful_message_when_forgetting_parentheses():
diff --git a/source_py3/test_python_toolbox/test_zip_tools/test.py b/source_py3/test_python_toolbox/test_zip_tools/test.py
@@ -11,12 +11,12 @@
 def test_zipping_in_memory():
     ''' '''
     files = (
-        ('meow.txt', "I'm a cat."), 
-        ('dog.txt', "I'm a dog."), 
-        ('folder/binary.bin', ''.join(map(chr, range(256))))
+        ('meow.txt', b"I'm a cat."), 
+        ('dog.txt', b"I'm a dog."), 
+        ('folder/binary.bin', bytes(bytearray(range(256))))
     )
     
     zip_archive = zip_tools.zip_in_memory(files)
-    assert isinstance(zip_archive, str)
+    assert isinstance(zip_archive, bytes)
     assert set(zip_tools.unzip_in_memory(zip_archive)) == set(files)
     
