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

Conflicts:
	CHANGELOG
	lib/matplotlib/axes.py

Author: mdboom

lib/matplotlib/axes.py

@@ -2429,7 +2429,7 @@ def set_axis_bgcolor(self, color):
     def invert_xaxis(self):
         "Invert the x-axis."
         left, right = self.get_xlim()
-        self.set_xlim(right, left)
+        self.set_xlim(right, left, auto=None)
 
     def xaxis_inverted(self):
         """Returns *True* if the x-axis is inverted."""
@@ -2655,7 +2655,7 @@ def invert_yaxis(self):
         Invert the y-axis.
         """
         bottom, top = self.get_ylim()
-        self.set_ylim(top, bottom)
+        self.set_ylim(top, bottom, auto=None)
 
     def yaxis_inverted(self):
         """Returns *True* if the y-axis is inverted."""
@@ -6075,6 +6075,12 @@ def scatter(self, x, y, s=20, c='b', marker='o', cmap=None, norm=None,
             warnings.warn(
                 '''replace "faceted=False" with "edgecolors='none'"''',
                 mplDeprecation)  # 2008/04/18
+<<<<<<< HEAD
+=======
+
+        sym = None
+        symstyle = 0
+>>>>>>> upstream/v1.2.x
 
         # to be API compatible
         if marker is None and not (verts is None):
@@ -8632,7 +8638,7 @@ def specgram(self, x, NFFT=256, Fs=2, Fc=0, detrend=mlab.detrend_none,
         spectrum is shown.  If *x* is complex, both positive and
         negative parts of the spectrum are shown.  This can be
         overridden using the *sides* keyword argument.
-        
+
         Also note that while the plot is in dB, the *Pxx* array returned is
         linear in power.
 

lib/matplotlib/font_manager.py

@@ -565,7 +565,10 @@ def createFontList(fontfiles, fontext='ttf'):
             except RuntimeError:
                 verbose.report("Could not parse font file %s"%fpath)
                 continue
-            prop = afmFontProperty(fpath, font)
+            try:
+                prop = afmFontProperty(fpath, font)
+            except KeyError:
+                continue
         else:
             try:
                 font = ft2font.FT2Font(str(fpath))
@@ -576,7 +579,10 @@ def createFontList(fontfiles, fontext='ttf'):
                 verbose.report("Cannot handle unicode filenames")
                 #print >> sys.stderr, 'Bad file is', fpath
                 continue
-            prop = ttfFontProperty(font)
+            try:
+                prop = ttfFontProperty(font)
+            except KeyError:
+                continue
 
         fontlist.append(prop)
     return fontlist

lib/matplotlib/projections/polar.py

@@ -57,14 +57,10 @@ def transform_non_affine(self, tr):
         t *= theta_direction
         t += theta_offset
 
-        if rmin != 0:
-            r = r - rmin
-            mask = r < 0
-            x[:] = np.where(mask, np.nan, r * np.cos(t))
-            y[:] = np.where(mask, np.nan, r * np.sin(t))
-        else:
-            x[:] = r * np.cos(t)
-            y[:] = r * np.sin(t)
+        r = r - rmin
+        mask = r < 0
+        x[:] = np.where(mask, np.nan, r * np.cos(t))
+        y[:] = np.where(mask, np.nan, r * np.sin(t))
 
         return xy
     transform_non_affine.__doc__ = Transform.transform_non_affine.__doc__
@@ -779,4 +775,3 @@ def drag_pan(self, button, key, x, y):
 #             result = self.transform(result)
 #             return mpath.Path(result, codes)
 #         transform_path_non_affine = transform_path
-

lib/matplotlib/tests/test_axes.py

@@ -419,6 +419,29 @@ def test_hexbin_extent():
 
     ax.hexbin(x, y, extent=[.1, .3, .6, .7])
 
+@cleanup
+def test_inverted_limits():
+    # Test gh:1553
+    # Calling invert_xaxis prior to plotting should not disable autoscaling
+    # while still maintaining the inverted direction
+    fig = plt.figure()
+    ax = fig.gca()
+    ax.invert_xaxis()
+    ax.plot([-5, -3, 2, 4], [1, 2, -3, 5])
+
+    assert ax.get_xlim() == (4, -5)
+    assert ax.get_ylim() == (-3, 5)
+    plt.close()
+
+    fig = plt.figure()
+    ax = fig.gca()
+    ax.invert_yaxis()
+    ax.plot([-5, -3, 2, 4], [1, 2, -3, 5])
+
+    assert ax.get_xlim() == (-5, 4)
+    assert ax.get_ylim() == (5, -3)
+    plt.close()
+
 @image_comparison(baseline_images=['nonfinite_limits'])
 def test_nonfinite_limits():
     x = np.arange(0., np.e, 0.01)

lib/mpl_toolkits/mplot3d/axes3d.py

@@ -1389,7 +1389,7 @@ def invert_zaxis(self):
             This function was added, but not tested. Please report any bugs.
         """
         bottom, top = self.get_zlim()
-        self.set_zlim(top, bottom)
+        self.set_zlim(top, bottom, auto=None)
 
     def zaxis_inverted(self):
         '''

src/ft2font.cpp

@@ -852,28 +852,24 @@ FT2Font::FT2Font(Py::PythonClassInstance *self, Py::Tuple &args, Py::Dict &kwds)
     {
         std::ostringstream s;
         s << "Could not load facefile " << facefile << "; Unknown_File_Format" << std::endl;
-        ob_refcnt--;
         throw Py::RuntimeError(s.str());
     }
     else if (error == FT_Err_Cannot_Open_Resource)
     {
         std::ostringstream s;
         s << "Could not open facefile " << facefile << "; Cannot_Open_Resource" << std::endl;
-        ob_refcnt--;
         throw Py::RuntimeError(s.str());
     }
     else if (error == FT_Err_Invalid_File_Format)
     {
         std::ostringstream s;
         s << "Could not open facefile " << facefile << "; Invalid_File_Format" << std::endl;
-        ob_refcnt--;
         throw Py::RuntimeError(s.str());
     }
     else if (error)
     {
         std::ostringstream s;
         s << "Could not open facefile " << facefile << "; freetype error code " << error << std::endl;
-        ob_refcnt--;
         throw Py::RuntimeError(s.str());
     }
 
@@ -891,7 +887,6 @@ FT2Font::FT2Font(Py::PythonClassInstance *self, Py::Tuple &args, Py::Dict &kwds)
     {
         std::ostringstream s;
         s << "Could not set the fontsize for facefile  " << facefile << std::endl;
-        ob_refcnt--;
         throw Py::RuntimeError(s.str());
     }