From 0485c5a6e22af35dd749b8688d411e3900009b7c Mon Sep 17 00:00:00 2001
From: Kay Hayen <kay.hayen@gmail.com>
Date: Thu, 20 Feb 2020 10:35:07 +0100
Subject: [PATCH] Hints: Enhanced tracing of standalone binaries

* We consider the binary directory as PYTHONPATH too,
  so outputs will be more similar.

* Also more robust comparison and modification of paths
  which ought to be useful for Windows.
---
 lib/hints.py | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/lib/hints.py b/lib/hints.py
index a4803f0866..233d544f6a 100644
--- a/lib/hints.py
+++ b/lib/hints.py
@@ -36,13 +36,24 @@ def _normalizePath(path):
 
     best = None
 
-    for path_entry in sys.path:
-        if path.startswith(path_entry):
+    paths = list(sys.path)
+
+    # Nuitka standalone mode.
+    try:
+        paths.append(__nuitka_binary_dir)
+        paths.append(os.getcwd())
+    except NameError:
+        pass
+
+    for path_entry in paths:
+        path_entry = os.path.normcase(path_entry)
+
+        if os.path.normcase(path).startswith(path_entry):
             if best is None or len(path_entry) > len(best):
                 best = path_entry
 
     if best is not None:
-        path = path.replace(best, "$PYTHONPATH")
+        path = "$PYTHONPATH" + path[len(best) :]
 
     return path