-

cool-RR · cool-RR · commit 83905f163414 · 2014-01-05T01:34:57.000+02:00
diff --git a/source_py2/test_python_toolbox/test_temp_value_setting/test_temp_working_directory_setter.py b/source_py2/test_python_toolbox/test_temp_value_setting/test_temp_working_directory_setter.py
@@ -4,7 +4,7 @@
 '''Testing `python_toolbox.temp_value_setting.TempWorkingDirectorySetter`.'''
 
 import os
-import pathlib
+?import pathlib
 import shutil
 import tempfile
 
diff --git a/source_py3/python_toolbox/cute_profile/profile_handling.py b/source_py3/python_toolbox/cute_profile/profile_handling.py
@@ -4,6 +4,7 @@
 import threading
 import datetime as datetime_module
 import marshal
+import pathlib
 import abc
 import os.path
 import pstats
@@ -79,12 +80,11 @@ def thread_job(self):
 class FolderProfileHandler(AuxiliaryThreadProfileHandler):
     '''Profile handler that saves the profile to disk on separate thread.'''
     
-    def __init__(self, folder_path):
-        self.folder_path = folder_path
+    def __init__(self, folder):
+        self.folder = pathlib.Path(folder)
         
     def thread_job(self):
-        with open(os.path.join(self.folder_path, self.make_file_name()), \
-                                                          'wb') as output_file:
+        with (self.folder / self.make_file_name()).open('wb') as output_file:
             output_file.write(self.profile_data)
         
 
@@ -102,6 +102,9 @@ def handle(self):
 
 def get_profile_handler(profile_handler_string):
     '''Parse `profile_handler_string` into a `ProfileHandler` class.'''
+    if isinstance(profile_handler_string, pathlib.Path):
+        assert profile_handler_string.is_dir()
+        return FolderProfileHandler(profile_handler_string)
     if not profile_handler_string or profile_handler_string in \
                                                      ['0', '1', '2', '3', '4']:
         try:
diff --git a/source_py3/python_toolbox/import_tools.py b/source_py3/python_toolbox/import_tools.py
@@ -266,8 +266,8 @@ def _find_module_in_some_zip_path(module_name, path=None):
             #else:
                 #leading_path = ''
                 
-            return os.path.join(zip_path,
-                                _module_address_to_partial_path(module_name))
+            return pathlib.Path(str(zip_path)) / \
+                                   _module_address_to_partial_path(module_name)
 
     if original_path_argument is not None:
         raise ImportError('Module not found in the given zip path.')
diff --git a/source_py3/python_toolbox/os_tools.py b/source_py3/python_toolbox/os_tools.py
@@ -29,6 +29,5 @@ def start_file(path):
     
     
 _is_windows = (os.name == 'nt')
-null_path = pathlib.Path('\\Device\\Null') if _is_windows \
-                                                 else pathlib.Path('/dev/null')
+null_path = pathlib.Path(os.path.devnull)
 path_type = pathlib.WindowsPath if _is_windows else pathlib.PosixPath
diff --git a/source_py3/python_toolbox/sequence_tools.py b/source_py3/python_toolbox/sequence_tools.py
@@ -235,14 +235,16 @@ def to_tuple(single_or_sequence, item_type=None, item_test=None):
     which is the type of the items, or alternatively `item_test` which is a
     callable that takes an object and returns whether it's a valid item. These
     are necessary only when your items might be sequences themselves.
+    
+    You may optionally put multiple types in `item_type`, and each object would
+    be required to match to at least one of them.
     '''
     if (item_type is not None) and (item_test is not None):
         raise Exception('You may specify either `item_type` or '
                         '`item_test` but not both.')
     if item_test is not None:
         actual_item_test = item_test
     elif item_type is not None:
-        assert isinstance(item_type, type)
         actual_item_test = \
             lambda candidate: isinstance(candidate, item_type)
     else:
diff --git a/source_py3/python_toolbox/sys_tools.py b/source_py3/python_toolbox/sys_tools.py
@@ -5,12 +5,14 @@
 
 
 import sys
+import pathlib
 import io
 
 from python_toolbox.context_management import (ContextManager,
                                                     BlankContextManager)
 from python_toolbox.temp_value_setting import TempValueSetter
 from python_toolbox.reasoned_bool import ReasonedBool
+from python_toolbox import sequence_tools
 
 
 class OutputCapturer(ContextManager):
@@ -71,11 +73,11 @@ def __init__(self, addition):
         
         `addition` may be a path or a sequence of paths.
         '''
