Use regex substitution and add one more test

dimagi · Mar 27, 2024 · 6af14f6 · 6af14f6
1 parent 2781e73
commit 6af14f6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/commcare_export/__init__.py b/commcare_export/__init__.py
@@ -1,5 +1,6 @@
 import logging
 import os
+import re
 from .version import __version__
 
 repo_root = os.path.abspath(os.path.join(__file__, os.pardir, os.pardir))
@@ -18,11 +19,8 @@ def write(self, buf):
 
 def logger_name_from_filepath(filepath):
     relative_path = os.path.relpath(filepath, start=repo_root)
-    return (
-        relative_path.
-        replace('/', '.').
-        strip('.py')
-    )
+    cleaned_path = relative_path.replace('/', '.')
+    return re.sub(r'\.py$', '', cleaned_path)
 
 
 def get_error_logger():

diff --git a/tests/test_commcare_export.py b/tests/test_commcare_export.py
@@ -27,3 +27,7 @@ def test_file_contains_py(self):
     def test_file_dir_contains_periods(self):
         path = self._file_path("sub.dir/pytest.py")
         assert logger_name_from_filepath(path) == 'sub.dir.pytest'
+
+    def test_random_file_name(self):
+        path = self._file_path("pyppy.excel_query.py")
+        assert logger_name_from_filepath(path) == 'pyppy.excel_query'