Make change a bit more compact and add changelog

Signed-off-by: Bernat Gabor <bgabor8@bloomberg.net>

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`.

src/virtualenv/create/debug.py

@@ -55,14 +55,9 @@ def run():
     try:
         import sysconfig
 
-        try:
-            get_makefile_filename = sysconfig.get_makefile_filename
-        except AttributeError:
-            # On some platforms, get_makefile_filename doesn't exist
-            #  https://bugs.python.org/issue22199
-            get_makefile_filename = sysconfig._get_makefile_filename
-
-        result["makefile_filename"] = encode_path(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
 

src/virtualenv/discovery/py_info.py

@@ -24,14 +24,6 @@ def _get_path_extensions():
     return list(OrderedDict.fromkeys([""] + os.environ.get("PATHEXT", "").lower().split(os.pathsep)))
 
 
-try:
-    get_makefile_filename = sysconfig.get_makefile_filename
-except AttributeError:
-    # On some platforms, get_makefile_filename doesn't exist
-    #  https://bugs.python.org/issue22199
-    get_makefile_filename = sysconfig._get_makefile_filename
-
-
 EXTENSIONS = _get_path_extensions()
 _CONF_VAR_RE = re.compile(r"\{\w+\}")
 
@@ -83,12 +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", get_makefile_filename()),
+                ("makefile_filename", makefile()),
             ]
             if k is not None
         }