WIP: review work

tacaswell · jankatins · commit b09370ede758 · 2015-08-31T12:06:41.000+02:00
should split this up into smaller commits
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -119,7 +119,7 @@
 import functools
 # cbook must import matplotlib only within function
 # definitions, so it is safe to import from it here.
-from matplotlib.cbook import is_string_like, mplDeprecation, dedent
+from matplotlib.cbook import is_string_like, mplDeprecation, dedent, get_label
 from matplotlib.compat import subprocess
 from matplotlib.rcsetup import (defaultParams,
                                 validate_backend,
@@ -1646,9 +1646,9 @@ def param(func):
         # arguments
         label_pos = 9999  # bigger than all "possible" argument lists
         label_namer_pos = 9999  # bigger than all "possible" argument lists
-        if (label_namer  # we actually want a label here ...
-            and arg_names  # and we can determine a label in *args ...
-            and (label_namer in arg_names)):  # and it is in *args
+        if (label_namer and  # we actually want a label here ...
+                arg_names and  # and we can determine a label in *args ...
+                (label_namer in arg_names)):  # and it is in *args
             label_namer_pos = arg_names.index(label_namer)
             if "label" in arg_names:
                 label_pos = arg_names.index("label")
@@ -1688,9 +1688,9 @@ def inner(ax, *args, **kwargs):
                     # update the information about replace names and
                     # label position
                     _arg_names = positional_parameter_names(args, data)
-                    if (label_namer  # we actually want a label here ...
-                        and _arg_names  # and we can find a label in *args ...
-                        and (label_namer in _arg_names)):  # and it is in *args
+                    if (label_namer and  # we actually want a label here ...
+                            _arg_names and  # and we can find a label in *args
+                            (label_namer in _arg_names)):  # and it is in *args
                         _label_namer_pos = _arg_names.index(label_namer)
                         if "label" in _arg_names:
                             _label_pos = arg_names.index("label")
@@ -1738,15 +1738,9 @@ def inner(ax, *args, **kwargs):
             )
             if (label_namer and not user_supplied_label):
                 if _label_namer_pos < len(args):
-                    try:
-                        kwargs['label'] = args[_label_namer_pos].name
-                    except AttributeError:
-                        kwargs['label'] = label
+                    kwargs['label'] = get_label(args[_label_namer_pos], label)
                 elif label_namer in kwargs:
-                    try:
-                        kwargs['label'] = kwargs[label_namer].name
-                    except AttributeError:
-                        kwargs['label'] = label
+                    kwargs['label'] = get_label(kwargs[label_namer], label)
                 else:
                     import warnings
                     msg = ("Tried to set a label via parameter '%s' in "
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -40,13 +40,47 @@
 from matplotlib.axes._base import _AxesBase
 from matplotlib.axes._base import _process_plot_format
 
+
 rcParams = matplotlib.rcParams
 
 iterable = cbook.iterable
 is_string_like = cbook.is_string_like
 is_sequence_of_strings = cbook.is_sequence_of_strings
 
 
+def _plot_args_replacer(args, data):
+    _replacer = []
+    remaining = args
+    while 1:
+        if len(remaining) == 1:
+
+            msg = ("Missing argument: this can happen if a color spec "
+                   "('c') is in `data`")
+            warnings.warn(msg, RuntimeWarning, stacklevel=3)
+            _replacer += ["x"]
+        elif len(remaining) == 2:
+            _replacer += ["x", "y"]
+        elif len(remaining) == 3:
+            if remaining[2] in data:
+                import warnings
+
+                msg = "Found a color spec ('c') in data."
+                warnings.warn(msg, RuntimeWarning, stacklevel=3)
+            _replacer += ["x", "y", "c"]
+
+        if len(remaining) <= 3:
+            return _replacer
+
+        # More than 3 -> split off the beginning and continue
+        if remaining[2] not in data:
+            _replacer += ["x", "y", "c"]
+            isplit = 3
+        else:
+            _replacer += ["x", "y"]
+            isplit = 2
+        remaining = remaining[isplit:]
+
+
 # The axes module contains all the wrappers to plotting functions.
 # All the other methods should go in the _AxesBase class.
 
@@ -1245,40 +1279,7 @@ def eventplot(self, positions, orientation='horizontal', lineoffsets=1,
 
         return colls
 
-    def _plot_args_replacer(self, args, data):
-        _replacer = []
-        remaining = args
-        while 1:
-            if len(remaining) == 1:
-                import warnings
-
-                msg = "Missing argument: this can happen if a color spec " \
-                      "('c') is in data"
-                warnings.warn(msg, RuntimeWarning, stacklevel=3)
-                _replacer += ["x"]
-            elif len(remaining) == 2:
-                _replacer += ["x", "y"]
-            elif len(remaining) == 3:
-                if remaining[2] in data:
-                    import warnings
-
-                    msg = "Found a color spec ('c') in data."
-                    warnings.warn(msg, RuntimeWarning, stacklevel=3)
-                _replacer += ["x", "y", "c"]
-
-            if len(remaining) <= 3:
-                return _replacer
-
-            # More than 3 -> split off the beginning and continue
-            if remaining[2] not in data:
-                _replacer += ["x", "y", "c"]
-                isplit = 3
-            else:
-                _replacer += ["x", "y"]
-                isplit = 2
-            remaining = remaining[isplit:]
-
-    #### Basic plotting
+    # ### Basic plotting
     # The label_naming happens in `matplotlib.axes._base._plot_args`
     @unpack_labeled_data(replace_names=["x", "y"],
                          positional_parameter_names=_plot_args_replacer,
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -350,7 +350,7 @@ def _plot_args(self, tup, kwargs):
                 kw[k] = v
 
         if 'label' not in kwargs or kwargs['label'] is None:
-            kwargs['label'] = get_label(tup[-1])
+            kwargs['label'] = get_label(tup[-1], None)
 
         if len(tup) == 2:
             x = np.atleast_1d(tup[0])
diff --git a/lib/matplotlib/cbook.py b/lib/matplotlib/cbook.py
@@ -2516,11 +2516,11 @@ def get_index_y(y):
         return np.arange(y.shape[0], dtype=float), y
 
 
-def get_label(y):
+def get_label(y, default_name):
     try:
         return y.name
     except AttributeError:
-        return None
+        return default_name
 
 # Numpy > 1.6.x deprecates putmask in favor of the new copyto.
 # So long as we support versions 1.6.x and less, we need the
