From 4b5614c9e2c32abaa0d0d121eb16c5db7a3b5eac Mon Sep 17 00:00:00 2001
From: Chris Hunt <chrahunt@gmail.com>
Date: Sat, 23 Nov 2019 18:02:22 -0500
Subject: [PATCH] Replace get_impl_ver with interpreter_version

---
 src/pip/_internal/cache.py      |  3 ++-
 src/pip/_internal/pep425tags.py | 15 ++-------------
 tests/unit/test_pep425tags.py   |  4 ++--
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/pip/_internal/cache.py b/src/pip/_internal/cache.py
index 53c3aed92..a4bfba118 100644
--- a/src/pip/_internal/cache.py
+++ b/src/pip/_internal/cache.py
@@ -9,12 +9,13 @@ import json
 import logging
 import os
 
+from pip._vendor.packaging.tags import interpreter_version
 from pip._vendor.packaging.utils import canonicalize_name
 
 from pip._internal.exceptions import InvalidWheelFilename
 from pip._internal.models.link import Link
 from pip._internal.models.wheel import Wheel
-from pip._internal.pep425tags import interpreter_name, interpreter_version
+from pip._internal.pep425tags import interpreter_name
 from pip._internal.utils.compat import expanduser
 from pip._internal.utils.temp_dir import TempDirectory
 from pip._internal.utils.typing import MYPY_CHECK_RUNNING
diff --git a/src/pip/_internal/pep425tags.py b/src/pip/_internal/pep425tags.py
index 3a291ebae..d265fd96c 100644
--- a/src/pip/_internal/pep425tags.py
+++ b/src/pip/_internal/pep425tags.py
@@ -9,6 +9,7 @@ import sys
 import sysconfig
 from collections import OrderedDict
 
+from pip._vendor.packaging.tags import interpreter_version
 from pip._vendor.six import PY2
 
 import pip._internal.utils.glibc
@@ -63,18 +64,6 @@ def version_info_to_nodot(version_info):
     return ''.join(map(str, version_info[:2]))
 
 
-def get_impl_ver():
-    # type: () -> str
-    """Return implementation version."""
-    impl_ver = get_config_var("py_version_nodot")
-    if not impl_ver or get_abbr_impl() == 'pp':
-        impl_ver = ''.join(map(str, get_impl_version_info()))
-    return impl_ver
-
-
-interpreter_version = get_impl_ver
-
-
 def get_impl_version_info():
     # type: () -> Tuple[int, ...]
     """Return sys.version_info-like tuple for use in decrementing the minor
@@ -126,7 +115,7 @@ def get_abi_tag():
                 'Py_UNICODE_SIZE', lambda: sys.maxunicode == 0x10ffff,
                 expected=4, warn=is_cpython):
             u = 'u'
-        abi = '%s%s%s%s%s' % (impl, get_impl_ver(), d, m, u)
+        abi = '%s%s%s%s%s' % (impl, interpreter_version(), d, m, u)
     elif soabi and soabi.startswith('cpython-'):
         abi = 'cp' + soabi.split('-')[1]
     elif soabi:
diff --git a/tests/unit/test_pep425tags.py b/tests/unit/test_pep425tags.py
index 6de10b9d0..540aa8b7c 100644
--- a/tests/unit/test_pep425tags.py
+++ b/tests/unit/test_pep425tags.py
@@ -2,6 +2,7 @@ import sys
 
 import pytest
 from mock import patch
+from pip._vendor.packaging.tags import interpreter_version
 
 from pip._internal import pep425tags
 
@@ -53,8 +54,7 @@ class TestPEP425Tags(object):
         import pip._internal.pep425tags
 
         config_vars.update({'SOABI': None})
-        base = pip._internal.pep425tags.get_abbr_impl() + \
-            pip._internal.pep425tags.get_impl_ver()
+        base = pip._internal.pep425tags.get_abbr_impl() + interpreter_version()
 
         if sys.version_info >= (3, 8):
             # Python 3.8 removes the m flag, so don't look for it.