-

cool-RR · cool-RR · commit de70833d9277 · 2014-01-06T20:38:59.000+02:00
diff --git a/source_py2/python_toolbox/import_tools.py b/source_py2/python_toolbox/import_tools.py
@@ -34,7 +34,7 @@ def import_all(package, exclude='__init__', silent_fail=False):
     
     names = {}
     for path in paths:
-        name = str(path.name[:-len(path.suffix)] if path.suffix else path.name)
+        name = path.stem
         if name == exclude:
             continue
         full_name = package.__name__ + '.' + name
@@ -162,8 +162,7 @@ def import_by_path(path, name=None, keep_in_sys_modules=True):
         module = _import_by_path_from_zip(path)
         
     else: # '.zip' not in path
-        short_name = str(path.name[:-len(path.suffix)] if path.suffix
-                         else path.name)
+        short_name = path.stem
         
         if name is None: name = short_name
         my_file = None
diff --git a/source_py2/python_toolbox/package_finder.py b/source_py2/python_toolbox/package_finder.py
@@ -80,7 +80,7 @@ def get_packages_and_modules_filenames(root, recursive=False):
     #                                                                         #
                 
     filename_to_module_name = {
-        filename: filename[:-len(filename.suffix)] for filename in result
+        filename: filename.stem for filename in result
     }
     module_name_to_filenames = \
         dict_tools.reverse_with_set_values(filename_to_module_name)
diff --git a/source_py2/python_toolbox/zip_tools.py b/source_py2/python_toolbox/zip_tools.py
@@ -32,7 +32,7 @@ def zip_folder(source_folder, zip_path, ignored_patterns=()):
     ignored_re_patterns = [re.compile(fnmatch.translate(ignored_pattern)) for
                            ignored_pattern in ignored_patterns]
     
-    zip_name = zip_path.name[:-len(zip_path.suffix)]
+    zip_name = zip_path.stem
     
     internal_pure_path = pathlib.PurePath(source_folder.name)
             

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ def get_packages_and_modules_filenames(root, recursive=False):`
`80`	`80`	`# #`
`81`	`81`
`82`	`82`	`filename_to_module_name = {`
`83`		`- filename: filename[:-len(filename.suffix)] for filename in result`
	`83`	`+ filename: filename.stem for filename in result`
`84`	`84`	`}`
`85`	`85`	`module_name_to_filenames = \`
`86`	`86`	`dict_tools.reverse_with_set_values(filename_to_module_name)`