Merge remote-tracking branch 'upstream/v1.3.x'

Author: mdboom

lib/matplotlib/backends/backend_agg.py

@@ -155,7 +155,7 @@ def draw_mathtext(self, gc, x, y, s, prop, angle):
 
         xd = descent * np.sin(np.deg2rad(angle))
         yd = descent * np.cos(np.deg2rad(angle))
-        x = np.round(x + ox - xd)
+        x = np.round(x + ox + xd)
         y = np.round(y - oy + yd)
         self._renderer.draw_text_image(font_image, x, y + 1, angle, gc)
 

lib/matplotlib/cbook.py

@@ -1173,8 +1173,10 @@ def pieces(seq, num=2):
 
 
 def exception_to_str(s=None):
-
-    sh = io.StringIO()
+    if sys.version_info[0] < 3:
+        sh = io.BytesIO()
+    else:
+        sh = io.StringIO()
     if s is not None:
         print(s, file=sh)
     traceback.print_exc(file=sh)

lib/matplotlib/tests/test_coding_standards.py

@@ -3,7 +3,14 @@
 import sys
 
 from nose.tools import assert_equal
-import pep8
+from nose.plugins.skip import SkipTest
+
+try:
+    import pep8
+except ImportError:
+    HAS_PEP8 = False
+else:
+    HAS_PEP8 = True
 
 import matplotlib
 
@@ -172,6 +179,9 @@ def _test_pep8_conformance():
 #    The file should be a line separated list of filenames/directories
 #    as can be passed to the "pep8" tool's exclude list.
 
+    if not HAS_PEP8:
+        raise SkipTest('The pep8 tool is required for this test')
+
     # Only run this test with Python 2 - the 2to3 tool generates non pep8
     # compliant code.
     if sys.version_info[0] != 2:

src/_tkagg.cpp

@@ -219,7 +219,7 @@ _pyobj_addr(PyObject* self, PyObject* args)
     {
         return NULL;
     }
-    return Py_BuildValue("l", (long) pyobj);
+    return Py_BuildValue("n", (Py_ssize_t) pyobj);
 }
 
 static PyObject*
@@ -228,9 +228,9 @@ _tkinit(PyObject* self, PyObject* args)
     Tcl_Interp* interp;
     TkappObject* app;
 
-    long arg;
+    Py_ssize_t arg;
     int is_interp;
-    if (!PyArg_ParseTuple(args, "li", &arg, &is_interp))
+    if (!PyArg_ParseTuple(args, "ni", &arg, &is_interp))
     {
         return NULL;
     }