Remove C checks for old PY_HEX_VERSION.

QuLogic · QuLogic · commit 44bead14ee31 · 2018-02-16T20:45:36.000-05:00
diff --git a/src/_path.h b/src/_path.h
@@ -1076,13 +1076,8 @@ char *__add_number(double val, const char *format, int precision,
 {
     char *result;
 
-#if PY_VERSION_HEX >= 0x02070000
     char *str;
     str = PyOS_double_to_string(val, format[0], precision, 0, NULL);
-#else
-    char str[64];
-    PyOS_ascii_formatd(str, 64, format, val);
-#endif
 
     // Delete trailing zeros and decimal point
     char *q = str;
@@ -1104,17 +1099,11 @@ char *__add_number(double val, const char *format, int precision,
     ++q;
     *q = 0;
 
-#if PY_VERSION_HEX >= 0x02070000
     if ((result = __append_to_string(p, buffer, buffersize, str)) == NULL) {
         PyMem_Free(str);
         return NULL;
     }
     PyMem_Free(str);
-#else
-    if ((result = __append_to_string(p, buffer, buffersize, str)) == NULL) {
-        return NULL;
-    }
-#endif
 
     return result;
 }
@@ -1128,12 +1117,7 @@ int __convert_to_string(PathIterator &path,
                         char **buffer,
                         size_t *buffersize)
 {
-#if PY_VERSION_HEX >= 0x02070000
     const char *format = "f";
-#else
-    char format[64];
-    snprintf(format, 64, "%s.%df", "%", precision);
-#endif
 
     char *p = *buffer;
     double x[3];
diff --git a/src/_tkagg.cpp b/src/_tkagg.cpp
@@ -326,7 +326,6 @@ int load_tkinter_funcs(void)
  * tkinter uses these symbols, and the symbols are therefore visible in the
  * tkinter dynamic library (module).
  */
-#if PY_MAJOR_VERSION >= 3
 #define TKINTER_PKG "tkinter"
 #define TKINTER_MOD "_tkinter"
 // From module __file__ attribute to char *string for dlopen.
@@ -339,12 +338,6 @@ char *fname2char(PyObject *fname)
     }
     return PyBytes_AsString(bytes);
 }
-#else
-#define TKINTER_PKG "Tkinter"
-#define TKINTER_MOD "tkinter"
-// From module __file__ attribute to char *string for dlopen
-#define fname2char(s) (PyString_AsString(s))
-#endif
 
 #include <dlfcn.h>
 
@@ -453,7 +446,6 @@ int load_tkinter_funcs(void)
 }
 #endif // end not Windows
 
-#if PY_MAJOR_VERSION >= 3
 static PyModuleDef _tkagg_module = { PyModuleDef_HEAD_INIT, "_tkagg", "",   -1,  functions,
                                      NULL,                  NULL,     NULL, NULL };
 
@@ -465,11 +457,3 @@ PyMODINIT_FUNC PyInit__tkagg(void)
 
     return (load_tkinter_funcs() == 0) ? m : NULL;
 }
-#else
-PyMODINIT_FUNC init_tkagg(void)
-{
-    Py_InitModule("_tkagg", functions);
-
-    load_tkinter_funcs();
-}
-#endif
diff --git a/src/_ttconv.cpp b/src/_ttconv.cpp
@@ -109,11 +109,7 @@ static PyObject *convert_ttf_to_ps(PyObject *self, PyObject *args, PyObject *kwd
     static const char *kwlist[] = { "filename", "output", "fonttype", "glyph_ids", NULL };
     if (!PyArg_ParseTupleAndKeywords(args,
                                      kwds,
-#if PY_MAJOR_VERSION == 3
                                      "yO&i|O&:convert_ttf_to_ps",
-#else
-                                     "sO&i|O&:convert_ttf_to_ps",
-#endif
                                      (char **)kwlist,
                                      &filename,
                                      fileobject_to_PythonFileWriter,
@@ -189,11 +185,7 @@ static PyObject *py_get_pdf_charprocs(PyObject *self, PyObject *args, PyObject *
     static const char *kwlist[] = { "filename", "glyph_ids", NULL };
     if (!PyArg_ParseTupleAndKeywords(args,
                                      kwds,
-#if PY_MAJOR_VERSION == 3
                                      "y|O&:get_pdf_charprocs",
-#else
-                                     "s|O&:get_pdf_charprocs",
-#endif
                                      (char **)kwlist,
                                      &filename,
                                      pyiterable_to_vector_int,
diff --git a/src/_windowing.cpp b/src/_windowing.cpp
@@ -36,8 +36,6 @@ static PyMethodDef _windowing_methods[] =
     {NULL, NULL}
 };
 
-#if PY_MAJOR_VERSION >= 3
-
 static struct PyModuleDef moduledef = {
         PyModuleDef_HEAD_INIT,
         "_windowing",
@@ -55,10 +53,3 @@ PyMODINIT_FUNC PyInit__windowing(void)
     PyObject *module = PyModule_Create(&moduledef);
     return module;
 }
-
-#else
-PyMODINIT_FUNC init_windowing()
-{
-    Py_InitModule("_windowing", _windowing_methods);
-}
-#endif
diff --git a/src/mplutils.h b/src/mplutils.h
@@ -30,9 +30,7 @@ typedef unsigned __int8   uint8_t;
 
 #include <Python.h>
 
-#if PY_MAJOR_VERSION >= 3
 #define Py_TPFLAGS_HAVE_NEWBUFFER 0
-#endif
 
 #undef CLAMP
 #define CLAMP(x, low, high) (((x) > (high)) ? (high) : (((x) < (low)) ? (low) : (x)))
