More elaborate comments about copied functions.

python · methane · Jun 28, 2017 · Feb 18, 2017 · Feb 18, 2017 · Feb 16, 2017
commit 33c420ac292a365ed06ea5105cc4298bccf9d4d9
diff --git a/Lib/site.py b/Lib/site.py
@@ -235,8 +235,14 @@ def check_enableusersite():
     return True
 
 
+# NOTE: sysconfig and it's dependencies are relatively large but site module
+# needs very limited part of them.
+# To speedup startup time, we have copy of them.
+#
+# See https://bugs.python.org/issue29585
+
+# Copy of sysconfig._getuserbase()
 def _getuserbase():
-    # Stripped version of sysconfig._getuserbase()
     env_base = os.environ.get("PYTHONUSERBASE", None)
     if env_base:
         return env_base
@@ -255,6 +261,19 @@ def joinuser(*args):
     return joinuser("~", ".local")
 
 
+# Same to sysconfig.get_path('purelib', os.name+'_user')
+def _get_path(userbase):
+    version = sys.version_info
+
+    if os.name == 'nt':
+        return f'{userbase}/Python{version[0]}{version[1]}/site-packages'
+
+    if sys.platform == 'darwin' and sys._framework:
+        return f'{userbase}/lib/python/site-packages'
+
+    return f'{userbase}/lib/python{version[0]}.{version[1]}/site-packages'
+
+
 def getuserbase():
     """Returns the `user base` directory path.
 
@@ -268,19 +287,6 @@ def getuserbase():
     return USER_BASE
 
 
-def _get_path(userbase):
-    # stripped version of sysconfig.get_path('purelib', os.name + '_user')
-    version = sys.version_info[:2]
-
-    if os.name == 'nt':
-        return f'{userbase}/Python{version[0]}{version[1]}/site-packages'
-
-    if sys.platform == 'darwin' and sys._framework:
-        return f'{userbase}/lib/python/site-packages'
-
-    return f'{userbase}/lib/python{version[0]}.{version[1]}/site-packages'
-
-
 def getusersitepackages():
     """Returns the user-specific site-packages directory path.
 

diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
@@ -178,34 +178,25 @@ def _get_default_scheme():
     return os.name
 
 
-# NOTE: site.py has stripped copy of this function.
-# Update it too when modify this function.
+# NOTE: site.py has copy of this function.
+# Sync it when modify this function.
 def _getuserbase():
     env_base = os.environ.get("PYTHONUSERBASE", None)
+    if env_base:
+        return env_base
 
     def joinuser(*args):
         return os.path.expanduser(os.path.join(*args))
 
     if os.name == "nt":
         base = os.environ.get("APPDATA") or "~"
-        if env_base:
-            return env_base
-        else:
-            return joinuser(base, "Python")
+        return joinuser(base, "Python")
 
-    if sys.platform == "darwin":
-        framework = get_config_var("PYTHONFRAMEWORK")
-        if framework:
-            if env_base:
-                return env_base
-            else:
-                return joinuser("~", "Library", framework, "%d.%d" %
-                                sys.version_info[:2])
+    if sys.platform == "darwin" and sys._framework:
+        return joinuser("~", "Library", sys._framework,
+                        "%d.%d" % sys.version_info[:2])
 
-    if env_base:
-        return env_base
-    else:
-        return joinuser("~", ".local")
+    return joinuser("~", ".local")
 
 
 def _parse_makefile(filename, vars=None):