-

cool-RR · cool-RR · commit b09461c81713 · 2014-01-06T15:44:19.000+02:00
diff --git a/setup.py b/setup.py
@@ -145,12 +145,16 @@ def get_packages():
 ]
 
 
+install_requires = ['setuptools']
+if sys.version_info[:2] <= (3, 3):
+    install_requires.append('pathlib>=0.97')
+    
+
 setuptools.setup(
     name='python_toolbox',
     version='0.6.3',
-    requires=['setuptools'],
     test_suite='nose.collector',
-    install_requires=['setuptools', 'pathlib>=0.97'],
+    install_requires=install_requires,
     tests_require=['nose>=1.0.0',
                    'docutils>=0.8'],
     description='A collection of Python tools for various tasks',
diff --git a/source_py3/python_toolbox/import_tools.py b/source_py3/python_toolbox/import_tools.py
@@ -35,7 +35,7 @@ def import_all(package, exclude='__init__', silent_fail=False):
     
     names = {}
     for path in paths:
-        name = str(path.parts[-1][:-len(path.suffix)])
+        name = str(path.name[:-len(path.suffix)] if path.suffix else path.name)
         if name == exclude:
             continue
         full_name = package.__name__ + '.' + name
@@ -164,7 +164,8 @@ 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.parts[-1][:-len(path.suffix)])
+        short_name = str(path.name[:-len(path.suffix)] if path.suffix
+                         else path.name)
         
         if name is None: name = short_name
         my_file = None
diff --git a/source_py3/python_toolbox/misc_tools/__init__.py b/source_py3/python_toolbox/misc_tools/__init__.py
@@ -9,7 +9,7 @@
     is_magic_variable_name, get_actual_type, is_number, identity_function,
     do_nothing, OwnNameDiscoveringDescriptor, find_clear_place_on_circle,
     general_sum, general_product, is_legal_email_address, is_type, NonInstatiable,
-    repeat_getattr
+    repeat_getattr, add_extension_if_plain
 )
 from . import name_mangling
 from .proxy_property import ProxyProperty
diff --git a/source_py3/python_toolbox/misc_tools/misc_tools.py b/source_py3/python_toolbox/misc_tools/misc_tools.py
@@ -223,16 +223,15 @@ def find_clear_place_on_circle(circle_points, circle_size=1):
         
     
 def add_extension_if_plain(path, extension):
-    '''Add `extenstion` to a file path if it doesn't have an extenstion.'''
+    '''Add `extension` to a file path if it doesn't have an extension.'''
     
     path = pathlib.Path(path)
     
-    if extension:
+    if extension and not path.suffix:
         assert extension.startswith('.')
-    if path.suffix:
-        return pathlib.Path(str(path)[:-len(path.suffix) + extension])
-    else:
-        return path
+        return pathlib.Path(str(path) + extension)
+        
+    return path
     
     
 def general_sum(things, start=None):
diff --git a/source_py3/test_python_toolbox/test_misc_tools/test_add_extension_if_plain.py b/source_py3/test_python_toolbox/test_misc_tools/test_add_extension_if_plain.py
@@ -0,0 +1,21 @@
+# Copyright 2009-2014 Ram Rachum.
+# This program is distributed under the MIT license.
+
+'''Testing module for `find_clear_place_on_circle`.'''
+
+import pathlib
+
+import nose.tools
+
+from python_toolbox import temp_file_tools
+
+from python_toolbox.misc_tools import add_extension_if_plain
+
+
+def test():
+    assert str(add_extension_if_plain(r'''c:\hello.zip''', '.ogg')) == \
+                                                            r'''c:\hello.zip'''
+    assert str(add_extension_if_plain(r'''c:\hello''', '.ogg')) == \
+                                                            r'''c:\hello.ogg'''
+    assert str(add_extension_if_plain(r'''c:\hello''', '.mkv')) == \
+                                                            r'''c:\hello.mkv'''

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`is_magic_variable_name, get_actual_type, is_number, identity_function,`
`10`	`10`	`do_nothing, OwnNameDiscoveringDescriptor, find_clear_place_on_circle,`
`11`	`11`	`general_sum, general_product, is_legal_email_address, is_type, NonInstatiable,`
`12`		`- repeat_getattr`
	`12`	`+ repeat_getattr, add_extension_if_plain`
`13`	`13`	`)`
`14`	`14`	`from . import name_mangling`
`15`	`15`	`from .proxy_property import ProxyProperty`