Skip to content

Commit 63e58b3

Browse files
tacaswelltacaswell
committed
Merge remote-tracking branch 'matplotlib/v2.x'
Conflicts: examples/pylab_examples/movie_demo.py - is deleted on master
2 parents dddb0e9 + 163cf66 commit 63e58b3

File tree

68 files changed

+127
-207
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+127
-207
lines changed

‎doc/mpl_toolkits/axisartist/figures/simple_axisartist1.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
ax.axis["bottom", "top", "right"].set_visible(False)
1111

1212
# make an new axis along the first axis axis (x-axis) which pass
13-
# throught y=0.
13+
# through y=0.
1414
ax.axis["y=0"] = ax.new_floating_axis(nth_coord=0, value=0,
1515
axis_direction="bottom")
1616
ax.axis["y=0"].toggle(all=True)

‎doc/mpl_toolkits/axisartist/figures/simple_axisline2.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
fig = plt.figure(1, (4,3))
66

7-
# a subplot with two additiona axis, "xzero" and "yzero". "xzero" is
7+
# a subplot with two additional axis, "xzero" and "yzero". "xzero" is
88
# y=0 line, and "yzero" is x=0 line.
99
ax = SubplotZero(fig, 1, 1, 1)
1010
fig.add_subplot(ax)

‎doc/users/plotting/examples/custom_boxstyle02.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import matplotlib.pyplot as plt
44

55
# we may derive from matplotlib.patches.BoxStyle._Base class.
6-
# You need to overide transmute method in this case.
6+
# You need to override transmute method in this case.
77

88
class MyStyle(BoxStyle._Base):
99
"""

‎examples/api/barchart_demo.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
# add some text for labels, title and axes ticks
2626
ax.set_ylabel('Scores')
2727
ax.set_title('Scores by group and gender')
28-
ax.set_xticks(ind + width)
28+
ax.set_xticks(ind + width / 2)
2929
ax.set_xticklabels(('G1', 'G2', 'G3', 'G4', 'G5'))
3030

3131
ax.legend((rects1[0], rects2[0]), ('Men', 'Women'))

‎examples/api/date_demo.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
datafile = cbook.get_sample_data('goog.npy')
3232
try:
3333
# Python3 cannot load python2 .npy files with datetime(object) arrays
34-
# unless the encoding is set to bytes. Hovever this option was
34+
# unless the encoding is set to bytes. However this option was
3535
# not added until numpy 1.10 so this example will only work with
3636
# python 2 or with numpy 1.10 and later.
3737
r = np.load(datafile, encoding='bytes').view(np.recarray)

‎examples/api/font_file.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
Although it is usually not a good idea to explicitly point to a single
88
ttf file for a font instance, you can do so using the
99
font_manager.FontProperties fname argument (for a more flexible
10-
solution, see the font_fmaily_rc.py and fonts_demo.py examples).
10+
solution, see the font_family_rc.py and fonts_demo.py examples).
1111
"""
1212
import sys
1313
import os

‎examples/api/histogram_path_demo.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
the faster method of using PolyCollections, were implemented before we
99
had proper paths with moveto/lineto, closepoly etc in mpl. Now that
1010
we have them, we can draw collections of regularly shaped objects with
11-
homogeous properties more efficiently with a PathCollection. This
11+
homogeneous properties more efficiently with a PathCollection. This
1212
example makes a histogram -- its more work to set up the vertex arrays
1313
at the outset, but it should be much faster for large numbers of
1414
objects

‎examples/api/radar_chart.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ def example_data():
135135
# Pyrolized Organic Carbon (OP)
136136
# 2)Inclusion of gas-phase specie carbon monoxide (CO)
137137
# 3)Inclusion of gas-phase specie ozone (O3).
138-
# 4)Inclusion of both gas-phase speciesis present...
138+
# 4)Inclusion of both gas-phase species is present...
139139
data = [
140140
['Sulfate', 'Nitrate', 'EC', 'OC1', 'OC2', 'OC3', 'OP', 'CO', 'O3'],
141141
('Basecase', [

‎examples/api/unicode_minus.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
Unicode minus
44
=============
55
6-
You can use the proper typesetting unicode minus (see
7-
http://en.wikipedia.org/wiki/Plus_sign#Plus_sign) or the ASCII hypen
6+
You can use the proper typesetting Unicode minus (see
7+
https://en.wikipedia.org/wiki/Plus_sign#Plus_sign) or the ASCII hyphen
88
for minus, which some people prefer. The matplotlibrc param
99
axes.unicode_minus controls the default behavior.
1010
11-
The default is to use the unicode minus
11+
The default is to use the Unicode minus.
1212
"""
1313
import numpy as np
1414
import matplotlib
@@ -21,5 +21,5 @@
2121
matplotlib.rcParams['axes.unicode_minus'] = False
2222
fig, ax = plt.subplots()
2323
ax.plot(10*np.random.randn(100), 10*np.random.randn(100), 'o')
24-
ax.set_title('Using hypen instead of unicode minus')
24+
ax.set_title('Using hyphen instead of Unicode minus')
2525
plt.show()

‎examples/axisartist/demo_curvelinear_grid.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ def curvelinear_test2(fig):
113113
# A parasite axes with given transform
114114
ax2 = ParasiteAxesAuxTrans(ax1, tr, "equal")
115115
# note that ax2.transData == tr + ax1.transData
116-
# Anthing you draw in ax2 will match the ticks and grids of ax1.
116+
# Anything you draw in ax2 will match the ticks and grids of ax1.
117117
ax1.parasites.append(ax2)
118118
intp = cbook.simple_linear_interpolation
119119
ax2.plot(intp(np.array([0, 30]), 50),

0 commit comments

Comments
 (0)