GoogleCloudPlatform · jasonborg · Mar 1, 2023 · Mar 1, 2023 · Mar 1, 2023 · Mar 1, 2023
diff --git a/src/googleclouddebugger/module_utils.py b/src/googleclouddebugger/module_utils.py
@@ -16,6 +16,26 @@
 import os
 import sys
 
+def NormalizePath(path):
+  """Normalizes a path.
+
+  E.g. One example is it will convert "/a/b/./c" -> "/a/b/c"
+  """
+  # TODO: Calling os.path.normpath "may change the meaning of a
+  # path that contains symbolic links" (e.g., "A/foo/../B" != "A/B" if foo is a
+  # symlink). This might cause trouble when matching against loaded module
+  # paths. We should try to avoid using it.
+  # Example:
+  #  > import symlink.a
+  #  > symlink.a.__file__
+  #  symlink/a.py
+  #  > import target.a
+  #  > starget.a.__file__
+  #  target/a.py
+  # Python interpreter treats these as two separate modules. So, we also need to
+  # handle them the same way.
+  return os.path.normpath(path)
+
 
 def IsPathSuffix(mod_path, path):
   """Checks whether path is a full path suffix of mod_path.
@@ -69,6 +89,11 @@ def GetLoadedModuleBySuffix(path):
     if not os.path.isabs(mod_root):
       mod_root = os.path.join(os.getcwd(), mod_root)
 
+    # In the following invocation 'python3 ./main.py' (using the ./), the
+    # mod_root variable will '/base/path/./main'. In order to correctly compare
+    # it with the root variable, it needs to be '/base/path/main'.
+    mod_root = NormalizePath(mod_root)
+
     if IsPathSuffix(mod_root, root):
       return module
 

diff --git a/src/googleclouddebugger/python_breakpoint.py b/src/googleclouddebugger/python_breakpoint.py
@@ -134,20 +134,7 @@ def _MultipleModulesFoundError(path, candidates):
 
 def _NormalizePath(path):
   """Removes surrounding whitespace, leading separator and normalize."""
-  # TODO: Calling os.path.normpath "may change the meaning of a
-  # path that contains symbolic links" (e.g., "A/foo/../B" != "A/B" if foo is a
-  # symlink). This might cause trouble when matching against loaded module
-  # paths. We should try to avoid using it.
-  # Example:
-  #  > import symlink.a
-  #  > symlink.a.__file__
-  #  symlink/a.py
-  #  > import target.a
-  #  > starget.a.__file__
-  #  target/a.py
-  # Python interpreter treats these as two separate modules. So, we also need to
-  # handle them the same way.
-  return os.path.normpath(path.strip().lstrip(os.sep))
+  return module_utils.NormalizePath(path.strip().lstrip(os.sep))
 
 
 class PythonBreakpoint(object):

diff --git a/tests/py/module_utils_test.py b/tests/py/module_utils_test.py
@@ -156,6 +156,13 @@ def testMainLoadedModuleFromSuffix(self):
     self.assertTrue(m1, 'Module not found')
     self.assertEqual('/a/b/p/m.pyc', m1.__file__)
 
+  def testMainWithDotSlashLoadedModuleFromSuffix(self):
+    # Lookup module started via 'python3 ./m.py', notice the './'
+    _AddSysModule('__main__', '/a/b/p/./m.pyc')
+    m1 = module_utils.GetLoadedModuleBySuffix('/a/b/p/m.py')
+    self.assertIsNotNone(m1)
+    self.assertTrue(m1, 'Module not found')
+    self.assertEqual('/a/b/p/./m.pyc', m1.__file__)
 
 if __name__ == '__main__':
   absltest.main()