Merge pull request matplotlib#579 from mdboom/simplify

Simplify some of the c++ code

Author: mdboom

src/_backend_agg.cpp

@@ -103,10 +103,11 @@ BufferRegion::to_string(const Py::Tuple &args)
 {
     // owned=true to prevent memory leak
     #if PY3K
-    return Py::Bytes(PyBytes_FromStringAndSize((const char*)data, height*stride), true);
+    return Py::Bytes
     #else
-    return Py::String(PyString_FromStringAndSize((const char*)data, height*stride), true);
+    return Py::String
     #endif
+        (PyBytes_FromStringAndSize((const char*)data, height*stride), true);
 }
 
 
@@ -156,20 +157,11 @@ BufferRegion::to_string_argb(const Py::Tuple &args)
     unsigned char tmp;
     size_t i, j;
 
-    #if PY3K
     PyObject* str = PyBytes_FromStringAndSize((const char*)data, height * stride);
     if (PyBytes_AsStringAndSize(str, (char**)&begin, &length))
     {
         throw Py::TypeError("Could not create memory for blit");
     }
-    #else
-    PyObject* str = PyString_FromStringAndSize((const char*)data, height * stride);
-    if (PyString_AsStringAndSize(str, (char**)&begin, &length))
-    {
-        throw Py::TypeError("Could not create memory for blit");
-    }
-    #endif
-
 
     pix = begin;
     end = begin + (height * stride);

src/_macosx.m

@@ -2955,19 +2955,15 @@ static void _data_provider_release(void* info, const void* data, size_t size)
     CGDataProviderRef provider;
     double rect[4] = {0.0, 0.0, self->size.width, self->size.height};
 
-#if PY3K
     if (!PyBytes_Check(image))
     {
-        PyErr_SetString(PyExc_RuntimeError, "image is not a byte array");
-        return NULL;
-    }
+#if PY3K
+        PyErr_SetString(PyExc_RuntimeError, "image is not a bytes object");
 #else
-    if (!PyString_Check(image))
-    {
-        PyErr_SetString(PyExc_RuntimeError, "image is not a string");
+        PyErr_SetString(PyExc_RuntimeError, "image is not a str object");
+#endif
         return NULL;
     }
-#endif
 
     const size_t bytesPerComponent = 1;
     const size_t bitsPerComponent = 8 * bytesPerComponent;
@@ -5096,7 +5092,7 @@ - (void)mouseDown:(NSEvent *)event
     }
     if ([event clickCount] == 2) {
       dblclick = 1;
-    } 
+    }
     gstate = PyGILState_Ensure();
     result = PyObject_CallMethod(canvas, "button_press_event", "iiii", x, y, num, dblclick);
     if(result)
@@ -5185,7 +5181,7 @@ - (void)rightMouseDown:(NSEvent *)event
     gstate = PyGILState_Ensure();
     if ([event clickCount] == 2) {
       dblclick = 1;
-    } 
+    }
     result = PyObject_CallMethod(canvas, "button_press_event", "iiii", x, y, num, dblclick);
     if(result)
         Py_DECREF(result);
@@ -5246,7 +5242,7 @@ - (void)otherMouseDown:(NSEvent *)event
     gstate = PyGILState_Ensure();
     if ([event clickCount] == 2) {
       dblclick = 1;
-    } 
+    }
     result = PyObject_CallMethod(canvas, "button_press_event", "iiii", x, y, num, dblclick);
     if(result)
         Py_DECREF(result);

src/_png.cpp

@@ -279,11 +279,7 @@ static void _read_png_data(PyObject* py_file_obj, png_bytep data, png_size_t len
     {
         result = PyObject_CallFunction(read_method, (char *)"i", length);
     }
-#if PY3K
     if (PyBytes_AsStringAndSize(result, &buffer, &bufflen) == 0)
-#else
-    if (PyString_AsStringAndSize(result, &buffer, &bufflen) == 0)
-#endif
     {
         if (bufflen == (Py_ssize_t)length)
         {

src/_ttconv.cpp

@@ -179,11 +179,7 @@ class PythonDictionaryCallback : public TTDictionaryCallback
 
     virtual void add_pair(const char* a, const char* b)
     {
-        #if PY3K
         PyObject* value = PyBytes_FromString(b);
-        #else
-        PyObject* value = PyString_FromString(b);
-        #endif
         if (value)
         {
             if (PyDict_SetItemString(_dict, a, value))

src/ft2font.cpp

@@ -296,11 +296,7 @@ FT2Image::py_as_str(const Py::Tuple & args)
     args.verify_length(0);
 
     return Py::asObject
-#if PY3K
       (PyBytes_FromStringAndSize((const char *)_buffer, _width*_height));
-#else
-      (PyString_FromStringAndSize((const char *)_buffer, _width*_height));
-#endif
 }
 PYCXX_VARARGS_METHOD_DECL(FT2Image, py_as_str)