Apply ruff/pyupgrade rule UP036

UP036 Version block is outdated for minimum Python version

Lots of manual fixes here, in order to discard Python 2 aliases.

Author: DimitriPapadopoulos

src/c/test_c.py

@@ -603,10 +603,7 @@ def ensure(key, value):
                 # we need 'libpypy-c.{so,dylib}', which should be by
                 # default located in 'sys.prefix/bin' for installed
                 # systems.
-                if sys.version_info < (3,):
-                    pythonlib = "pypy-c"
-                else:
-                    pythonlib = "pypy3-c"
+                pythonlib = "pypy3-c"
                 if hasattr(sys, 'prefix'):
                     ensure('library_dirs', os.path.join(sys.prefix, 'bin'))
             # On uninstalled pypy's, the libpypy-c is typically found in

src/cffi/api.py

@@ -1,14 +1,6 @@
 import ctypes, ctypes.util, operator, sys
 from . import model
 
-if sys.version_info < (3,):
-    bytechr = chr
-else:
-    unicode = str
-    long = int
-    xrange = range
-    bytechr = lambda num: bytes([num])
-
 class CTypesType(type):
     pass
 
@@ -161,7 +153,7 @@ def _newp(cls, init):
         return cls(init)
 
     def __iter__(self):
-        for i in xrange(len(self)):
+        for i in range(len(self)):
             yield self[i]
 
     def _get_own_repr(self):
@@ -183,7 +175,7 @@ def _cast_from(cls, source):
             address = 0
         elif isinstance(source, CTypesData):
             address = source._cast_to_integer()
-        elif isinstance(source, (int, long)):
+        elif isinstance(source, int):
             address = source
         else:
             raise TypeError("bad type for cast to %r: %r" %
@@ -399,7 +391,7 @@ def __int__(self):
             if kind == 'bool':
                 @classmethod
                 def _cast_from(cls, source):
-                    if not isinstance(source, (int, long, float)):
+                    if not isinstance(source, (int, float)):
                         source = _cast_source_to_int(source)
                     return cls(bool(source))
                 def __int__(self):
@@ -409,7 +401,7 @@ def __int__(self):
                 @classmethod
                 def _cast_from(cls, source):
                     source = _cast_source_to_int(source)
-                    source = bytechr(source & 0xFF)
+                    source = bytes([source & 0xFF])
                     return cls(source)
                 def __int__(self):
                     return ord(self._value)
@@ -438,7 +430,7 @@ def __float__(self):
             if kind == 'int' or kind == 'byte' or kind == 'bool':
                 @staticmethod
                 def _to_ctypes(x):
-                    if not isinstance(x, (int, long)):
+                    if not isinstance(x, int):
                         if isinstance(x, CTypesData):
                             x = int(x)
                         else:
@@ -471,7 +463,7 @@ def __nonzero__(self):
             if kind == 'float':
                 @staticmethod
                 def _to_ctypes(x):
-                    if not isinstance(x, (int, long, float, CTypesData)):
+                    if not isinstance(x, (int, float, CTypesData)):
                         raise TypeError("float expected, got %s" %
                                         type(x).__name__)
                     return ctype(x).value
@@ -535,14 +527,14 @@ def __init__(self, init):
                 self._own = True
 
             def __add__(self, other):
-                if isinstance(other, (int, long)):
+                if isinstance(other, int):
                     return self._new_pointer_at(self._address +
                                                 other * self._bitem_size)
                 else:
                     return NotImplemented
 
             def __sub__(self, other):
-                if isinstance(other, (int, long)):
+                if isinstance(other, int):
                     return self._new_pointer_at(self._address -
                                                 other * self._bitem_size)
                 elif type(self) is type(other):
@@ -617,7 +609,7 @@ class CTypesArray(CTypesGenericArray):
 
             def __init__(self, init):
                 if length is None:
-                    if isinstance(init, (int, long)):
+                    if isinstance(init, int):
                         len1 = init
                         init = None
                     elif kind == 'char' and isinstance(init, bytes):
@@ -696,7 +688,7 @@ def _arg_to_ctypes(value):
                 return CTypesPtr._arg_to_ctypes(value)
 
             def __add__(self, other):
-                if isinstance(other, (int, long)):
+                if isinstance(other, long):
                     return CTypesPtr._new_pointer_at(
                         ctypes.addressof(self._blob) +
                         other * ctypes.sizeof(BItem._ctype))
@@ -776,7 +768,7 @@ def initialize(blob, init):
                                     "only one supported (use a dict if needed)"
                                      % (len(init),))
             if not isinstance(init, dict):
-                if isinstance(init, (bytes, unicode)):
+                if isinstance(init, (bytes, str)):
                     raise TypeError("union initializer: got a str")
                 init = tuple(init)
                 if len(init) > len(fnames):
@@ -1061,7 +1053,7 @@ def typeoffsetof(self, BType, fieldname, num=0):
             if BField is Ellipsis:
                 raise TypeError("not supported for bitfields")
             return (BField, BType._offsetof(fieldname))
-        elif isinstance(fieldname, (int, long)):
+        elif isinstance(fieldname, int):
             if issubclass(BType, CTypesGenericArray):
                 BType = BType._CTPtr
             if not issubclass(BType, CTypesGenericPtr):

src/cffi/backend_ctypes.py

@@ -8,10 +8,7 @@
 import weakref, re, sys
 
 try:
-    if sys.version_info < (3,):
-        import thread as _thread
-    else:
-        import _thread
+    import _thread
     lock = _thread.allocate_lock()
 except ImportError:
     lock = None

