Get rid of obsolete Python cruft

* Remove macros __Pyx_{NAME|DOC}STR
* Remove macros __Pyx_{Get|Set|Del}AttrString
* Remove macro  __Pyx_PyIndex_Check
* Remove workaround for missing BaseException in builtins

Cython/Compiler/Code.py

@@ -46,7 +46,6 @@ non_portable_builtins_map = {
     'basestring'    : ('PY_MAJOR_VERSION >= 3', 'str'),
     'xrange'        : ('PY_MAJOR_VERSION >= 3', 'range'),
     'raw_input'     : ('PY_MAJOR_VERSION >= 3', 'input'),
-    'BaseException' : ('PY_VERSION_HEX < 0x02050000', 'Exception'),
     }
 
 basicsize_builtins_map = {
@@ -1920,7 +1919,7 @@ class CCodeWriter(object):
             if entry.is_special:
                 method_flags += [method_coexist]
             self.putln(
-                '{__Pyx_NAMESTR("%s"), (PyCFunction)%s, %s, __Pyx_DOCSTR(%s)}%s' % (
+                '{"%s", (PyCFunction)%s, %s, %s}%s' % (
                     entry.name,
                     entry.func_cname,
                     "|".join(method_flags),

Cython/Compiler/ModuleNode.py

@@ -1894,7 +1894,7 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
         code.putln(
             "PyVarObject_HEAD_INIT(0, 0)")
         code.putln(
-            '__Pyx_NAMESTR("%s.%s"), /*tp_name*/' % (
+            '"%s.%s", /*tp_name*/' % (
                 self.full_module_name, scope.class_name))
         if type.typedef_flag:
             objstruct = type.objstruct_cname
@@ -1933,7 +1933,7 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
                     env.getset_table_cname)
             for entry in env.property_entries:
                 if entry.doc:
-                    doc_code = "__Pyx_DOCSTR(%s)" % code.get_string_const(entry.doc)
+                    doc_code = "%s" % code.get_string_const(entry.doc)
                 else:
                     doc_code = "0"
                 code.putln(
@@ -2079,7 +2079,7 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
             EncodedString("__main__"), identifier=True)
         code.putln("if (%s%s) {" % (Naming.module_is_main, self.full_module_name.replace('.', '__')))
         code.putln(
-            'if (__Pyx_SetAttrString(%s, "__name__", %s) < 0) %s;' % (
+            'if (PyObject_SetAttrString(%s, "__name__", %s) < 0) %s;' % (
                 env.module_cname,
                 __main__name.cname,
                 code.error_goto(self.pos)))
@@ -2167,7 +2167,7 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
             module_path = self.pos[0].filename
 
         if module_path:
-            code.putln('if (__Pyx_SetAttrString(%s, "__file__", %s) < 0) %s;' % (
+            code.putln('if (PyObject_SetAttrString(%s, "__file__", %s) < 0) %s;' % (
                 env.module_cname,
                 code.globalstate.get_py_string_const(
                     EncodedString(decode_filename(module_path))).cname,
@@ -2184,7 +2184,7 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
                     code.error_goto_if_null(temp, self.pos)))
                 code.put_gotref(temp)
                 code.putln(
-                    'if (__Pyx_SetAttrString(%s, "__path__", %s) < 0) %s;' % (
+                    'if (PyObject_SetAttrString(%s, "__path__", %s) < 0) %s;' % (
                         env.module_cname, temp, code.error_goto(self.pos)))
                 code.put_decref_clear(temp, py_object_type)
                 code.funcstate.release_temp(temp)
@@ -2305,7 +2305,7 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
 
     def generate_pymoduledef_struct(self, env, code):
         if env.doc:
-            doc = "__Pyx_DOCSTR(%s)" % code.get_string_const(env.doc)
+            doc = "%s" % code.get_string_const(env.doc)
         else:
             doc = "0"
         if Options.generate_cleanup_code:
@@ -2322,7 +2322,7 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
         code.putln("#else")
         code.putln("  PyModuleDef_HEAD_INIT,")
         code.putln("#endif")
-        code.putln('  __Pyx_NAMESTR("%s"),' % env.module_name)
+        code.putln('  "%s",' % env.module_name)
         code.putln("  %s, /* m_doc */" % doc)
         code.putln("  -1, /* m_size */")
         code.putln("  %s /* m_methods */," % env.method_table_cname)
@@ -2337,12 +2337,12 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
         # Generate code to create the module object and
         # install the builtins.
         if env.doc:
-            doc = "__Pyx_DOCSTR(%s)" % code.get_string_const(env.doc)
+            doc = "%s" % code.get_string_const(env.doc)
         else:
             doc = "0"
         code.putln("#if PY_MAJOR_VERSION < 3")
         code.putln(
-            '%s = Py_InitModule4(__Pyx_NAMESTR("%s"), %s, %s, 0, PYTHON_API_VERSION); Py_XINCREF(%s);' % (
+            '%s = Py_InitModule4("%s", %s, %s, 0, PYTHON_API_VERSION); Py_XINCREF(%s);' % (
                 env.module_cname,
                 env.module_name,
                 env.method_table_cname,
@@ -2362,20 +2362,20 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
         code.put_incref(env.module_dict_cname, py_object_type, nanny=False)
 
         code.putln(
-            '%s = PyImport_AddModule(__Pyx_NAMESTR(__Pyx_BUILTIN_MODULE_NAME)); %s' % (
+            '%s = PyImport_AddModule(__Pyx_BUILTIN_MODULE_NAME); %s' % (
                 Naming.builtins_cname,
                 code.error_goto_if_null(Naming.builtins_cname, self.pos)))
         code.putln('#if CYTHON_COMPILING_IN_PYPY')
         code.putln('Py_INCREF(%s);' % Naming.builtins_cname)
         code.putln('#endif')
         code.putln(
-            'if (__Pyx_SetAttrString(%s, "__builtins__", %s) < 0) %s;' % (
+            'if (PyObject_SetAttrString(%s, "__builtins__", %s) < 0) %s;' % (
                 env.module_cname,
                 Naming.builtins_cname,
                 code.error_goto(self.pos)))
         if Options.pre_import is not None:
             code.putln(
-                '%s = PyImport_AddModule(__Pyx_NAMESTR("%s")); %s' % (
+                '%s = PyImport_AddModule("%s"); %s' % (
                     Naming.preimport_cname,
                     Options.pre_import,
                     code.error_goto_if_null(Naming.preimport_cname, self.pos)))
@@ -2401,7 +2401,7 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
                     entry.cname))
                 code.putln(code.error_goto_if_null("wrapped", entry.pos))
                 code.putln(
-                    'if (__Pyx_SetAttrString(%s, "%s", wrapped) < 0) %s;' % (
+                    'if (PyObject_SetAttrString(%s, "%s", wrapped) < 0) %s;' % (
                         env.module_cname,
                         name,
                         code.error_goto(entry.pos)))
@@ -2639,7 +2639,7 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
                         code.putln('#if CYTHON_COMPILING_IN_CPYTHON')
                         code.putln("{")
                         code.putln(
-                            'PyObject *wrapper = __Pyx_GetAttrString((PyObject *)&%s, "%s"); %s' % (
+                            'PyObject *wrapper = PyObject_GetAttrString((PyObject *)&%s, "%s"); %s' % (
                                 typeobj_cname,
                                 func.name,
                                 code.error_goto_if_null('wrapper', entry.pos)))
@@ -2671,7 +2671,7 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
                     # Cython (such as closures), the 'internal'
                     # directive is set by users
                     code.putln(
-                        'if (__Pyx_SetAttrString(%s, "%s", (PyObject *)&%s) < 0) %s' % (
+                        'if (PyObject_SetAttrString(%s, "%s", (PyObject *)&%s) < 0) %s' % (
                             Naming.module_cname,
                             scope.class_name,
                             typeobj_cname,
@@ -2787,7 +2787,7 @@ import_star_utility_code = """
 static int
 __Pyx_import_all_from(PyObject *locals, PyObject *v)
 {
-    PyObject *all = __Pyx_GetAttrString(v, "__all__");
+    PyObject *all = PyObject_GetAttrString(v, "__all__");
     PyObject *dict, *name, *value;
     int skip_leading_underscores = 0;
     int pos, err;
@@ -2796,7 +2796,7 @@ __Pyx_import_all_from(PyObject *locals, PyObject *v)
         if (!PyErr_ExceptionMatches(PyExc_AttributeError))
             return -1; /* Unexpected error */
         PyErr_Clear();
-        dict = __Pyx_GetAttrString(v, "__dict__");
+        dict = PyObject_GetAttrString(v, "__dict__");
         if (dict == NULL) {
             if (!PyErr_ExceptionMatches(PyExc_AttributeError))
                 return -1;

Cython/Compiler/TypeSlots.py

@@ -417,7 +417,7 @@ class DocStringSlot(SlotDescriptor):
                 doc = scope.doc.utf8encode()
             else:
                 doc = scope.doc.byteencode()
-            return '__Pyx_DOCSTR("%s")' % StringEncoding.escape_byte_string(doc)
+            return '"%s"' % StringEncoding.escape_byte_string(doc)
         else:
             return "0"
 

Cython/Includes/cpython/number.pxd

@@ -246,6 +246,6 @@ cdef extern from "Python.h":
     # and the value is clipped to PY_SSIZE_T_MIN for a negative
     # integer or PY_SSIZE_T_MAX for a positive integer.
 
-    bint PyIndex_Check "__Pyx_PyIndex_Check" (object)
+    bint PyIndex_Check(object)
     # Returns True if o is an index integer (has the nb_index slot of
     # the tp_as_number structure filled in).

Cython/Includes/cpython/version.pxd

@@ -4,8 +4,8 @@
 #
 #      if PY_MAJOR_VERSION >= 3:
 #           do_stuff_in_Py3_0_and_later()
-#      if PY_VERSION_HEX >= 0x02050000:
-#           do_stuff_in_Py2_5_and_later()
+#      if PY_VERSION_HEX >= 0x02060000:
+#           do_stuff_in_Py2_6_and_later()
 #
 # than using the IF/DEF statements, which are evaluated at Cython
 # compile time.  This will keep your C code portable.

Cython/Utility/CythonFunction.c

@@ -423,7 +423,7 @@ __Pyx_CyFunction_reduce(__pyx_CyFunctionObject *m, CYTHON_UNUSED PyObject *args)
 }
 
 static PyMethodDef __pyx_CyFunction_methods[] = {
-    {__Pyx_NAMESTR("__reduce__"), (PyCFunction)__Pyx_CyFunction_reduce, METH_VARARGS, 0},
+    {"__reduce__", (PyCFunction)__Pyx_CyFunction_reduce, METH_VARARGS, 0},
     {0, 0, 0, 0}
 };
 
@@ -623,7 +623,7 @@ static PyObject * __Pyx_CyFunction_Call(PyObject *func, PyObject *arg, PyObject
 
 static PyTypeObject __pyx_CyFunctionType_type = {
     PyVarObject_HEAD_INIT(0, 0)
-    __Pyx_NAMESTR("cython_function_or_method"), /*tp_name*/
+    "cython_function_or_method",      /*tp_name*/
     sizeof(__pyx_CyFunctionObject),   /*tp_basicsize*/
     0,                                  /*tp_itemsize*/
     (destructor) __Pyx_CyFunction_dealloc, /*tp_dealloc*/
@@ -1063,7 +1063,7 @@ static PyMemberDef __pyx_FusedFunction_members[] = {
      T_OBJECT,
      offsetof(__pyx_FusedFunctionObject, __signatures__),
      READONLY,
-     __Pyx_DOCSTR(0)},
+     0},
     {0, 0, 0, 0, 0},
 };
 
@@ -1075,7 +1075,7 @@ static PyMappingMethods __pyx_FusedFunction_mapping_methods = {
 
 static PyTypeObject __pyx_FusedFunctionType_type = {
     PyVarObject_HEAD_INIT(0, 0)
-    __Pyx_NAMESTR("fused_cython_function"), /*tp_name*/
+    "fused_cython_function",           /*tp_name*/
     sizeof(__pyx_FusedFunctionObject), /*tp_basicsize*/
     0,                                  /*tp_itemsize*/
     (destructor) __pyx_FusedFunction_dealloc, /*tp_dealloc*/
@@ -1157,7 +1157,7 @@ static PyObject* __Pyx_Method_ClassMethod(PyObject *method) {
     // It appears that PyMethodDescr_Type is not anywhere exposed in the Python/C API
     static PyTypeObject *methoddescr_type = NULL;
     if (methoddescr_type == NULL) {
-       PyObject *meth = __Pyx_GetAttrString((PyObject*)&PyList_Type, "append");
+       PyObject *meth = PyObject_GetAttrString((PyObject*)&PyList_Type, "append");
        if (!meth) return NULL;
        methoddescr_type = Py_TYPE(meth);
        Py_DECREF(meth);

Cython/Utility/Generator.c

@@ -613,15 +613,15 @@ static PyMemberDef __pyx_Generator_memberlist[] = {
 };
 
 static PyMethodDef __pyx_Generator_methods[] = {
-    {__Pyx_NAMESTR("send"), (PyCFunction) __Pyx_Generator_Send, METH_O, 0},
-    {__Pyx_NAMESTR("throw"), (PyCFunction) __Pyx_Generator_Throw, METH_VARARGS, 0},
-    {__Pyx_NAMESTR("close"), (PyCFunction) __Pyx_Generator_Close, METH_NOARGS, 0},
+    {"send", (PyCFunction) __Pyx_Generator_Send, METH_O, 0},
+    {"throw", (PyCFunction) __Pyx_Generator_Throw, METH_VARARGS, 0},
+    {"close", (PyCFunction) __Pyx_Generator_Close, METH_NOARGS, 0},
     {0, 0, 0, 0}
 };
 
 static PyTypeObject __pyx_GeneratorType_type = {
     PyVarObject_HEAD_INIT(0, 0)
-    __Pyx_NAMESTR("generator"),         /*tp_name*/
+    "generator",                        /*tp_name*/
     sizeof(__pyx_GeneratorObject),      /*tp_basicsize*/
     0,                                  /*tp_itemsize*/
     (destructor) __Pyx_Generator_dealloc,/*tp_dealloc*/

Cython/Utility/ImportExport.c

@@ -181,7 +181,7 @@ static int __Pyx_SetPackagePathFromImportLib(const char* parent_package_name, Py
     if (unlikely(!file_path))
         goto bad;
 
-    if (unlikely(__Pyx_SetAttrString($module_cname, "__file__", file_path) < 0))
+    if (unlikely(PyObject_SetAttrString($module_cname, "__file__", file_path) < 0))
         goto bad;
 
     osmod = PyImport_ImportModule("os");
@@ -214,7 +214,7 @@ bad:
         return -1;
 
 set_path:
-    result = __Pyx_SetAttrString($module_cname, "__path__", package_path);
+    result = PyObject_SetAttrString($module_cname, "__path__", package_path);
     Py_DECREF(package_path);
     return result;
 }

Cython/Utility/MemoryView.pyx

@@ -6,7 +6,7 @@ import cython
 
 # from cpython cimport ...
 cdef extern from "Python.h":
-    int PyIndex_Check "__Pyx_PyIndex_Check" (object)
+    int PyIndex_Check(object)
     object PyLong_FromVoidPtr(void *)
 
 cdef extern from "pythread.h":

Cython/Utility/ModuleSetupCode.c

@@ -46,7 +46,6 @@
 
 #define __PYX_BUILD_PY_SSIZE_T "n"
 #define CYTHON_FORMAT_SSIZE_T "z"
-#define __Pyx_PyIndex_Check PyIndex_Check
 
 #if PY_MAJOR_VERSION < 3
   #define __Pyx_BUILTIN_MODULE_NAME "__builtin__"
@@ -170,18 +169,6 @@
   #define PyMethod_New(func, self, klass) ((self) ? PyMethod_New(func, self) : PyInstanceMethod_New(func))
 #endif
 
-#define __Pyx_GetAttrString(o,n)   PyObject_GetAttrString((o),(n))
-#define __Pyx_SetAttrString(o,n,a) PyObject_SetAttrString((o),(n),(a))
-#define __Pyx_DelAttrString(o,n)   PyObject_DelAttrString((o),(n))
-
-#if PY_VERSION_HEX < 0x02050000
-  #define __Pyx_NAMESTR(n) ((char *)(n))
-  #define __Pyx_DOCSTR(n)  ((char *)(n))
-#else
-  #define __Pyx_NAMESTR(n) (n)
-  #define __Pyx_DOCSTR(n)  (n)
-#endif
-
 /* inline attribute */
 #ifndef CYTHON_INLINE
   #if defined(__GNUC__)
@@ -510,7 +497,7 @@ static int __Pyx_RegisterCleanup(void) {
     // and cached objects that we are about to clean up.
 
     static PyMethodDef cleanup_def = {
-        __Pyx_NAMESTR("__cleanup"), (PyCFunction)${cleanup_cname}_atexit, METH_NOARGS, 0};
+        "__cleanup", (PyCFunction)${cleanup_cname}_atexit, METH_NOARGS, 0};
 
     PyObject *cleanup_func = 0;
     PyObject *atexit = 0;
@@ -526,7 +513,7 @@ static int __Pyx_RegisterCleanup(void) {
     atexit = __Pyx_ImportModule("atexit");
     if (!atexit)
         goto bad;
-    reg = __Pyx_GetAttrString(atexit, "_exithandlers");
+    reg = PyObject_GetAttrString(atexit, "_exithandlers");
     if (reg && PyList_Check(reg)) {
         PyObject *a, *kw;
         a = PyTuple_New(0);
@@ -546,7 +533,7 @@ static int __Pyx_RegisterCleanup(void) {
         if (!reg)
             PyErr_Clear();
         Py_XDECREF(reg);
-        reg = __Pyx_GetAttrString(atexit, "register");
+        reg = PyObject_GetAttrString(atexit, "register");
         if (!reg)
             goto bad;
         args = PyTuple_Pack(1, cleanup_func);