8000 More misc. typos by luzpaz · Pull Request #10266 · matplotlib/matplotlib · GitHub
[go: up one dir, main page]

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/matplotlib/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@

:data:`~matplotlib.rcParams`
a global dictionary of default configuration settings. It is
initialized by code which may be overridded by a matplotlibrc
initialized by code which may be overridden by a matplotlibrc
file.

:func:`~matplotlib.rc`
Expand Down Expand Up @@ -775,7 +775,7 @@ def get_py2exe_datafiles():
d = {}
for root, _, files in os.walk(datapath):
# Need to explicitly remove cocoa_agg files or py2exe complains
# NOTE I dont know why, but do as previous version
# NOTE I don't know why, but do as previous version
if 'Matplotlib.nib' in files:
files.remove('Matplotlib.nib')
files = [os.path.join(root, filename) for filename in files]
Expand Down Expand Up @@ -1147,7 +1147,7 @@ def rc_params_from_file(fname, fail_on_error=False, use_default_template=True):
if not os.path.isabs(rcParams['examples.directory']):
_basedir, _fname = os.path.split(matplotlib_fname())
# Sometimes matplotlib_fname() can return relative paths,
# Also, using realpath() guarentees that Sphinx will use
# Also, using realpath() guarantees that Sphinx will use
# the same path that matplotlib sees (in case of weird symlinks).
_basedir = os.path.realpath(_basedir)
_fullpath = os.path.join(_basedir, rcParams['examples.directory'])
Expand Down
8 changes: 4 additions & 4 deletions lib/matplotlib/artist.py
Original file line number Diff line number Diff line change
Expand Up @@ -1245,8 +1245,8 @@ def aliased_name_rest(self, s, target):

def pprint_setters(self, prop=None, leadingspace=2):
"""
If *prop* is *None*, return a list of strings of all settable properies
and their valid values.
If *prop* is *None*, return a list of strings of all settable
properties and their valid values.

If *prop* is not *None*, it is a valid property name and that
property will be returned as a string of property : valid
Expand All @@ -1273,8 +1273,8 @@ def pprint_setters(self, prop=None, leadingspace=2):

def pprint_setters_rest(self, prop=None, leadingspace=2):
"""
If *prop* is *None*, return a list of strings of all settable properies
and their valid values. Format the output for ReST
If *prop* is *None*, return a list of strings of all settable
properties and their valid values. Format the output for ReST

If *prop* is not *None*, it is a valid property name and that
property will be returned as a string of property : valid
Expand Down
6 changes: 3 additions & 3 deletions lib/matplotlib/axes/_axes.py
Original file line number Diff line number Diff line change
Expand Up @@ -1361,7 +1361,7 @@ def plot(self, *args, **kwargs):

By default, each line is assigned a different style specified by a
'style cycle'. The *fmt* and line property parameters are only
neccessary if you want explicit deviations from these defaults.
necessary if you want explicit deviations from these defaults.
Alternatively, you can also change the style cycle using the
'axes.prop_cycle' rcParam.

