diff options
| author | Seth Troisi <sethtroisi@google.com> | 2020-01-15 17:03:58 -0800 |
|---|---|---|
| committer | Seth Troisi <sethtroisi@google.com> | 2020-01-20 15:22:57 -0800 |
| commit | 9a21ec857b22ff0140a7f71a12f2cc943f163404 (patch) | |
| tree | 1f8b26a1bb346fab26d2210de286d29011bf2bf1 /numpy/distutils/cpuinfo.py | |
| parent | b753aa7a3a2c958e70826fb8af3b56db5c758819 (diff) | |
| download | numpy-9a21ec857b22ff0140a7f71a12f2cc943f163404.tar.gz | |
[MAINT] Cleanup python2 sys.version checks
Diffstat (limited to 'numpy/distutils/cpuinfo.py')
| -rw-r--r-- | numpy/distutils/cpuinfo.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/numpy/distutils/cpuinfo.py b/numpy/distutils/cpuinfo.py index efea90113..e066f9888 100644 --- a/numpy/distutils/cpuinfo.py +++ b/numpy/distutils/cpuinfo.py @@ -17,10 +17,7 @@ __all__ = ['cpu'] import sys, re, types import os -if sys.version_info[0] >= 3: - from subprocess import getstatusoutput -else: - from commands import getstatusoutput +from subprocess import getstatusoutput import warnings import platform @@ -484,10 +481,7 @@ class Win32CPUInfo(CPUInfoBase): info = [] try: #XXX: Bad style to use so long `try:...except:...`. Fix it! - if sys.version_info[0] >= 3: - import winreg - else: - import _winreg as winreg + import winreg prgx = re.compile(r"family\s+(?P<FML>\d+)\s+model\s+(?P<MDL>\d+)" r"\s+stepping\s+(?P<STP>\d+)", re.IGNORECASE) |