Handle changed ntpath.isabs behaviour in Python 3.13 (#110)

ntpath.isabs no longer considers paths that start with "/" to be absolute. This is correct behaviour on Windows but causes us problems, because our `PathConstants` use paths that start with / and expect these to always be considered absolute. To deal with this, let's add an extra slash to the `PathConstants`; paths starting `//` are considered absolute by both ntpath and posixpath. Signed-off-by: Adam Williamson <[email protected]>
fkie · Jun 13, 2024 · 701182c · 701182c
1 parent 3d3c092
commit 701182c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/catkin_lint/linter.py b/src/catkin_lint/linter.py
@@ -74,11 +74,11 @@ class PathClass(object):
 
 
 class PathConstants(object):
-    PACKAGE_SOURCE = "/%s" % generate_random_id()
-    PACKAGE_BINARY = "/%s" % generate_random_id()
-    CATKIN_DEVEL = "/%s" % generate_random_id()
-    CATKIN_INSTALL = "/%s" % generate_random_id()
-    DISCOVERED_PATH = "/%s" % generate_random_id()
+    PACKAGE_SOURCE = "//%s" % generate_random_id()
+    PACKAGE_BINARY = "//%s" % generate_random_id()
+    CATKIN_DEVEL = "//%s" % generate_random_id()
+    CATKIN_INSTALL = "//%s" % generate_random_id()
+    DISCOVERED_PATH = "//%s" % generate_random_id()
 
 
 class LintInfo(object):

diff --git a/test/test_checks_build.py b/test/test_checks_build.py
@@ -1113,7 +1113,7 @@ def test_exports(self):
             find_package(other_catkin REQUIRED)
             catkin_package(
             CATKIN_DEPENDS other_catkin
-            INCLUDE_DIRS /not/in/package
+            INCLUDE_DIRS //not/in/package
             )
             """,
                            checks=cc.exports)

diff --git a/test/test_linter.py b/test/test_linter.py
@@ -247,8 +247,8 @@ def test_package_path(self):
         self.assertEqual(info.source_relative_path("subdir/filename"), "subdir/filename")
         self.assertEqual(info.source_relative_path("subdir/../filename"), "filename")
         self.assertEqual(info.source_relative_path("/filename"), "/filename")
-        self.assertEqual(info.source_relative_path("../../../../filename"), "/filename")
-        self.assertEqual(info.source_relative_path("../../../../subdir/filename"), "/subdir/filename")
+        self.assertEqual(info.source_relative_path("../../../../filename"), "//filename")
+        self.assertEqual(info.source_relative_path("../../../../subdir/filename"), "//subdir/filename")
         info.var = {
             "CMAKE_CURRENT_SOURCE_DIR": "%s/subdir" % PathConstants.PACKAGE_SOURCE,
         }