Expand Down Expand Up @@ -6279,7 +6279,7 @@ def hist(self, x, bins=None, range=None, density=None, weights=None,
The type of histogram to draw.

- 'bar' is a traditional bar-type histogram. If multiple data
are given the bars are aranged side by side.
are given the bars are arranged side by side.

- 'barstacked' is a bar-type histogram where multiple
data are stacked on top of each other.
Expand Down Expand Up @@ -6338,7 +6338,7 @@ def hist(self, x, bins=None, range=None, density=None, weights=None,

stacked : boolean, optional
If ``True``, multiple data are stacked on top of each other If
``False`` multiple data are aranged side by side if histtype is
``False`` multiple data are arranged side by side if histtype is
'bar' or on top of each other if histtype is 'step'

Default is ``False``
Expand Down
4 changes: 2 additions & 2 deletions lib/matplotlib/axes/_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -3117,7 +3117,7 @@ def set_xscale(self, value, **kwargs):

See also
--------
matplotlib.scale.LinearScale : linear transfrom
matplotlib.scale.LinearScale : linear transform

matplotlib.scale.LogTransform : log transform

Expand Down Expand Up @@ -3442,7 +3442,7 @@ def set_yscale(self, value, **kwargs):

See also
--------
matplotlib.scale.LinearScale : linear transfrom
matplotlib.scale.LinearScale : linear transform

matplotlib.scale.LogTransform : log transform

Expand Down
2 changes: 1 addition & 1 deletion lib/matplotlib/axis.py
Original file line number Diff line number Diff line change
Expand Up @@ -714,7 +714,7 @@ def set_label_coords(self, x, y, transform=None):
coordinate of the y label is determined by the tick label
bounding boxes, but this can lead to poor alignment of
multiple ylabels if there are multiple axes. Ditto for the y
coodinate of the x label.
coordinate of the x label.

You can also specify the coordinate system of the label with
the transform. If None, the default coordinate system will be
Expand Down
2 changes: 1 addition & 1 deletion lib/matplotlib/backend_bases.py
Original file line number Diff line number Diff line change
Expand Up @@ -2936,7 +2936,7 @@ def pan(self, *args):
self.set_message(self.mode)

def press(self, event):
"""Called whenver a mouse button is pressed."""
"""Called whenever a mouse button is pressed."""

def press_pan(self, event):
"""Callback for mouse button press in pan/zoom mode."""
Expand Down
8 changes: 4 additions & 4 deletions lib/matplotlib/backend_tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class ToolBase(object):
Keymap to associate with this tool

**String**: List of comma separated keys that will be used to call this
tool when the keypress event of *self.figure.canvas* is emited
tool when the keypress event of *self.figure.canvas* is emitted
"""

description = None
Expand Down Expand Up @@ -154,7 +154,7 @@ class ToolToggleBase(ToolBase):
``*args``
Variable length argument to be used by the Tool
``**kwargs``
`toggled` if present and True, sets the initial state ot the Tool
`toggled` if present and True, sets the initial state of the Tool
Arbitrary keyword arguments to be consumed by the Tool
"""

Expand Down Expand Up @@ -228,8 +228,8 @@ def set_figure(self, figure):
if figure:
self.trigger(self, None)
else:
# if there is no figure, triggen wont change the internal state
# we change it back
# if there is no figure, trigger won't change the internal
# state we change it back
self._toggled = True


Expand Down
2 changes: 1 addition & 1 deletion lib/matplotlib/backends/backend_gtk.py
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@ def destroy(self, *args):
def show(self):
# show the figure window
self.window.show()
# raise the window above others and relase the "above lock"
# raise the window above others and release the "above lock"
self.window.set_keep_above(True)
self.window.set_keep_above(False)

Expand Down
2 changes: 1 addition & 1 deletion lib/matplotlib/backends/backend_gtk3.py
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ def _get_toolbar(self):
return toolbar

def _get_toolmanager(self):
# must be initialised after toolbar has been setted
# must be initialised after toolbar has been set
if rcParams['toolbar'] == 'toolmanager':
toolmanager = ToolManager(self.canvas.figure)
else:
Expand Down
4 changes: 2 additions & 2 deletions lib/matplotlib/backends/backend_ps.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def __init__(self):
@property
def gs_exe(self):
"""
excutable name of ghostscript.
executable name of ghostscript.
"""
try:
return self._cached["gs_exe"]
Expand Down Expand Up @@ -536,7 +536,7 @@ def draw_markers(
ps_color = '%1.3f %1.3f %1.3f setrgbcolor' % rgbFace[:3]

# construct the generic marker command:
ps_cmd = ['/o {', 'gsave', 'newpath', 'translate'] # dont want the translate to be global
ps_cmd = ['/o {', 'gsave', 'newpath', 'translate'] # don't want the translate to be global

lw = gc.get_linewidth()
stroke = lw != 0.0
Expand Down
2 changes: 1 addition & 1 deletion lib/matplotlib/backends/backend_template.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@

* classes Upper or MixedUpperCase

* varables lower or lowerUpper
* variables lower or lowerUpper

* functions lower or underscore_separated

Expand Down
2 changes: 1 addition & 1 deletion lib/matplotlib/backends/backend_tkagg.py
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ def _update_pointer_position(self, guiEvent=None):
#
# 2) call enter/leave events explicitly. The downside of this
# in the impl below is that enter could be repeatedly
# triggered if thes mouse is over the axes and one is
# triggered if the mouse is over the axes and one is
# resizing with the keyboard. This is not entirely bad,
# because the mouse position relative to the canvas is
# changing, but it may be surprising to get repeated entries
Expand Down
2 changes: 1 addition & 1 deletion lib/matplotlib/backends/web_backend/js/nbagg_mpl.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ var comm_websocket_adapter = function(comm) {
// Register the callback with on_msg.
comm.on_msg(function(msg) {
//console.log('receiving', msg['content']['data'], msg);
// Pass the mpl event to the overriden (by mpl) onmessage function.
// Pass the mpl event to the overridden (by mpl) onmessage function.
ws.onmessage(msg['content']['data'])
});
return ws;
Expand Down
4 changes: 2 additions & 2 deletions lib/matplotlib/backends/web_backend/nbagg_uat.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@
"\n",
"### UAT 15 - Figure face colours\n",
"\n",
"The nbagg honours all colours appart from that of the figure.patch. The two plots below should produce a figure with a red background. There should be no yellow figure."
"The nbagg honours all colours apart from that of the figure.patch. The two plots below should produce a figure with a red background. There should be no yellow figure."
]
},
{
Expand Down Expand Up @@ -570,7 +570,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"### UAT17 - stoping figure when removed from DOM\n",
"### UAT17 - stopping figure when removed from DOM\n",
"\n",
"When the div that contains from the figure is removed from the DOM the figure should shut down it's comm, and if the python-side figure has no more active comms, it should destroy the figure. Repeatedly running the cell below should always have the same figure number"
]
Expand Down
16 changes: 8 additions & 8 deletions lib/matplotlib/bezier.py
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ def get_parallels(bezier2, width):
"""

# The parallel bezier lines are constructed by following ways.
# c1 and c2 are contol points representing the begin and end of the
# c1 and c2 are control points representing the begin and end of the
# bezier line.
# cm is the middle point

Expand All @@ -358,7 +358,7 @@ def get_parallels(bezier2, width):
cos_t2, sin_t2 = get_cos_sin(cmx, cmy, c2x, c2y)

# find c1_left, c1_right which are located along the lines
# throught c1 and perpendicular to the tangential lines of the
# through c1 and perpendicular to the tangential lines of the
# bezier path at a distance of width. Same thing for c2_left and
# c2_right with respect to c2.
c1x_left, c1y_left, c1x_right, c1y_right = (
Expand All @@ -369,7 +369,7 @@ def get_parallels(bezier2, width):
)

# find cm_left which is the intersectng point of a line through
# c1_left with angle t1 and a line throught c2_left with angle
# c1_left with angle t1 and a line through c2_left with angle
# t2. Same with cm_right.
if parallel_test != 0:
# a special case for a straight line, i.e., angle between two
Expand All @@ -389,7 +389,7 @@ def get_parallels(bezier2, width):
sin_t1, c2x_right, c2y_right,
cos_t2, sin_t2)

# the parralel bezier lines are created with control points of
# the parallel bezier lines are created with control points of
# [c1_left, cm_left, c2_left] and [c1_right, cm_right, c2_right]
path_left = [(c1x_left, c1y_left),
(cmx_left, cmy_left),
Expand All @@ -402,7 +402,7 @@ def get_parallels(bezier2, width):


def find_control_points(c1x, c1y, mmx, mmy, c2x, c2y):
""" Find control points of the bezier line throught c1, mm, c2. We
""" Find control points of the bezier line through c1, mm, c2. We
simply assume that c1, mm, c2 which have parametric value 0, 0.5, and 1.
"""

Expand All @@ -415,7 +415,7 @@ def find_control_points(c1x, c1y, mmx, mmy, c2x, c2y):
def make_wedged_bezier2(bezier2, width, w1=1., wm=0.5, w2=0.):
"""
Being similar to get_parallels, returns control points of two quadrativ
bezier lines having a width roughly parralel to given one separated by
bezier lines having a width roughly parallel to given one separated by
*width*.
"""

Expand All @@ -424,13 +424,13 @@ def make_wedged_bezier2(bezier2, width, w1=1., wm=0.5, w2=0.):
cmx, cmy = bezier2[1]
c3x, c3y = bezier2[2]

# t1 and t2 is the anlge between c1 and cm, cm, c3.
# t1 and t2 is the angle between c1 and cm, cm, c3.
# They are also a angle of the tangential line of the path at c1 and c3
cos_t1, sin_t1 = get_cos_sin(c1x, c1y, cmx, cmy)
cos_t2, sin_t2 = get_cos_sin(cmx, cmy, c3x, c3y)

# find c1_left, c1_right which are located along the lines
# throught c1 and perpendicular to the tangential lines of the
# through c1 and perpendicular to the tangential lines of the
# bezier path at a distance of width. Same thing for c3_left and
# c3_right with respect to c3.
c1x_left, c1y_left, c1x_right, c1y_right = (
Expand Down
2 changes: 1 addition & 1 deletion lib/matplotlib/cbook/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -1451,7 +1451,7 @@ class Grouper(object):
would be overkill.

Objects can be joined using :meth:`join`, tested for connectedness
using :meth:`joined`, and all disjoint sets can be retreived by
using :meth:`joined`, and all disjoint sets can be retrieved by
using the object as an iterator.

The objects being joined must be hashable and weak-referenceable.
Expand Down
4 changes: 2 additions & 2 deletions lib/matplotlib/colorbar.py
Original file line number Diff line number Diff line change
Expand Up @@ -766,7 +766,7 @@ def _get_extension_lengths(self, frac, automin, automax, default=0.05):
try:
# Try to set min and max extension fractions directly.
extendlength[:] = frac
# If frac is a sequence contaning None then NaN may
# If frac is a sequence containing None then NaN may
# be encountered. This is an error.
if np.isnan(extendlength).any():
raise ValueError()
Expand Down Expand Up @@ -1295,7 +1295,7 @@ def _add_solids(self, X, Y, C):

n_segments = len(C)

# ensure there are sufficent hatches
# ensure there are sufficient hatches
hatches = self.mappable.hatches * n_segments

patches = []
Expand Down
6 changes: 3 additions & 3 deletions lib/matplotlib/colors.py
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ def makeMappingArray(N, data, gamma=1.0):
try:
adata = np.array(data)
except Exception:
raise TypeError("data must be convertable to an array")
raise TypeError("data must be convertible to an array")
shape = adata.shape
if len(shape) != 2 or shape[1] != 3:
raise ValueError("data must be nx3 format")
Expand Down Expand Up @@ -462,7 +462,7 @@ def __call__(self, X, alpha=None, bytes=False):

Returns
-------
Tuple of RGBA values if X is scalar, othewise an array of
Tuple of RGBA values if X is scalar, otherwise an array of
RGBA values with a shape of ``X.shape + (4, )``.

"""
Expand Down Expand Up @@ -1427,7 +1427,7 @@ def hsv_to_rgb(hsv):
raise ValueError("Last dimension of input array must be 3; "
"shape {shp} was found.".format(shp=hsv.shape))

# if we got pased a 1D array, try to treat as
# if we got passed a 1D array, try to treat as
# a single color and reshape as needed
in_ndim = hsv.ndim
if in_ndim == 1:
Expand Down
2 changes: 1 addition & 1 deletion lib/matplotlib/contour.py
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,7 @@ def add_label_near(self, x, y, inline=True, inline_spacing=5,
paths = self.collections[conmin].get_paths()
# grab the correct segment
active_path = paths[segmin]
# grab it's verticies
# grab its vertices
lc = active_path.vertices
# sort out where the new vertex should be added data-units
xcmin = self.ax.transData.inverted().transform_point([xmin, ymin])
Expand Down
Loading
0