Fix join_filename return value when basename or extension are e…

…mpty.
fabiocaccamo · Mar 19, 2024 · c8c7301 · c8c7301
1 parent f13bcfb
commit c8c7301
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/fsutil/__init__.py b/fsutil/__init__.py
@@ -881,8 +881,10 @@ def join_filename(basename: str, extension: str) -> str:
     """
     basename = basename.rstrip(".").strip()
     extension = extension.replace(".", "").strip()
-    filename = f"{basename}.{extension}"
-    return filename
+    if basename and extension:
+        filename = f"{basename}.{extension}"
+        return filename
+    return basename or extension
 
 
 def join_filepath(dirpath: PathIn, filename: str) -> str:

diff --git a/tests/test.py b/tests/test.py
@@ -805,6 +805,8 @@ def test_join_filename(self):
         self.assertEqual(fsutil.join_filename("Document", ".txt"), "Document.txt")
         self.assertEqual(fsutil.join_filename(" Document ", " txt "), "Document.txt")
         self.assertEqual(fsutil.join_filename("Document", " .txt "), "Document.txt")
+        self.assertEqual(fsutil.join_filename("Document", ""), "Document")
+        self.assertEqual(fsutil.join_filename("", "txt"), "txt")
 
     def test_join_filepath(self):
         self.assertEqual(