Fix data access

dstansby · dstansby · commit 09fcae4af937 · 2018-02-10T22:15:56.000Z
diff --git a/lib/matplotlib/units.py b/lib/matplotlib/units.py
@@ -73,23 +73,25 @@ def wrapper(*args, **kwargs):
                 data = arguments['data']
 
             for arg in convert_x:
-                if has_data and arg in data:
-                    original_data = data[arg]
+                if has_data and arguments[arg] in data:
+                    data_arg = arguments[arg]
+                    original_data = data[data_arg]
                     axes._process_unit_info(xdata=original_data, kwargs=kwargs)
                     converted_data = axes.convert_xunits(original_data)
-                    data[arg] = converted_data
+                    data[data_arg] = converted_data
                 else:
                     original_data = arguments[arg]
                     axes._process_unit_info(xdata=original_data, kwargs=kwargs)
                     converted_data = axes.convert_xunits(original_data)
                     arguments[arg] = converted_data
 
             for arg in convert_y:
-                if has_data and arg in data:
-                    original_data = data[arg]
+                if has_data and arguments[arg] in data:
+                    data_arg = arguments[arg]
+                    original_data = data[data_arg]
                     axes._process_unit_info(ydata=original_data, kwargs=kwargs)
                     converted_data = axes.convert_yunits(original_data)
-                    data[arg] = converted_data
+                    data[data_arg] = converted_data
                 else:
                     original_data = arguments[arg]
                     axes._process_unit_info(ydata=original_data, kwargs=kwargs)
@@ -99,6 +101,7 @@ def wrapper(*args, **kwargs):
             if has_data:
                 arguments['data'] = data
             bound_args.arguments = arguments
+
             args = bound_args.args
             kwargs = bound_args.kwargs
             return func(*args, **kwargs)
