C : PY_VERSION_HEX cleanup step 1

Author: e1000

src_c/_freetype.c

@@ -658,9 +658,7 @@ PyTypeObject pgFont_Type = {
     0,                                        /* tp_subclasses */
     0,                                        /* tp_weaklist */
     0,                                        /* tp_del */
-#if PY_VERSION_HEX >= 0x02060000
     0 /* tp_version_tag */
-#endif
 };
 
 #undef FULL_TYPE_NAME

src_c/bufferproxy.c

@@ -79,73 +79,6 @@ proxy_releasebuffer(pgBufproxyObject *, Py_buffer *);
 static void
 _release_buffer_from_dict(Py_buffer *);
 
-#if PY_VERSION_HEX < 0x02060000
-static int
-_IsFortranContiguous(Py_buffer *view)
-{
-    Py_ssize_t sd, dim;
-    int i;
-
-    if (view->ndim == 0)
-        return 1;
-    if (view->strides == NULL)
-        return (view->ndim == 1);
-
-    sd = view->itemsize;
-    if (view->ndim == 1)
-        return (view->shape[0] == 1 || sd == view->strides[0]);
-    for (i = 0; i < view->ndim; i++) {
-        dim = view->shape[i];
-        if (dim == 0)
-            return 1;
-        if (view->strides[i] != sd)
-            return 0;
-        sd *= dim;
-    }
-    return 1;
-}
-
-static int
-_IsCContiguous(Py_buffer *view)
-{
-    Py_ssize_t sd, dim;
-    int i;
-
-    if (view->ndim == 0)
-        return 1;
-    if (view->strides == NULL)
-        return 1;
-
-    sd = view->itemsize;
-    if (view->ndim == 1)
-        return (view->shape[0] == 1 || sd == view->strides[0]);
-    for (i = view->ndim - 1; i >= 0; i--) {
-        dim = view->shape[i];
-        if (dim == 0)
-            return 1;
-        if (view->strides[i] != sd)
-            return 0;
-        sd *= dim;
-    }
-    return 1;
-}
-
-static int
-PyBuffer_IsContiguous(Py_buffer *view, char fort)
-{
-    if (view->suboffsets != NULL)
-        return 0;
-
-    if (fort == 'C')
-        return _IsCContiguous(view);
-    else if (fort == 'F')
-        return _IsFortranContiguous(view);
-    else if (fort == 'A')
-        return (_IsCContiguous(view) || _IsFortranContiguous(view));
-    return 0;
-}
-#endif /* #if PY_VERSION_HEX < 0x02060000 */
-
 static int
 _get_buffer_from_dict(PyObject *dict, Py_buffer *view_p, int flags)
 {
@@ -474,12 +407,7 @@ proxy_repr(pgBufproxyObject *self)
     if (!view_p) {
         return 0;
     }
-    /* zd is for Py_size_t which python < 2.5 doesn't have. */
-#if PY_VERSION_HEX < 0x02050000
-    return PyString_FromFormat("<BufferProxy(%d)>", view_p->len);
-#else
     return Text_FromFormat("<BufferProxy(%zd)>", view_p->len);
-#endif
 }
 
 /**
@@ -494,11 +422,7 @@ proxy_write(pgBufproxyObject *self, PyObject *args, PyObject *kwds)
     Py_ssize_t offset = 0;
     char *keywords[] = {"buffer", "offset", 0};
 
-#if Py_VERSION_HEX >= 0x02050000
 #define ARG_FORMAT "s#|n"
-#else
-#define ARG_FORMAT "s#|i" /* In this case Py_ssize_t is an int */
-#endif
     if (!PyArg_ParseTupleAndKeywords(args, kwds, ARG_FORMAT, keywords, &buf,
                                      &buflen, &offset)) {
         return 0;

src_c/newbuffer.c

@@ -731,9 +731,7 @@ static PyNumberMethods buffer_as_number = {
     (binaryfunc)0,  /* nb_true_divide */
     (binaryfunc)0,  /* nb_inplace_floor_divide */
     (binaryfunc)0,  /* nb_inplace_true_divide */
-#if PY_VERSION_HEX >= 0x02050000
     (unaryfunc)0, /* nb_index */
-#endif
 };
 
 #define BUFFER_TYPE_FULLNAME "newbuffer.Py_buffer"

src_c/pixelarray.c

@@ -28,10 +28,6 @@
 
 #include "surface.h"
 
-#if PY_VERSION_HEX < 0x02050000
-#define PyIndex_Check(op) 0
-#endif
-
 static char FormatUint8[] = "B";
 static char FormatUint16[] = "=H";
 static char FormatUint24[] = "3x";
@@ -1733,17 +1729,13 @@ _pxarray_subscript(pgPixelArrayObject *array, PyObject *op)
     }
     else if (PyIndex_Check(op) || PyInt_Check(op) || PyLong_Check(op)) {
         Py_ssize_t i;
-#if PY_VERSION_HEX >= 0x02050000
         PyObject *val = PyNumber_Index(op);
         if (!val) {
             return 0;
         }
         /* A simple index. */
         i = PyNumber_AsSsize_t(val, PyExc_IndexError);
         Py_DECREF(val);
-#else
-        i = PyInt_Check(op) ? PyInt_AsLong(op) : PyLong_AsLong(op);
-#endif
         if (i == -1 && PyErr_Occurred()) {
             return 0;
         }
@@ -1899,17 +1891,13 @@ _pxarray_ass_subscript(pgPixelArrayObject *array, PyObject *op,
     }
     else if (PyIndex_Check(op) || PyInt_Check(op) || PyLong_Check(op)) {
         Py_ssize_t i;
-#if PY_VERSION_HEX >= 0x02050000
         PyObject *val = PyNumber_Index(op);
         if (!val) {
             return -1;
         }
         /* A simple index. */
         i = PyNumber_AsSsize_t(val, PyExc_IndexError);
         Py_DECREF(val);
-#else
-        i = PyInt_Check(op) ? PyInt_AsLong(op) : PyLong_AsLong(op);
-#endif
         if (i == -1 && PyErr_Occurred()) {
             return -1;
         }