Merge pull request matplotlib#1803 from NelleV/pep8_markers

Markers module: PEP8 fixes and MEP10 documentation fixes

Author: mdboom

doc/api/markers_api.rst

@@ -0,0 +1,12 @@
+*******
+Markers*
+******
+
+
+:mod:`matplotlib.markers`
+========================
+
+.. automodule:: matplotlib.markers
+   :members:
+   :undoc-members:
+   :show-inheritance:

lib/matplotlib/axes.py

@@ -6190,9 +6190,7 @@ def scatter(self, x, y, s=20, c='b', marker='o', cmap=None, norm=None,
             which the rows are RGB or RGBA, however.
 
           *marker*:
-            can be one of:
-
-            %(MarkerTable)s
+            See `~matplotlib.markers`
 
         Any or all of *x*, *y*, *s*, and *c* may be masked arrays, in
         which case all masks will be combined and only unmasked points

lib/matplotlib/lines.py

@@ -451,9 +451,9 @@ def recache(self, always=False):
 
         self._subslice = False
         if (self.axes and len(x) > 100 and self._is_sorted(x) and
-            self.axes.name == 'rectilinear' and
-            self.axes.get_xscale() == 'linear' and
-            self._markevery is None):
+                self.axes.name == 'rectilinear' and
+                self.axes.get_xscale() == 'linear' and
+                self._markevery is None):
             self._subslice = True
         if hasattr(self, '_path'):
             interpolation_steps = self._path._interpolation_steps
@@ -816,9 +816,13 @@ def set_marker(self, marker):
         """
         Set the line marker
 
-        %(MarkerTable)s
+        Parameters
+        -----------
+
+        marker: marker style
+            See `~matplotlib.markers` for full description of possible
+            argument
 
-        %(MarkerAccepts)s
         """
         self._marker.set_marker(marker)