Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 3f2944f

Browse files
mdboommdboom
committed
Merge remote-tracking branch 'upstream/v1.3.x'
Conflicts: lib/matplotlib/__init__.py
2 parents 78f3f6a + 42301ea commit 3f2944f

11 files changed

Lines changed: 45 additions & 324 deletions

File tree

‎LICENSE/DATEUTIL_LICENSE.txt‎

Lines changed: 0 additions & 259 deletions
This file was deleted.

‎LICENSE/PYTZ_LICENSE.txt‎

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎MANIFEST.in‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
include CHANGELOG INSTALL
2-
include INTERACTIVE TODO CONTRIBUTING.md
3-
include Makefile MANIFEST.in MANIFEST
2+
include TODO CONTRIBUTING.md
3+
include Makefile MANIFEST.in
44
include matplotlibrc.template setup.cfg.template
5-
include setupext.py setup.py setupegg.py distribute_setup.py
5+
include setupext.py setup.py distribute_setup.py
66
include lib/matplotlib/mpl-data/lineprops.glade
77
include lib/matplotlib/mpl-data/matplotlibrc
88
include lib/matplotlib/mpl-data/images/*
99
include lib/matplotlib/mpl-data/fonts/ttf/*
1010
include lib/matplotlib/mpl-data/fonts/pdfcorefonts/*
1111
include lib/matplotlib/mpl-data/fonts/afm/*
12-
recursive-include lib/matplotlib/mpl-data/sample_data/ *
12+
recursive-include lib/matplotlib/mpl-data/sample_data *
1313
recursive-include LICENSE *
1414
recursive-include examples *
1515
recursive-include doc *

‎lib/matplotlib/artist.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1261,9 +1261,8 @@ def setp(obj, *args, **kwargs):
12611261
:func:`setp` works with the MATLAB style string/value pairs or
12621262
with python kwargs. For example, the following are equivalent::
12631263
1264-
>>> setp(lines, 'linewidth', 2, 'color', r') # MATLAB style
1265-
...
1266-
>>> setp(lines, linewidth=2, color='r') # python style
1264+
>>> setp(lines, 'linewidth', 2, 'color', 'r') # MATLAB style
1265+
>>> setp(lines, linewidth=2, color='r') # python style
12671266
"""
12681267

12691268
insp = ArtistInspector(obj)

‎lib/matplotlib/axes.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3343,8 +3343,8 @@ def text(self, x, y, s, fontdict=None,
33433343
text in the center of the axes::
33443344
33453345
>>> text(0.5, 0.5,'matplotlib', horizontalalignment='center',
3346-
>>> verticalalignment='center',
3347-
>>> transform = ax.transAxes)
3346+
... verticalalignment='center',
3347+
... transform=ax.transAxes)
33483348
33493349
You can put a rectangular box around the text instance (e.g., to
33503350
set a background color) by using the keyword *bbox*. *bbox* is

‎lib/matplotlib/backends/backend_agg.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ def restore_region(self, region, bbox=None, xy=None):
320320
>>> region = renderer.copy_from_bbox()
321321
>>> x1, y1, x2, y2 = region.get_extents()
322322
>>> renderer.restore_region(region, bbox=(x1+dx, y1, x2, y2),
323-
xy=(x1-dx, y1))
323+
... xy=(x1-dx, y1))
324324
325325
"""
326326
if bbox is not None or xy is not None:

‎lib/matplotlib/backends/backend_ps.py‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -748,7 +748,13 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
748748
self.track_characters(font, s)
749749

750750
self.set_color(*gc.get_rgb())
751-
self.set_font(font.get_sfnt()[(1,0,0,6)], prop.get_size_in_points())
751+
sfnt = font.get_sfnt()
752+
try:
753+
ps_name = sfnt[(1,0,0,6)]
754+
except KeyError:
755+
ps_name = sfnt[(3,1,0x0409,6)].decode(
756+
'utf-16be').encode('ascii','replace')
757+
self.set_font(ps_name, prop.get_size_in_points())
752758

753759
cmap = font.get_charmap()
754760
lastgind = None

0 commit comments

Comments
 (0)