Wrap usage of get_makefile_filename (#1811)

pypa · May 4, 2020 · 73793c7 · 73793c7
1 parent 6dffcf2
commit 73793c7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/docs/changelog/1810.bugfix.rst b/docs/changelog/1810.bugfix.rst
@@ -0,0 +1 @@
+Fixes older CPython2 versions use ``_get_makefile_filename`` instead of ``get_makefile_filename`` on ``sysconfig`` - by :user:`ianw`.
diff --git a/src/virtualenv/create/debug.py b/src/virtualenv/create/debug.py
@@ -55,7 +55,9 @@ def run():
     try:
         import sysconfig
 
-        result["makefile_filename"] = encode_path(sysconfig.get_makefile_filename())
+        # https://bugs.python.org/issue22199
+        makefile = getattr(sysconfig, "get_makefile_filename", getattr(sysconfig, "_get_makefile_filename", None))
+        result["makefile_filename"] = encode_path(makefile())
     except ImportError:
         pass
 

diff --git a/src/virtualenv/discovery/py_info.py b/src/virtualenv/discovery/py_info.py
@@ -75,11 +75,13 @@ def abs_path(v):
         self.stdout_encoding = u(getattr(sys.stdout, "encoding", None))
 
         self.sysconfig_paths = {u(i): u(sysconfig.get_path(i, expand=False)) for i in sysconfig.get_path_names()}
-
+        # https://bugs.python.org/issue22199
+        makefile = getattr(sysconfig, "get_makefile_filename", getattr(sysconfig, "_get_makefile_filename", None))
         self.sysconfig = {
             u(k): u(v)
-            for k, v in [  # a list of content to store from sysconfig
-                ("makefile_filename", sysconfig.get_makefile_filename()),
+            for k, v in [
+                # a list of content to store from sysconfig
+                ("makefile_filename", makefile()),
             ]
             if k is not None
         }