ENH last updates on cbook in the matplolib main codebase (docstrings)

NelleV · NelleV · commit 91e2e823ca52 · 2013-02-01T10:37:14.000+01:00
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -338,7 +338,7 @@ class Axes(martist.Artist):
     coordinate system.
 
     The :class:`Axes` instance supports callbacks through a callbacks
-    attribute which is a :class:`~matplotlib._cbook.CallbackRegistry`
+    attribute which is a :class:`~matplotlib.utils.CallbackRegistry`
     instance.  The events you can connect to are 'xlim_changed' and
     'ylim_changed' and the callback will be called with func(*ax*)
     where *ax* is the :class:`Axes` instance.
diff --git a/lib/matplotlib/mlab.py b/lib/matplotlib/mlab.py
@@ -2809,7 +2809,7 @@ def griddata(x,y,z,xi,yi,interp='nn'):
 def less_simple_linear_interpolation( x, y, xi, extrap=False ):
     """
     This function provides simple (but somewhat less so than
-    :func:`_cbook.simple_linear_interpolation`) linear interpolation.
+    :func:`utils.simple_linear_interpolation`) linear interpolation.
     :func:`simple_linear_interpolation` will give a list of point
     between a start and an end, while this does true linear
     interpolation at an arbitrary set of points.
diff --git a/lib/matplotlib/mpl-data/sample_data/README.txt b/lib/matplotlib/mpl-data/sample_data/README.txt
@@ -1,2 +1,2 @@
 This is the sample data needed for some of matplotlib's examples and
-docs.  See matplotlib.cbook.get_sample_data for more info.
+docs.  See matplotlib.utils.get_sample_data for more info.
diff --git a/lib/matplotlib/textpath.py b/lib/matplotlib/textpath.py
@@ -32,7 +32,7 @@ def __init__(self):
         self.mathtext_parser = MathTextParser('path')
         self.tex_font_map = None
 
-        from matplotlib._cbook import maxdict
+        from matplotlib.utils import maxdict
         self._ps_fontd = maxdict(50)
 
         self._texmanager = None
diff --git a/lib/matplotlib/ticker.py b/lib/matplotlib/ticker.py
@@ -128,7 +128,7 @@
 import math
 import numpy as np
 from matplotlib import rcParams
-from matplotlib import _cbook
+from matplotlib import utils 
 from matplotlib import transforms as mtransforms
 
 
@@ -647,7 +647,7 @@ def __call__(self, x, pos=None):
     def format_data(self, value):
         b = self.labelOnlyBase
         self.labelOnlyBase = False
-        value = _cbook.strip_math(self.__call__(value))
+        value = utils.strip_math(self.__call__(value))
         self.labelOnlyBase = b
         return value
 
diff --git a/lib/matplotlib/tri/triplot.py b/lib/matplotlib/tri/triplot.py
@@ -1,10 +1,11 @@
 from __future__ import print_function
-from matplotlib._cbook import ls_mapper
+from matplotlib.utils import ls_mapper
 from matplotlib.patches import PathPatch
 from matplotlib.path import Path
 from matplotlib.tri.triangulation import Triangulation
 import numpy as np
 
+
 def triplot(ax, *args, **kwargs):
     """
     Draw a unstructured triangular grid as lines and/or markers.
@@ -64,7 +65,7 @@ def triplot(ax, *args, **kwargs):
         kw['facecolor'] = None
 
         vertices = np.column_stack((x[edges].flatten(), y[edges].flatten()))
-        codes = ([Path.MOVETO] + [Path.LINETO])*len(edges)
+        codes = ([Path.MOVETO] + [Path.LINETO]) * len(edges)
 
         path = Path(vertices, codes)
         pathpatch = PathPatch(path, **kw)
diff --git a/lib/matplotlib/utils/__init__.py b/lib/matplotlib/utils/__init__.py
@@ -301,7 +301,7 @@ class Grouper(object):
 
     For example:
 
-        >>> from matplotlib._cbook import Grouper
+        >>> from matplotlib.utils import Grouper
         >>> class Foo(object):
         ...     def __init__(self, s):
         ...         self.s = s
@@ -503,7 +503,7 @@ class CallbackRegistry:
         >>> def ondrink(x):
         ...    print 'drink', x
 
-        >>> from matplotlib._cbook import CallbackRegistry
+        >>> from matplotlib.utils import CallbackRegistry
         >>> callbacks = CallbackRegistry()
 
         >>> id_eat = callbacks.connect('eat', oneat)

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`This is the sample data needed for some of matplotlib's examples and`
`2`		`-docs. See matplotlib.cbook.get_sample_data for more info.`
	`2`	`+docs. See matplotlib.utils.get_sample_data for more info.`