Get rid of sys.version_info < (3,9) tests

Author: DimitriPapadopoulos

src/c/test_c.py

@@ -69,31 +69,17 @@ def _capture_unraisable_hook(ur_args):
 assert __version__ == "2.0.1.dev0", ("This test_c.py file is for testing a version"
                                      " of cffi that differs from the one that we"
                                      " get from 'import _cffi_backend'")
-if sys.version_info < (3,):
-    type_or_class = "type"
-    mandatory_b_prefix = ''
-    mandatory_u_prefix = 'u'
-    bytechr = chr
-    bitem2bchr = lambda x: x
-    class U:
-        def __add__(self, other):
-            return eval('u'+repr(other).replace(r'\\u', r'\u')
-                                       .replace(r'\\U', r'\U'))
-    u = U()
-    str2bytes = str
-    strict_compare = False
-else:
-    type_or_class = "class"
-    long = int
-    unicode = str
-    unichr = chr
-    mandatory_b_prefix = 'b'
-    mandatory_u_prefix = ''
-    bytechr = lambda n: bytes([n])
-    bitem2bchr = bytechr
-    u = ""
-    str2bytes = lambda s: bytes(s, "ascii")
-    strict_compare = True
+type_or_class = "class"
+long = int
+unicode = str
+unichr = chr
+mandatory_b_prefix = 'b'
+mandatory_u_prefix = ''
+bytechr = lambda n: bytes([n])
+bitem2bchr = bytechr
+u = ""
+str2bytes = lambda s: bytes(s, "ascii")
+strict_compare = True
 
 def size_of_int():
     BInt = new_primitive_type("int")
@@ -115,14 +101,9 @@ def find_and_load_library(name, flags=RTLD_NOW):
         path = None
     else:
         path = ctypes.util.find_library(name)
-        if path is None and sys.platform == 'darwin' and sys.version_info[:2] == (3, 8):
-            pytest.xfail("find_library usually broken on MacOS Python 3.8")
         if path is None and name == 'c':
             assert sys.platform == 'win32'
-            assert (sys.version_info >= (3,) or
-                    '__pypy__' in sys.builtin_module_names)
-            pytest.skip("dlopen(None) cannot work on Windows "
-                         "with PyPy or Python 3")
+            pytest.skip("dlopen(None) cannot work on Windows")
     return load_library(path, flags)
 
 def test_load_library():
@@ -1687,10 +1668,6 @@ def test_enum_in_struct():
             "expected integer, got NoneType object" in msg) # newer PyPys
     with pytest.raises(TypeError):
         p.a1 = "def"
-    if sys.version_info < (3,):
-        BEnum2 = new_enum_type(unicode("foo"), (unicode('abc'),), (5,), BInt)
-        assert string(cast(BEnum2, 5)) == 'abc'
-        assert type(string(cast(BEnum2, 5))) is str
 
 def test_enum_overflow():
     max_uint = 2 ** (size_of_int()*8) - 1
@@ -2024,8 +2001,6 @@ def test_string_byte():
     BArray = new_array_type(new_pointer_type(BByte), None)
     a = newp(BArray, [65, 66, 67])
     assert type(string(a)) is bytes and string(a) == b'ABC'
-    if 'PY_DOT_PY' not in globals() and sys.version_info < (3,):
-        assert string(a, 8).startswith(b'ABC')  # may contain additional garbage
 
 def test_string_wchar():
     for typename in ["wchar_t", "char16_t", "char32_t"]:
@@ -2039,12 +2014,6 @@ def _test_string_wchar_variant(typename):
     BArray = new_array_type(new_pointer_type(BWChar), None)
     a = newp(BArray, [u+'A', u+'B', u+'C'])
     assert type(string(a)) is unicode and string(a) == u+'ABC'
-    if 'PY_DOT_PY' not in globals() and sys.version_info < (3,):
-        try:
-            # may contain additional garbage
-            assert string(a, 8).startswith(u+'ABC')
-        except ValueError:    # garbage contains values > 0x10FFFF
-            assert sizeof(BWChar) == 4
 
 def test_string_typeerror():
     BShort = new_primitive_type("short")
@@ -2485,11 +2454,7 @@ def test_buffer():
     assert repr(buf).startswith('<_cffi_backend.buffer object at 0x')
     assert bytes(buf) == b"hi there\x00"
     assert type(buf) is buffer
