diff --git a/psutil/__init__.py b/psutil/__init__.py index 7e36e4fb6..2b1567065 100644 --- a/psutil/__init__.py +++ b/psutil/__init__.py @@ -2189,7 +2189,7 @@ def net_if_addrs(): Note: you can have more than one address of the same family associated with each interface. """ - has_enums = sys.version_info[0] >= 3 + has_enums = _PY3 if has_enums: import socket rawlist = _psplatform.net_if_addrs() diff --git a/psutil/_common.py b/psutil/_common.py index b9049e63a..a0d49d638 100644 --- a/psutil/_common.py +++ b/psutil/_common.py @@ -35,14 +35,15 @@ except ImportError: AF_UNIX = None -if sys.version_info[0] >= 3: + +# can't take it from _common.py as this script is imported by setup.py +PY3 = sys.version_info[0] == 3 +if PY3: import enum else: enum = None -# can't take it from _common.py as this script is imported by setup.py -PY3 = sys.version_info[0] == 3 PSUTIL_DEBUG = bool(os.getenv('PSUTIL_DEBUG')) _DEFAULT = object() diff --git a/psutil/_pslinux.py b/psutil/_pslinux.py index aaee9df86..e0acb0e29 100644 --- a/psutil/_pslinux.py +++ b/psutil/_pslinux.py @@ -53,7 +53,7 @@ from ._compat import basestring -if sys.version_info[0] >= 3: +if PY3: import enum else: enum = None diff --git a/psutil/_psposix.py b/psutil/_psposix.py index 4cc63439c..0039daf44 100644 --- a/psutil/_psposix.py +++ b/psutil/_psposix.py @@ -28,7 +28,7 @@ from . import _psutil_osx -if sys.version_info[0] >= 3: +if PY3: import enum else: enum = None diff --git a/psutil/_pswindows.py b/psutil/_pswindows.py index eeabc81fe..eec2db84d 100644 --- a/psutil/_pswindows.py +++ b/psutil/_pswindows.py @@ -56,7 +56,7 @@ else: raise -if sys.version_info[0] >= 3: +if PY3: import enum else: enum = None diff --git a/psutil/tests/__init__.py b/psutil/tests/__init__.py index 51b627979..0781f0686 100644 --- a/psutil/tests/__init__.py +++ b/psutil/tests/__init__.py @@ -67,7 +67,7 @@ warnings.simplefilter("ignore") import mock # NOQA - requires "pip install mock" -if sys.version_info[0] >= 3: +if PY3: import enum else: enum = None diff --git a/psutil/tests/test_contracts.py b/psutil/tests/test_contracts.py index b1a5af566..e0bb92ce5 100755 --- a/psutil/tests/test_contracts.py +++ b/psutil/tests/test_contracts.py @@ -15,7 +15,6 @@ import platform import signal import stat -import sys import time import traceback import unittest @@ -36,6 +35,7 @@ from psutil._compat import long from psutil._compat import range from psutil._compat import unicode +from psutil._compat import PY3 from psutil.tests import APPVEYOR from psutil.tests import CI_TESTING from psutil.tests import GITHUB_ACTIONS @@ -723,7 +723,7 @@ def nice(self, ret, info): priorities = [getattr(psutil, x) for x in dir(psutil) if x.endswith('_PRIORITY_CLASS')] self.assertIn(ret, priorities) - if sys.version_info[0] >= 3: + if PY3: self.assertIsInstance(ret, enum.IntEnum) else: self.assertIsInstance(ret, int) diff --git a/psutil/tests/test_system.py b/psutil/tests/test_system.py index aba88be8d..3f9676294 100755 --- a/psutil/tests/test_system.py +++ b/psutil/tests/test_system.py @@ -32,6 +32,7 @@ from psutil import WINDOWS from psutil._compat import FileNotFoundError from psutil._compat import long +from psutil._compat import PY3 from psutil.tests import ASCII_FS from psutil.tests import CI_TESTING from psutil.tests import DEVNULL @@ -751,7 +752,7 @@ def test_net_if_addrs(self): self.assertIsInstance(addr.netmask, (str, type(None))) self.assertIsInstance(addr.broadcast, (str, type(None))) self.assertIn(addr.family, families) - if sys.version_info[0] >= 3 and not PYPY: + if PY3 and not PYPY: self.assertIsInstance(addr.family, enum.IntEnum) if nic_stats[nic].isup: # Do not test binding to addresses of interfaces