Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit e2c092a

Browse filesBrowse files
committed
Merge pull request #1803 from NelleV/pep8_markers
Markers module: PEP8 fixes and MEP10 documentation fixes
2 parents 9690232 + ace1023 commit e2c092a
Copy full SHA for e2c092a

File tree

Expand file treeCollapse file tree

4 files changed

+225
-137
lines changed
Filter options
Expand file treeCollapse file tree

4 files changed

+225
-137
lines changed

‎doc/api/markers_api.rst

Copy file name to clipboard
+12Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
*******
2+
Markers*
3+
******
4+
5+
6+
:mod:`matplotlib.markers`
7+
========================
8+
9+
.. automodule:: matplotlib.markers
10+
:members:
11+
:undoc-members:
12+
:show-inheritance:

‎lib/matplotlib/axes.py

Copy file name to clipboardExpand all lines: lib/matplotlib/axes.py
+1-3Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6190,9 +6190,7 @@ def scatter(self, x, y, s=20, c='b', marker='o', cmap=None, norm=None,
61906190
which the rows are RGB or RGBA, however.
61916191
61926192
*marker*:
6193-
can be one of:
6194-
6195-
%(MarkerTable)s
6193+
See `~matplotlib.markers`
61966194
61976195
Any or all of *x*, *y*, *s*, and *c* may be masked arrays, in
61986196
which case all masks will be combined and only unmasked points

‎lib/matplotlib/lines.py

Copy file name to clipboardExpand all lines: lib/matplotlib/lines.py
+9-5Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -451,9 +451,9 @@ def recache(self, always=False):
451451

452452
self._subslice = False
453453
if (self.axes and len(x) > 100 and self._is_sorted(x) and
454-
self.axes.name == 'rectilinear' and
455-
self.axes.get_xscale() == 'linear' and
456-
self._markevery is None):
454+
self.axes.name == 'rectilinear' and
455+
self.axes.get_xscale() == 'linear' and
456+
self._markevery is None):
457457
self._subslice = True
458458
if hasattr(self, '_path'):
459459
interpolation_steps = self._path._interpolation_steps
@@ -816,9 +816,13 @@ def set_marker(self, marker):
816816
"""
817817
Set the line marker
818818
819-
%(MarkerTable)s
819+
Parameters
820+
-----------
821+
822+
marker: marker style
823+
See `~matplotlib.markers` for full description of possible
824+
argument
820825
821-
%(MarkerAccepts)s
822826
"""
823827
self._marker.set_marker(marker)
824828

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.