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

Conflicts:
	.travis.yml
	lib/matplotlib/backends/qt4_editor/formlayout.py

Author: mdboom

.travis.yml

@@ -36,9 +36,6 @@ script:
 
 after_failure:
   - cd ../tmp_test_dir
-  - echo Compressing results...
   - tar cjf result_images.tar.bz2 result_images
-  - echo Uploading results...
   - travis-artifacts upload --path result_images.tar.bz2
-  - 'echo Test results available at:'
-  - echo https://s3.amazonaws.com/matplotlib-test-results/artifacts/${TRAVIS_BUILD_NUMBER}/${TRAVIS_JOB_NUMBER}/matplotlib-results.tar.bz2
+  - echo https://s3.amazonaws.com/matplotlib-test-results/artifacts/${TRAVIS_BUILD_NUMBER}/${TRAVIS_JOB_NUMBER}/result_images.tar.bz2

examples/pylab_examples/barchart_demo2.py

@@ -13,94 +13,102 @@
 import pylab
 from matplotlib.ticker import MaxNLocator
 
-
-
 student = 'Johnny Doe'
 grade = 2
 gender = 'boy'
-cohortSize = 62 #The number of other 2nd grade boys
+cohortSize = 62  # The number of other 2nd grade boys
 
 numTests = 5
 testNames = ['Pacer Test', 'Flexed Arm\n Hang', 'Mile Run', 'Agility',
-            'Push Ups']
+             'Push Ups']
 testMeta = ['laps', 'sec', 'min:sec', 'sec', '']
 scores = ['7', '48', '12:52', '17', '14']
 rankings = np.round(np.random.uniform(0, 1, numTests)*100, 0)
 
 
-fig, ax1 = plt.subplots(figsize=(9,7))
+fig, ax1 = plt.subplots(figsize=(9, 7))
 plt.subplots_adjust(left=0.115, right=0.88)
 fig.canvas.set_window_title('Eldorado K-8 Fitness Chart')
-pos = np.arange(numTests)+0.5    #Center bars on the Y-axis ticks
+pos = np.arange(numTests)+0.5    # Center bars on the Y-axis ticks
 rects = ax1.barh(pos, rankings, align='center', height=0.5, color='m')
 
-ax1.axis([0,100,0,5])
+ax1.axis([0, 100, 0, 5])
 pylab.yticks(pos, testNames)
 ax1.set_title('Johnny Doe')
 plt.text(50, -0.5, 'Cohort Size: ' + str(cohortSize),
-        horizontalalignment='center', size='small')
+         horizontalalignment='center', size='small')
 
 # Set the right-hand Y-axis ticks and labels and set X-axis tick marks at the
 # deciles
 ax2 = ax1.twinx()
-ax2.plot([100,100], [0, 5], 'white', alpha=0.1)
+ax2.plot([100, 100], [0, 5], 'white', alpha=0.1)
 ax2.xaxis.set_major_locator(MaxNLocator(11))
-xticks = pylab.setp(ax2, xticklabels=['0','10','20','30','40','50','60',
-'70',
-                                     '80','90','100'])
+xticks = pylab.setp(ax2, xticklabels=['0', '10', '20', '30', '40', '50', '60',
+                                      '70', '80', '90', '100'])
 ax2.xaxis.grid(True, linestyle='--', which='major', color='grey',
 alpha=0.25)
 #Plot a solid vertical gridline to highlight the median position
-plt.plot([50,50], [0, 5], 'grey', alpha=0.25)
+plt.plot([50, 50], [0, 5], 'grey', alpha=0.25)
 
 # Build up the score labels for the right Y-axis by first appending a carriage
 # return to each string and then tacking on the appropriate meta information
 # (i.e., 'laps' vs 'seconds'). We want the labels centered on the ticks, so if
 # there is no meta info (like for pushups) then don't add the carriage return to
 # the string
 
+
 def withnew(i, scr):
