Remove _conv_pyobject_to_ulong

No longer needed with modern Python

Author: lazka

cairo/glyph.c

@@ -181,7 +181,8 @@ glyph_new (PyTypeObject *type, PyObject *args, PyObject *kwds) {
             KWDS, &pyindex, &x, &y))
         return NULL;
 
-    if (_conv_pyobject_to_ulong (pyindex, &index) < 0)
+    index = PyLong_AsUnsignedLong (pyindex);
+    if (index == (unsigned long)-1 && PyErr_Occurred ())
         return NULL;
 
     tuple_args = Py_BuildValue ("((kdd))", index, x, y);

cairo/misc.c

@@ -176,32 +176,3 @@ Pycairo_richcompare (void* a, void *b, int op)
     Py_INCREF (res);
     return res;
 }
-
-/* NULL on error */
-static PyObject *
-_conv_pyobject_to_pylong (PyObject *pyobj) {
-    if (!PyLong_Check (pyobj)) {
-        PyErr_SetString (PyExc_TypeError, "not of type int");
-        return NULL;
-    }
-    Py_INCREF (pyobj);
-    return pyobj;
-}
-
-/* -1 on error */
-int
-_conv_pyobject_to_ulong (PyObject *pyobj, unsigned long *result) {
-    unsigned long temp;
-    PyObject *pylong;
-
-    pylong = _conv_pyobject_to_pylong (pyobj);
-    if (pylong == NULL)
-        return -1;
-
-    temp = PyLong_AsUnsignedLong (pylong);
-    if (temp == (unsigned long)-1 && PyErr_Occurred ())
-        return -1;
-
-    *result = temp;
-    return 0;
-}

cairo/private.h

@@ -59,8 +59,6 @@ int _PyGlyph_AsGlyph (PyObject *pyobj, cairo_glyph_t *glyph);
 int _PyTextCluster_AsTextCluster (PyObject *pyobj,
                                   cairo_text_cluster_t *cluster);
 
-int _conv_pyobject_to_ulong (PyObject *pyobj, unsigned long *result);
-
 PyObject* Pycairo_richcompare (void* a, void *b, int op);
 
 extern PyTypeObject PycairoContext_Type;