-        if isinstance(addition, str):
-            addition = [addition]
-        for entry in addition:
-            assert isinstance(entry, str)
-        self.addition = addition
+        self.addition = map(
+            unicode,
+            sequence_tools.to_tuple(addition,
+                                    item_type=(str, pathlib.PurePath))
+        )
 
         
     def __enter__(self):
diff --git a/source_py3/python_toolbox/temp_value_setting/temp_working_directory_setter.py b/source_py3/python_toolbox/temp_value_setting/temp_working_directory_setter.py
@@ -25,7 +25,6 @@ def __init__(self, working_directory):
         
         `working_directory` is the temporary working directory to use.
         '''
-        assert isinstance(working_directory, str)
         TempValueSetter.__init__(self,
                                  (os.getcwd, os.chdir),
-                                 value=working_directory)
+                                 value=str(working_directory))
diff --git a/source_py3/test_python_toolbox/__init__.py b/source_py3/test_python_toolbox/__init__.py
@@ -5,6 +5,7 @@
 
 import sys
 import os.path
+import pathlib
 
 import nose
 
@@ -43,12 +44,8 @@ def exists(module_name):
             return True
     
     if not exists('python_toolbox'):
-        python_toolbox_candidate_path = os.path.realpath(
-            os.path.join(
-                os.path.split(__file__)[0],
-                '..',
-            )
-        )
+        python_toolbox_candidate_path = \
+                                     pathlib(__file__).parent.parent.absolute()
         sys.path.append(python_toolbox_candidate_path)
         
         
diff --git a/source_py3/test_python_toolbox/test_cute_profile/test_cute_profile.py b/source_py3/test_python_toolbox/test_cute_profile/test_cute_profile.py
@@ -233,27 +233,27 @@ def test_folder_handler():
             f = cute_profile.profile_ready(profile_handler=temp_folder)(func)
     
             f(1, 2)
-            assert len(os.listdir(temp_folder)) == 0
+            assert len(list(temp_folder.iterdir())) == 0
     
             f(1, 2)
-            assert len(os.listdir(temp_folder)) == 0
+            assert len(list(temp_folder.iterdir())) == 0
     
             f.profiling_on = True
             
             f(1, 2)
-            assert len(os.listdir(temp_folder)) == 1
+            assert len(list(temp_folder.iterdir())) == 1
     
             f(1, 2)
-            assert len(os.listdir(temp_folder)) == 1
+            assert len(list(temp_folder.iterdir())) == 1
             
             time.sleep(0.01) # To make for a different filename.
             
             f.profiling_on = True
             f(1, 2)
 
-            assert len(os.listdir(temp_folder)) == 2
+            assert len(list(temp_folder.iterdir())) == 2
     
             f(1, 2)
-            assert len(os.listdir(temp_folder)) == 2
+            assert len(list(temp_folder.iterdir())) == 2
             
 
diff --git a/source_py3/test_python_toolbox/test_import_tools/test_exists/test_zip.py b/source_py3/test_python_toolbox/test_import_tools/test_exists/test_zip.py
@@ -34,10 +34,9 @@ def test_zip():
     with temp_file_tools.TemporaryFolder(prefix='test_python_toolbox_') \
                                                           as temp_folder:
 
-        temp_zip_path = os.path.join(temp_folder, 'archive_with_module.zip')
-        
-        with open(temp_zip_path, 'wb') as temp_zip_file:
+        temp_zip_path = temp_folder / 'archive_with_module.zip'
             
+        with temp_zip_path.open('wb') as temp_zip_file:
             temp_zip_file.write(zip_string)            
                 
         assert not exists('zip_imported_module_bla_bla')
diff --git a/source_py3/test_python_toolbox/test_sequence_tools/test_to_tuple.py b/source_py3/test_python_toolbox/test_sequence_tools/test_to_tuple.py
@@ -24,7 +24,9 @@ def test_item_type():
     '''Test the `item_type` argument.'''
     assert to_tuple(7, item_type=int) == (7,)
     assert to_tuple([7], item_type=list) == ([7],)
+    assert to_tuple([7], item_type=(list, tuple, float)) == ([7],)
     assert to_tuple((7,), item_type=tuple) == ((7,),)
+    assert to_tuple((7,), item_type=(tuple, range)) == ((7,),)
     
     
 def test_item_test():    
diff --git a/source_py3/test_python_toolbox/test_temp_value_setting/test_temp_working_directory_setter.py b/source_py3/test_python_toolbox/test_temp_value_setting/test_temp_working_directory_setter.py
@@ -4,6 +4,7 @@
 '''Testing `python_toolbox.temp_value_setting.TempWorkingDirectorySetter`.'''
 
 import os
+?import pathlib
 import shutil
 import tempfile
 
@@ -27,13 +28,13 @@ def test():
             # so we can't do `assert os.getcwd() == temp_dir`. Instead we'll
             # create a small file and check we can access it:
             
-            with open('just_a_file', 'w') as my_file:
-                my_file.write('One two three.')
+            with pathlib.Path('just_a_file').open('w') as my_file:
+                my_file.write(u'One two three.')
             
-            with open('just_a_file', 'r') as my_file:
+            with pathlib.Path('just_a_file').open('r') as my_file:
                 assert my_file.read() == 'One two three.'
         
-        with open(os.path.join(temp_folder, 'just_a_file'), 'r') as my_file:
+        with (temp_folder / 'just_a_file').open('r') as my_file:
             assert my_file.read() == 'One two three.'
         
         assert os.getcwd() == old_cwd
@@ -54,24 +55,23 @@ def test_exception():
                 # temp_folder`. Instead we'll create a small file and check we
                 # can access it:
                 
-                with open('just_a_file', 'w') as my_file:
-                    my_file.write('One two three.')
+                with pathlib.Path('just_a_file').open('w') as my_file:
+                    my_file.write(u'One two three.')
                 
-                with open('just_a_file', 'r') as my_file:
+                with pathlib.Path('just_a_file').open('r') as my_file:
                     assert my_file.read() == 'One two three.'
                 
                 raise MyException
             
         except MyException:
 
-            with open(os.path.join(temp_folder, 'just_a_file'), 'r') \
-                                                           as my_file:
+            with (temp_folder / 'just_a_file').open('r') as my_file:
                 assert my_file.read() == 'One two three.'
                 
         else:
             raise Exception
         
-        with open(os.path.join(temp_folder, 'just_a_file'), 'r') as my_file:
+        with (temp_folder / 'just_a_file').open('r') as my_file:
             assert my_file.read() == 'One two three.'
 
         
@@ -86,17 +86,17 @@ def f():
             # so we can't do `assert os.getcwd() == temp_folder`. Instead we'll
             # create a small file and check we can access it:
             
-            with open('just_a_file', 'w') as my_file:
-                my_file.write('One two three.')
+            with pathlib.Path('just_a_file').open('w') as my_file:
+                my_file.write(u'One two three.')
             
-            with open('just_a_file', 'r') as my_file:
+            with pathlib.Path('just_a_file').open('r') as my_file:
                 assert my_file.read() == 'One two three.'
                 
         f()
         
         cute_testing.assert_polite_wrapper(f)
         
-        with open(os.path.join(temp_folder, 'just_a_file'), 'r') as my_file:
+        with (temp_folder / 'just_a_file').open('r') as my_file:
             assert my_file.read() == 'One two three.'
         
         assert os.getcwd() == old_cwd
