-

cool-RR · cool-RR · commit 214bf54abb37 · 2014-10-16T21:10:10.000+03:00
diff --git a/source_py3/python_toolbox/zip_tools.py b/source_py3/python_toolbox/zip_tools.py
@@ -6,6 +6,7 @@
 
 import zipfile as zip_module
 import io
+import os
 import re
 import pathlib
 import fnmatch
@@ -35,10 +36,10 @@ def zip_folder(source_folder, zip_path, ignored_patterns=()):
     
     internal_pure_path = pathlib.PurePath(source_folder.name)
     
-    with zip_module.ZipFile(zip_path, 'w', zip_module.ZIP_DEFLATED) \
+    with zip_module.ZipFile(str(zip_path), 'w', zip_module.ZIP_DEFLATED) \
                                                                    as zip_file:
         
-        for root, subfolders, files in os.walk(source_folder):
+        for root, subfolders, files in os.walk(str(source_folder)):
             root = pathlib.Path(root)
             subfolders = map(pathlib.Path, subfolders)
             files = map(pathlib.Path, files)
@@ -54,7 +55,8 @@ def zip_folder(source_folder, zip_path, ignored_patterns=()):
                 destination_file_path = internal_pure_path / \
                                                         absolute_file_path.name
                 
-                zip_file.write(absolute_file_path, destination_file_path)
+                zip_file.write(str(absolute_file_path),
+                               str(destination_file_path))
                 
                 
 def zip_in_memory(files):
diff --git a/source_py3/test_python_toolbox/test_zip_tools/test_zip_folder.py b/source_py3/test_python_toolbox/test_zip_tools/test_zip_folder.py
@@ -0,0 +1,33 @@
+# Copyright 2009-2014 Ram Rachum.
+# This program is distributed under the MIT license.
+
+import pathlib
+
+from python_toolbox import cute_testing
+from python_toolbox import temp_file_tools
+
+from python_toolbox import zip_tools
+
+
+def test():
+    ''' '''
+    with temp_file_tools.create_temp_folder() as temp_folder:
+        assert isinstance(temp_folder, pathlib.Path)
+        
+        folder_to_zip = (temp_folder / 'folder_to_zip')
+        folder_to_zip.mkdir()
+        assert isinstance(folder_to_zip, pathlib.Path)
+        
+        (folder_to_zip / 'some_file.txt').open('w').write('hello there!')
+        (folder_to_zip / 'some_other_file.txt').open('w').write(
+                                                          'hello there again!')
+        
+        zip_file_path = temp_folder / 'archive.zip'
+        assert isinstance(zip_file_path, pathlib.Path)
+        zip_tools.zip_folder(folder_to_zip, temp_folder / 'archive.zip')
+        
+        assert zip_file_path.is_file()
+        assert zip_tools.unzip_in_memory(zip_file_path.open('rb').read()) == (
+            ('folder_to_zip/some_file.txt', b'hello there!'), 
+            ('folder_to_zip/some_other_file.txt', b'hello there again!'), 
+        )
diff --git a/source_py3/test_python_toolbox/test_zip_tools/test_zipping_in_memory.py b/source_py3/test_python_toolbox/test_zip_tools/test_zipping_in_memory.py
@@ -6,7 +6,7 @@
 from python_toolbox import zip_tools
 
 
-def test_zipping_in_memory():
+def test():
     ''' '''
     files = (
         ('meow.txt', b"I'm a cat."), 