-    if sys.version_info < (3,):
-        assert str(buf) == "hi there\x00"
-        assert unicode(buf) == u+"hi there\x00"
-    else:
-        assert str(buf) == repr(buf)
+    assert str(buf) == repr(buf)
     # --mb_length--
     assert len(buf) == len(b"hi there\x00")
     # --mb_item--
@@ -3015,12 +2980,11 @@ def test_string_assignment_to_byte_array():
     assert list(p) == [ord("X"), ord("Y"), ord("Z"), 0, 0]
 
 # XXX hack
-if sys.version_info >= (3,):
-    try:
-        import posix
-        posix.fdopen = open
-    except ImportError:
-        pass   # win32
+try:
+    import posix
+    posix.fdopen = open
+except ImportError:
+    pass   # win32
 
 @pytest.mark.skipif(
     is_ios,
@@ -3107,7 +3071,7 @@ def test_FILE_object():
     res = fputs(b"hello\n", fw1p)
     assert res >= 0
     res = fileno(fw1p)
-    assert (res == fdw) == (sys.version_info < (3,))
+    assert res != fdw
     fw1.close()
     #
     data = posix.read(fdr, 256)
@@ -3838,16 +3802,14 @@ def test_from_buffer_more_cases():
     def check1(bufobj, expected):
         c = from_buffer(BCharA, bufobj)
         assert typeof(c) is BCharA
-        if sys.version_info >= (3,):
-            expected = [bytes(c, "ascii") for c in expected]
+        expected = [bytes(c, "ascii") for c in expected]
         assert list(c) == list(expected)
     #
     def check(methods, expected, expected_for_memoryview=None):
-        if sys.version_info >= (3,):
-            if methods <= 7:
-                return
-            if expected_for_memoryview is not None:
-                expected = expected_for_memoryview
+        if methods <= 7:
+            return
+        if expected_for_memoryview is not None:
+            expected = expected_for_memoryview
         class X:
             pass
         _testbuff(X, methods)

src/cffi/api.py

@@ -596,10 +596,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
@@ -812,8 +809,8 @@ def _load_backend_lib(backend, name, flags):
     import ctypes.util
     path = ctypes.util.find_library(name)
     if path is None:
-        if name == "c" and sys.platform == "win32" and sys.version_info >= (3,):
-            raise OSError("dlopen(None) cannot work on Windows for Python 3 "
+        if name == "c" and sys.platform == "win32":
+            raise OSError("dlopen(None) cannot work on Windows "
                           "(see http://bugs.python.org/issue23606)")
         msg = ("ctypes.util.find_library() did not manage "
                "to locate a library called %r" % (name,))

src/cffi/backend_ctypes.py

@@ -1,13 +1,10 @@
 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])
+unicode = str
+long = int
+xrange = range
+bytechr = lambda num: bytes([num])
 
 class CTypesType(type):
     pass

src/cffi/cparser.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/lock.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/pkgconfig.py

@@ -42,7 +42,7 @@ def call(libname, flag, encoding=sys.getfilesystemencoding()):
             pass
         raise PkgConfigError(berr.strip())
 
-    if sys.version_info >= (3,) and not isinstance(bout, str):   # Python 3.x
+    if not isinstance(bout, str):
         try:
             bout = bout.decode(encoding)
         except UnicodeDecodeError:

src/cffi/recompiler.py

@@ -7,9 +7,7 @@
 VERSION_EMBEDDED = 0x2701
 VERSION_CHAR16CHAR32 = 0x2801
 
-USE_LIMITED_API = ((sys.platform != 'win32' or sys.version_info < (3, 0) or
-                   sys.version_info >= (3, 5)) and
-                   not sysconfig.get_config_var("Py_GIL_DISABLED"))  # free-threaded doesn't yet support limited API
+USE_LIMITED_API = not sysconfig.get_config_var("Py_GIL_DISABLED")  # free-threaded doesn't yet support limited API
 
 class GlobalExpr:
     def __init__(self, name, address, type_op, size=0, check_value=0):
@@ -1387,14 +1385,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/vengine_gen.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))
 

src/cffi/verifier.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)

testing/cffi0/backend_tests.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!')