Merge pull request #254 from joerick/show-built-in

Stop built-in code showing as 'None' in traces

pyinstrument/frame.py

@@ -151,24 +151,29 @@ def file_path_short(self) -> str | None:
             return self.parent.file_path_short
 
         if not hasattr(self, "_file_path_short"):
-            if self.file_path:
-                result = None
-
-                for path in sys.path:
-                    # On Windows, if self.file_path and path are on different drives, relpath
-                    # will result in exception, because it cannot compute a relpath in this case.
-                    # The root cause is that on Windows, there is no root dir like '/' on Linux.
-                    try:
-                        candidate = os.path.relpath(self.file_path, path)
-                    except ValueError:
-                        continue
-
-                    if not result or (len(candidate.split(os.sep)) < len(result.split(os.sep))):
-                        result = candidate
+            result = None
 
-                self._file_path_short = result
-            else:
-                self._file_path_short = None
+            if self.file_path:
+                if len(self.file_path.split(os.sep)) == 1:
+                    # probably not a file path at all, more likely <built-in>
+                    # or similar
+                    result = self.file_path
+                else:
+                    for path in sys.path:
+                        # On Windows, if self.file_path and path are on
+                        # different drives, relpath will result in exception,
+                        # because it cannot compute a relpath in this case.
+                        # The root cause is that on Windows, there is no root
+                        # dir like '/' on Linux.
+                        try:
+                            candidate = os.path.relpath(self.file_path, path)
+                        except ValueError:
+                            continue
+
+                        if not result or (len(candidate.split(os.sep)) < len(result.split(os.sep))):
+                            result = candidate
+
+            self._file_path_short = result
 
         return self._file_path_short
 
@@ -204,6 +209,7 @@ def is_application_code(self) -> bool:
     def code_position_short(self) -> str | None:
         if self.file_path_short and self.line_no:
             return "%s:%i" % (self.file_path_short, self.line_no)
+        return self.file_path_short
 
     _children: list[Frame]
     attributes: dict[str, float]