fix tests.

yohai · Dec 15, 2018 · a938d24 · a938d24
1 parent 0d2b126
commit a938d24
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/xarray/plot/plot.py b/xarray/plot/plot.py
@@ -831,9 +831,9 @@ def newplotfunc(darray, x=None, y=None, figsize=None, size=None,
             ax.set_title(darray._title_for_slice())
 
         if add_colorbar:
+            cbar_kwargs = {} if cbar_kwargs is None else dict(cbar_kwargs)
             if add_labels and 'label' not in cbar_kwargs:
                 cbar_kwargs['label'] = label_from_attrs(darray)
-
             cbar = _add_colorbar(primitive, ax, cbar_ax, cbar_kwargs,
                                  cmap_params)
 

diff --git a/xarray/plot/utils.py b/xarray/plot/utils.py
@@ -489,7 +489,6 @@ def _ensure_numeric(arr):
 
 def _add_colorbar(primitive, ax, cbar_ax, cbar_kwargs, cmap_params):
     plt = import_matplotlib_pyplot()
-    cbar_kwargs = {} if cbar_kwargs is None else dict(cbar_kwargs)
     cbar_kwargs.setdefault('extend', cmap_params['extend'])
     if cbar_ax is None:
         cbar_kwargs.setdefault('ax', ax)