-

cool-RR · cool-RR · commit 1b417922c65f · 2013-09-02T02:58:54.000+03:00
diff --git a/python_toolbox/zip_tools.py b/python_toolbox/zip_tools.py
@@ -73,7 +73,7 @@ def unzip_in_memory(zip_archive):
                             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)
+                     zip_file.namelist())
     
     
     
diff --git a/test_python_toolbox/test_zip_tools/__init__.py b/test_python_toolbox/test_zip_tools/__init__.py
@@ -0,0 +1,3 @@
+# Copyright 2009-2013 Ram Rachum.
+# This program is distributed under the MIT license.
+
diff --git a/test_python_toolbox/test_zip_tools/test.py b/test_python_toolbox/test_zip_tools/test.py
@@ -1,25 +1,22 @@
+# Copyright 2009-2013 Ram Rachum.
+# This program is distributed under the MIT license.
+
 from __future__ import with_statement
 
-from python_toolbox import tracing_tools
+from python_toolbox import cute_testing
 
+from python_toolbox import zip_tools
 
-def my_function():
-    ''' '''
 
-def test():
+def test_zipping_in_memory():
     ''' '''
+    files = (
+        ('meow.txt', "I'm a cat."), 
+        ('dog.txt', "I'm a dog."), 
+        ('folder/binary.bin', ''.join(map(chr, xrange(256))))
+    )
     
-    with tracing_tools.TempFunctionCallCounter(my_function) as \
-                                                    temp_function_call_counter:
-        assert temp_function_call_counter.call_count == 0
-        my_function()
-        assert temp_function_call_counter.call_count == 1
-        my_function()
-        my_function()
-        my_function()
-        assert temp_function_call_counter.call_count == 4
-    
-    assert temp_function_call_counter.call_count == 4
-    my_function()
-    assert temp_function_call_counter.call_count == 4
+    zip_archive = zip_tools.zip_in_memory(files)
+    assert isinstance(zip_archive, str)
+    assert set(zip_tools.unzip_in_memory(zip_archive)) == set(files)
     

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+# Copyright 2009-2013 Ram Rachum.`
	`2`	`+# This program is distributed under the MIT license.`
	`3`	`+`