use PY3

Signed-off-by: mayeut <[email protected]>

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()

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()
 

psutil/_pslinux.py

@@ -53,7 +53,7 @@
 from ._compat import basestring
 
 
-if sys.version_info[0] >= 3:
+if PY3:
     import enum
 else:
     enum = None

psutil/_psposix.py

@@ -28,7 +28,7 @@
     from . import _psutil_osx
 
 
-if sys.version_info[0] >= 3:
+if PY3:
     import enum
 else:
     enum = None

psutil/_pswindows.py

@@ -56,7 +56,7 @@
     else:
         raise
 
-if sys.version_info[0] >= 3:
+if PY3:
     import enum
 else:
     enum = None

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

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)

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