-

cool-RR · cool-RR · commit 78f6809e074c · 2014-01-05T02:15:40.000+02:00
diff --git a/source_py3/python_toolbox/cute_profile/profile_handling.py b/source_py3/python_toolbox/cute_profile/profile_handling.py
@@ -6,7 +6,6 @@
 import marshal
 import pathlib
 import abc
-import os.path
 import pstats
 
 from python_toolbox.third_party import envelopes
@@ -116,5 +115,5 @@ def get_profile_handler(profile_handler_string):
                                                                           [0]):
         return EmailProfileHandler(*profile_handler_string.split('\n'))
     else:
-        assert os.path.isdir(profile_handler_string)
+        assert pathlib.Path(profile_handler_string).is_dir()
         return FolderProfileHandler(profile_handler_string)
diff --git a/source_py3/python_toolbox/path_tools.py b/source_py3/python_toolbox/path_tools.py
@@ -4,7 +4,6 @@
 '''Defines various tools related to file-system paths.'''
 
 import sys
-import os.path
 import pathlib
 import glob
 import types
@@ -45,6 +44,7 @@ def get_root_path_of_module(module):
         # It's a one-file module, not a package.
         result = path_of_root_module.parent.absolute()
     
-    assert result in list(map(os.path.abspath, sys.path)) 
+    assert result in list(map(pathlib.Path.absolute,
+                              map(pathlib.Path, sys.path)))
     return result
 
diff --git a/source_py3/python_toolbox/zip_tools.py b/source_py3/python_toolbox/zip_tools.py
@@ -9,10 +9,11 @@
 import os.path
 import io
 import re
+import pathlib
 import fnmatch
 
 
-def zip_folder(folder, zip_path, ignored_patterns=()):
+def zip_folder(source_folder, zip_path, ignored_patterns=()):
     '''
     Zip `folder` into a zip file specified by `zip_path`.
     
@@ -25,32 +26,35 @@ def zip_folder(folder, zip_path, ignored_patterns=()):
     
     Any empty sub-folders will be ignored.
     '''
-    assert os.path.isdir(folder)
-    source_folder = os.path.realpath(folder)
+    zip_path = pathlib.Path(zip_path)
+    source_folder = pathlib.Path(source_folder).absolute()
+    assert source_folder.is_dir()
     
     ignored_re_patterns = [re.compile(fnmatch.translate(ignored_pattern)) for
                            ignored_pattern in ignored_patterns]
     
-    zip_name = os.path.splitext(os.path.split(zip_path)[1])[0]
-    source_folder_name = os.path.split(source_folder)[1]
-            
+    zip_name = zip_path.name[:-len(zip_path.suffix)]
+    
+    internal_pure_path = pathlib.PurePath(source_folder.name)
+    
     with zip_module.ZipFile(zip_path, 'w', zip_module.ZIP_DEFLATED) \
                                                                    as zip_file:
         
         for root, subfolders, files in os.walk(source_folder):
+            root = pathlib.Path(root)
+            subfolders = map(pathlib.Path, subfolders)
+            files = map(pathlib.Path, files)
             
             for file_path in files:
                 
-                if any(ignored_re_pattern.match(os.path.join(root, file_path))
-                       for ignored_re_pattern in ignored_re_patterns):
+                if any(ignored_re_pattern.match(root / file_path)
+                                for ignored_re_pattern in ignored_re_patterns):
                     continue
                 
-                absolute_file_path = os.path.join(root, file_path)
+                absolute_file_path = root / file_path
                 
-                destination_file_path = os.path.join(
-                    source_folder_name,
-                    absolute_file_path[(len(source_folder) + len(os.sep)):]
-                )
+                destination_file_path = internal_pure_path / \
+                                                        absolute_file_path.name
                 
                 zip_file.write(absolute_file_path, destination_file_path)
                 