-    if testMeta[i] != '' : return '%s\n'%scr
-    else: return scr
-scoreLabels = [withnew(i, scr) for i,scr in enumerate(scores)]
-scoreLabels = [i+j for i,j in zip(scoreLabels, testMeta)]
-pylab.yticks(pos, scoreLabels)
+    if testMeta[i] != '':
+        return '%s\n' % scr
+    else:
+        return scr
+
+scoreLabels = [withnew(i, scr) for i, scr in enumerate(scores)]
+scoreLabels = [i+j for i, j in zip(scoreLabels, testMeta)]
+# set the tick locations
+ax2.set_yticks(pos)
+# set the tick labels
+ax2.set_yticklabels(scoreLabels)
+# make sure that the limits are set equally on both yaxis so the ticks line up
+ax2.set_ylim(ax1.get_ylim())
+
+
 ax2.set_ylabel('Test Scores')
 #Make list of numerical suffixes corresponding to position in a list
-#           0     1     2     3     4     5     6     7     8     9
-suffixes =['th', 'st', 'nd', 'rd', 'th', 'th', 'th', 'th', 'th', 'th']
-ax2.set_xlabel('Percentile Ranking Across ' + str(grade) + suffixes[grade] \
+#            0     1     2     3     4     5     6     7     8     9
+suffixes = ['th', 'st', 'nd', 'rd', 'th', 'th', 'th', 'th', 'th', 'th']
+ax2.set_xlabel('Percentile Ranking Across ' + str(grade) + suffixes[grade]
               + ' Grade ' + gender.title() + 's')
 
 # Lastly, write in the ranking inside each bar to aid in interpretation
 for rect in rects:
-   # Rectangle widths are already integer-valued but are floating
-   # type, so it helps to remove the trailing decimal point and 0 by
-   # converting width to int type
-   width = int(rect.get_width())
-
-   # Figure out what the last digit (width modulo 10) so we can add
-   # the appropriate numerical suffix (e.g., 1st, 2nd, 3rd, etc)
-   lastDigit = width % 10
-   # Note that 11, 12, and 13 are special cases
-   if (width == 11) or (width == 12) or (width == 13):
-       suffix = 'th'
-   else:
-       suffix = suffixes[lastDigit]
-
-   rankStr = str(width) + suffix
-   if (width < 5): # The bars aren't wide enough to print the ranking inside
-       xloc = width + 1 # Shift the text to the right side of the right edge
-       clr = 'black' # Black against white background
-       align = 'left'
-   else:
-       xloc = 0.98*width # Shift the text to the left side of the right edge
-       clr = 'white' # White on magenta
-       align = 'right'
-
-   yloc = rect.get_y()+rect.get_height()/2.0 #Center the text vertically in the bar
-   ax1.text(xloc, yloc, rankStr, horizontalalignment=align,
+    # Rectangle widths are already integer-valued but are floating
+    # type, so it helps to remove the trailing decimal point and 0 by
+    # converting width to int type
+    width = int(rect.get_width())
+
+    # Figure out what the last digit (width modulo 10) so we can add
+    # the appropriate numerical suffix (e.g., 1st, 2nd, 3rd, etc)
+    lastDigit = width % 10
+    # Note that 11, 12, and 13 are special cases
+    if (width == 11) or (width == 12) or (width == 13):
+        suffix = 'th'
+    else:
+        suffix = suffixes[lastDigit]
+
+    rankStr = str(width) + suffix
+    if (width < 5):        # The bars aren't wide enough to print the ranking inside
+        xloc = width + 1   # Shift the text to the right side of the right edge
+        clr = 'black'      # Black against white background
+        align = 'left'
+    else:
+        xloc = 0.98*width  # Shift the text to the left side of the right edge
+        clr = 'white'      # White on magenta
+        align = 'right'
+
+    # Center the text vertically in the bar
+    yloc = rect.get_y()+rect.get_height()/2.0
+    ax1.text(xloc, yloc, rankStr, horizontalalignment=align,
             verticalalignment='center', color=clr, weight='bold')
 
 plt.show()
-

lib/matplotlib/backends/backend_pdf.py

@@ -1002,11 +1002,12 @@ def embedTTFType42(font, characters, descriptor):
         # You are lost in a maze of TrueType tables, all different...
         sfnt = font.get_sfnt()
         try:
-            ps_name = sfnt[(1,0,0,6)] # Macintosh scheme
+            ps_name = sfnt[(1,0,0,6)].decode('macroman') # Macintosh scheme
         except KeyError:
             # Microsoft scheme:
-            ps_name = sfnt[(3,1,0x0409,6)].decode('utf-16be').encode('ascii','replace')
+            ps_name = sfnt[(3,1,0x0409,6)].decode('utf-16be')
             # (see freetype/ttnameid.h)
+        ps_name = ps_name.encode('ascii', 'replace')
         ps_name = Name(ps_name)
         pclt = font.get_sfnt_table('pclt') \
             or { 'capHeight': 0, 'xHeight': 0 }

lib/matplotlib/backends/backend_ps.py

@@ -750,10 +750,11 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
             self.set_color(*gc.get_rgb())
             sfnt = font.get_sfnt()
             try:
-                ps_name = sfnt[(1,0,0,6)]
+                ps_name = sfnt[(1,0,0,6)].decode('macroman')
             except KeyError:
                 ps_name = sfnt[(3,1,0x0409,6)].decode(
-                    'utf-16be').encode('ascii','replace')
+                    'utf-16be')
+            ps_name = ps_name.encode('ascii','replace')
             self.set_font(ps_name, prop.get_size_in_points())
 
             cmap = font.get_charmap()

lib/matplotlib/backends/qt4_editor/formlayout.py

@@ -90,21 +90,6 @@ def set_color(self, color):
 
     color = QtCore.Property("QColor", get_color, set_color)
 
-def col2hex(color):
-    """Convert matplotlib color to hex before passing to Qt"""
-    return rgb2hex(colorConverter.to_rgb(color))
-
-def to_qcolor(color):
-    """Create a QColor from a matplotlib color"""
-    qcolor = QtGui.QColor()
-    color = str(color)
-    try:
-        color = col2hex(color)
-    except ValueError:
-        #print('WARNING: ignoring invalid color %r' % color)
-        return qcolor # return invalid QColor
-    qcolor.setNamedColor(color) # set using hex color
-    return qcolor # return valid QColor
 
 def to_qcolor(color):
     """Create a QColor from a matplotlib color"""

lib/matplotlib/font_manager.py

@@ -391,11 +391,11 @@ def ttfFontProperty(font):
     sfnt2 = sfnt.get((1,0,0,2))
     sfnt4 = sfnt.get((1,0,0,4))
     if sfnt2:
-        sfnt2 = sfnt2.decode('ascii').lower()
+        sfnt2 = sfnt2.decode('macroman').lower()
     else:
         sfnt2 = ''
     if sfnt4:
-        sfnt4 = sfnt4.decode('ascii').lower()
+        sfnt4 = sfnt4.decode('macroman').lower()
     else:
         sfnt4 = ''
     if sfnt4.find('oblique') >= 0:

lib/matplotlib/texmanager.py

@@ -169,7 +169,7 @@ def __init__(self):
         ff = rcParams['font.family']
         if len(ff) == 1 and ff[0].lower() in self.font_families:
             self.font_family = ff[0].lower()
-        elif ff.lower() in self.font_families:
+        elif isinstance(ff, basestring) and ff.lower() in self.font_families:
             self.font_family = ff.lower()
         else:
             mpl.verbose.report(

lib/matplotlib/textpath.py

@@ -63,7 +63,7 @@ def _get_char_id(self, font, ccode):
         """
         sfnt = font.get_sfnt()
         try:
-            ps_name = sfnt[(1, 0, 0, 6)].decode('ascii')
+            ps_name = sfnt[(1, 0, 0, 6)].decode('macroman')
         except KeyError:
             ps_name = sfnt[(3, 1, 0x0409, 6)].decode('utf-16be')
         char_id = urllib.quote('%s-%x' % (ps_name, ccode))