src/cffi/cparser.py

@@ -1,15 +1,9 @@
 import sys
 
-if sys.version_info < (3,):
-    try:
-        from thread import allocate_lock
-    except ImportError:
-        from dummy_thread import allocate_lock
-else:
-    try:
-        from _thread import allocate_lock
-    except ImportError:
-        from _dummy_thread import allocate_lock
+try:
+    from _thread import allocate_lock
+except ImportError:
+    from _dummy_thread import allocate_lock
 
 
 ##import sys

src/cffi/lock.py

@@ -1316,12 +1316,8 @@ def _print_string_literal_in_array(self, s):
         else:
             s.decode('utf-8')           # got bytes, check for valid utf-8
         for line in s.splitlines(True):
-            comment = line
-            if type('//') is bytes:     # python2
-                line = map(ord, line)   #     make a list of integers
-            else:                       # python3
-                # type(line) is bytes, which enumerates like a list of integers
-                comment = ascii(comment)[1:-1]
+            # type(line) is bytes, which enumerates like a list of integers
+            comment = ascii(line)[1:-1]
             prnt(('// ' + comment).rstrip())
             printed_line = ''
             for c in line:
@@ -1406,14 +1402,7 @@ def _emit_bytecode_EnumType(self, tp, index):
         self.cffi_types[index] = CffiOp(OP_ENUM, enum_index)
 
 
-if sys.version_info >= (3,):
-    NativeIO = io.StringIO
-else:
-    class NativeIO(io.BytesIO):
-        def write(self, s):
-            if isinstance(s, unicode):
-                s = s.encode('ascii')
-            super().write(s)
+NativeIO = io.StringIO
 
 def _is_file_like(maybefile):
     # compare to xml.etree.ElementTree._get_writer

src/cffi/recompiler.py

@@ -55,10 +55,7 @@ def write_source_to_f(self):
         # 'export_symbols', so instead of fighting it, just give up and
         # give it one
         if sys.platform == 'win32':
-            if sys.version_info >= (3,):
-                prefix = 'PyInit_'
-            else:
-                prefix = 'init'
+            prefix = 'PyInit_'
             modname = self.verifier.get_module_name()
             prnt("void %s%s(void) { }\n" % (prefix, modname))
 
@@ -497,8 +494,7 @@ def _load_known_int_constant(self, module, funcname):
         p = self.ffi.new(BType, 256)
         if function(p) < 0:
             error = self.ffi.string(p)
-            if sys.version_info >= (3,):
-                error = str(error, 'utf-8')
+            error = str(error)
             raise VerificationError(error)
 
     def _enum_funcname(self, prefix, name):

src/cffi/vengine_gen.py

@@ -6,25 +6,12 @@
 from . import ffiplatform
 from .error import VerificationError
 
-if sys.version_info >= (3, 3):
-    import importlib.machinery
-    def _extension_suffixes():
-        return importlib.machinery.EXTENSION_SUFFIXES[:]
-else:
-    import imp
-    def _extension_suffixes():
-        return [suffix for suffix, _, type in imp.get_suffixes()
-                if type == imp.C_EXTENSION]
-
-
-if sys.version_info >= (3,):
-    NativeIO = io.StringIO
-else:
-    class NativeIO(io.BytesIO):
-        def write(self, s):
-            if isinstance(s, unicode):
-                s = s.encode('ascii')
-            super().write(s)
+import importlib.machinery
+def _extension_suffixes():
+    return importlib.machinery.EXTENSION_SUFFIXES[:]
+
+
+NativeIO = io.StringIO
 
 
 class Verifier:
@@ -54,8 +41,7 @@ def __init__(self, ffi, preamble, tmpdir=None, modulename=None,
                                __version_verifier_modules__,
                                preamble, flattened_kwds] +
                               ffi._cdefsources)
-            if sys.version_info >= (3,):
-                key = key.encode('utf-8')
+            key = key.encode('utf-8')
             k1 = hex(binascii.crc32(key[0::2]) & 0xffffffff)
             k1 = k1.lstrip('0x').rstrip('L')
             k2 = hex(binascii.crc32(key[1::2]) & 0xffffffff)

src/cffi/verifier.py

@@ -1279,8 +1279,7 @@ def test_ffi_buffer_with_io(self):
     def test_ffi_buffer_comparisons(self):
         ffi = FFI(backend=self.Backend())
         ba = bytearray(range(100, 110))
-        if sys.version_info >= (2, 7):
-            assert ba == memoryview(ba)    # justification for the following
+        assert ba == memoryview(ba)    # justification for the following
         a = ffi.new("uint8_t[]", list(ba))
         c = ffi.new("uint8_t[]", [99] + list(ba))
         try:
@@ -1968,10 +1967,7 @@ def do_init():
 
     def test_init_once_multithread(self):
         import sys, time
-        if sys.version_info < (3,):
-            import thread
-        else:
-            import _thread as thread
+        import _thread as thread
         #
         def do_init():
             seen.append('init!')

testing/cffi0/backend_tests.py

@@ -41,8 +41,3 @@ def test_nested_anonymous_union(self):
 
     def test_nested_anonymous_struct_2(self):
         pytest.skip("ctypes backend: not supported: nested anonymous union")
-
-    def test_CData_CType_2(self):
-        if sys.version_info >= (3,):
-            pytest.skip("ctypes backend: not supported in Python 3: CType")
-        backend_tests.BackendTests.test_CData_CType_2(self)