match against site-packages before stdlib

Author: tybug

hypothesis-python/RELEASE.rst

@@ -1,3 +1,3 @@
 RELEASE_TYPE: patch
 
-When reporting the always-passing, never-failing lines from the |Phase.explain| phase, we now sort the reported lines so that local code shows up first, then third-party library code, then standard library code.
+When reporting the always-failing, never-passing lines from the |Phase.explain| phase, we now sort the reported lines so that local code shows up first, then third-party library code, then standard library code.

hypothesis-python/src/hypothesis/internal/scrutineer.py

@@ -232,13 +232,15 @@ def get_explaining_locations(traces):
 
 
 # show local files first, then site-packages, then stdlib
-def _sort_key(fname, lineno):
-    fname = Path(fname).resolve()
-    if any(fname.is_relative_to(p) for p in STDLIB_DIRS):
-        return (2, fname, lineno)
-    if any(fname.is_relative_to(p) for p in SITE_PACKAGES_DIRS):
-        return (1, fname, lineno)
-    return (0, fname, lineno)
+def _sort_key(path, lineno):
+    path = Path(path).resolve()
+    # site-packages may be a subdir of stdlib or platlib, so it's important to
+    # check is_relative_to for this before the stdlib.
+    if any(path.is_relative_to(p) for p in SITE_PACKAGES_DIRS):
+        return (1, path, lineno)
+    if any(path.is_relative_to(p) for p in STDLIB_DIRS):
+        return (2, path, lineno)
+    return (0, path, lineno)
 
 
 def make_report(explanations, *, cap_lines_at=5):

hypothesis-python/tests/nocover/test_scrutineer.py

@@ -127,9 +127,9 @@ def test_report_sort(random):
         (json.__file__, 42),
     ]
     random.shuffle(lines)
-    explanations = {"origin1": lines}
+    explanations = {"origin": lines}
     report = make_report(explanations)
-    report_lines = report["origin1"][2:]
+    report_lines = report["origin"][2:]
     report_lines = [line.strip() for line in report_lines]
 
     expected_lines = [