TMP src/cffi/

Author: DimitriPapadopoulos

src/c/_cffi_backend.c

@@ -3609,9 +3609,7 @@ static PyTypeObject CDataGCP_Type = {
     0,  /* inherited */                         /* tp_setattro */
     0,                                          /* tp_as_buffer */
     Py_TPFLAGS_DEFAULT                          /* tp_flags */
-#ifdef Py_TPFLAGS_HAVE_FINALIZE
                        | Py_TPFLAGS_HAVE_FINALIZE
-#endif
                        | Py_TPFLAGS_HAVE_GC,
     "This is an internal subtype of _CDataBase for performance only on "
     "CPython.  Check with isinstance(x, ffi.CData).",   /* tp_doc */
@@ -3625,7 +3623,6 @@ static PyTypeObject CDataGCP_Type = {
     0,                                          /* tp_members */
     0,                                          /* tp_getset */
     &CData_Type,                                /* tp_base */
-#ifdef Py_TPFLAGS_HAVE_FINALIZE  /* CPython >= 3.4 */
     0,                                          /* tp_dict */
     0,                                          /* tp_descr_get */
     0,                                          /* tp_descr_set */
@@ -3643,7 +3640,6 @@ static PyTypeObject CDataGCP_Type = {
     0,                                          /* tp_del */
     0,                                          /* version_tag */
     (destructor)cdatagcp_finalize,              /* tp_finalize */
-#endif
 };
 
 /************************************************************/

src/cffi/api.py

@@ -30,8 +30,7 @@ def __init__(self, backend=None):
         select a non-default backend, mostly for tests.
         """
         if backend is None:
-            # You need PyPy (>= 2.0 beta), or a CPython (>= 2.6) with
-            # _cffi_backend.so compiled.
+            # You need PyPy or a CPython with _cffi_backend.so compiled.
             import _cffi_backend as backend
             from . import __version__
             if backend.__version__ != __version__:
@@ -603,10 +602,7 @@ def ensure(key, value):
                 if hasattr(sys, 'gettotalrefcount'):
                     template += '_d'
             else:
-                try:
-                    import sysconfig
-                except ImportError:    # 2.6
-                    from cffi._shimmed_dist_utils import sysconfig
+                import sysconfig
                 template = "python%d.%d"
                 if sysconfig.get_config_var('DEBUG_EXT'):
                     template += sysconfig.get_config_var('DEBUG_EXT')

src/cffi/setuptools_ext.py

@@ -2,12 +2,6 @@
 import sys
 import sysconfig
 
-try:
-    basestring
-except NameError:
-    # Python 3.x
-    basestring = str
-
 def error(msg):
     from cffi._shimmed_dist_utils import DistutilsSetupError
     raise DistutilsSetupError(msg)
@@ -29,7 +23,7 @@ def execfile(filename, glob):
 def add_cffi_module(dist, mod_spec):
     from cffi.api import FFI
 
-    if not isinstance(mod_spec, basestring):
+    if not isinstance(mod_spec, str):
         error("argument to 'cffi_modules=...' must be a str or a list of str,"
               " not %r" % (type(mod_spec).__name__,))
     mod_spec = str(mod_spec)
@@ -219,7 +213,7 @@ def run(self):
 
 def cffi_modules(dist, attr, value):
     assert attr == 'cffi_modules'
-    if isinstance(value, basestring):
+    if isinstance(value, str):
         value = [value]
 
     for cffi_module in value: