From: INADA Naoki <methane@users.noreply.github.com>
Date: Tue, 14 Mar 2017 15:52:19 +0000 (+0900)
Subject: bpo-29592: site: skip abs_paths() when it's redundant (GH-167)
X-Git-Tag: v3.7.0a1~1127
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2e4e011795d26cab1a3843383d0539c12fea2458;p=python

bpo-29592: site: skip abs_paths() when it's redundant (GH-167)

Call abs_paths() only if removeduppaths() changed sys.path
---

diff --git a/Lib/site.py b/Lib/site.py
index 0fc92009e1..4f96ca9117 100644
--- a/Lib/site.py
+++ b/Lib/site.py
@@ -522,8 +522,13 @@ def main():
     """
     global ENABLE_USER_SITE
 
-    abs_paths()
+    orig_path = sys.path[:]
     known_paths = removeduppaths()
+    if orig_path != sys.path:
+        # removeduppaths() might make sys.path absolute.
+        # fix __file__ and __cached__ of already imported modules too.
+        abs_paths()
+
     known_paths = venv(known_paths)
     if ENABLE_USER_SITE is None:
         ENABLE_USER_SITE = check_enableusersite()