-

cool-RR · cool-RR · commit ca737beee3bd · 2013-09-02T02:55:16.000+03:00
diff --git a/python_toolbox/zip_tools.py b/python_toolbox/zip_tools.py
@@ -6,8 +6,9 @@
 from __future__ import with_statement
 
 import contextlib
-import zipfile
+import zipfile as zip_module
 import os.path
+import cStringIO as string_io_module
 import re
 import fnmatch
 
@@ -35,7 +36,7 @@ def zip_folder(folder, zip_path, ignored_patterns=()):
     source_folder_name = os.path.split(source_folder)[1]
             
     with contextlib.closing(
-        zipfile.ZipFile(zip_path, 'w', zipfile.ZIP_DEFLATED)
+        zip_module.ZipFile(zip_path, 'w', zip_module.ZIP_DEFLATED)
         ) as zip_file:
         
         for root, subfolders, files in os.walk(source_folder):
@@ -53,4 +54,43 @@ def zip_folder(folder, zip_path, ignored_patterns=()):
                     absolute_file_path[(len(source_folder) + len(os.sep)):]
                 )
                 
-                zip_file.write(absolute_file_path, destination_file_path)
+                zip_file.write(absolute_file_path, destination_file_path)
+                
+                
+def zip_in_memory(files):
+    zip_stream = string_io_module.StringIO()
+    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)
+            
+    return zip_stream.getvalue()
+    
+def unzip_in_memory(zip_archive):
+    zip_stream = string_io_module.StringIO(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/test_python_toolbox/test_import_tools/test_exists/test_zip.py b/test_python_toolbox/test_import_tools/test_exists/test_zip.py
@@ -50,4 +50,5 @@ def test_zip():
             assert zip_imported_module_bla_bla.__doc__ == \
                    ('Module for testing `import_tools.exists` on zip-archived '
                     'modules.')
-            
+            
+            
diff --git a/test_python_toolbox/test_zip_tools/__init__.py b/test_python_toolbox/test_zip_tools/__init__.py
diff --git a/test_python_toolbox/test_zip_tools/test.py b/test_python_toolbox/test_zip_tools/test.py
@@ -0,0 +1,25 @@
+from __future__ import with_statement
+
+from python_toolbox import tracing_tools
+
+
+def my_function():
+    ''' '''
+
+def test():
+    ''' '''
+    
+    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
+    
