refractor

Author: bitranox

lib_path/lib_path.py

@@ -72,21 +72,19 @@ def log_and_raise_if_not_isdir(path_dir: pathlib.Path) -> None:
 def log_and_raise_if_target_directory_within_source_directory(path_source_dir: pathlib.Path, path_target_dir: pathlib.Path) -> None:
     """
     >>> # Setup
-    >>> path_source_dir=pathlib.Path('./test')
-    >>> path_target_dir_ok=pathlib.Path('./test2/test')
-    >>> path_target_dir_err=pathlib.Path('./test/test2')
+    >>> path_source_dir=pathlib.Path('/test')
+    >>> path_target_dir_ok=pathlib.Path('/test2/test')
+    >>> path_target_dir_err=pathlib.Path('/test/test2')
+
+    >>> # Test OK
+    >>> log_and_raise_if_target_directory_within_source_directory(path_source_dir, path_target_dir_ok)
 
     >>> # Test ERR
     >>> log_and_raise_if_target_directory_within_source_directory(path_source_dir, path_target_dir_err)
     Traceback (most recent call last):
     ...
     FileExistsError: target directory: "..." is within the source directory "..."
 
-
-    >>> # Test OK
-    >>> log_and_raise_if_target_directory_within_source_directory(path_source_dir, path_target_dir_ok)
-
-
     """
     if is_target_directory_within_source_directory(path_source_dir, path_target_dir):
         s_error = 'target directory: "{}" is within the source directory "{}"'.format(path_target_dir, path_source_dir)
@@ -95,9 +93,8 @@ def log_and_raise_if_target_directory_within_source_directory(path_source_dir: p
 
 
 def is_target_directory_within_source_directory(path_source_dir: pathlib.Path, path_target_dir: pathlib.Path) -> bool:
-    s_source_dir = str(path_source_dir.resolve()) + '/'
-    s_target_dir = str(path_target_dir.resolve()) + '/'
-    logger.error('S:' + s_source_dir + ' T:' + s_target_dir)
+    s_source_dir = str(path_source_dir.resolve()).replace('\\', '/') + '/'
+    s_target_dir = str(path_target_dir.resolve()).replace('\\', '/') + '/'
     if s_target_dir.startswith(s_source_dir):
         return True
     else: