Fixed minor bugs in coordinate identification

Chilipp · Chilipp · commit d8ae70d5a2c7 · 2017-12-06T14:40:48.000+01:00
diff --git a/psyplot/data.py b/psyplot/data.py
@@ -829,14 +829,18 @@ def get_variable_by_axis(self, var, axis, coords=None):
             'coordinates', '')).split()
         if not coord_names:
             return
+        ret = []
         for coord in map(lambda dim: coords[dim], filter(
                 lambda dim: dim in coords, chain(
                     coord_names, var.dims))):
             # check for the axis attribute or whether the coordinate is in the
             # list of possible coordinate names
-            if (coord.attrs.get('axis', '').lower() == axis or
-                    coord.name in getattr(self, axis)):
-                return coord
+            if (coord.name not in (c.name for c in ret) and
+                    (coord.attrs.get('axis', '').lower() == axis or
+                     coord.name in getattr(self, axis))):
+                ret.append(coord)
+        if ret:
+            return None if len(ret) > 1 else ret[0]
         # If the coordinates attribute is specified but the coordinate
         # variables themselves have no 'axis' attribute, we interpret the
         # coordinates such that x: -1, y: -2, z: -3
diff --git a/tests/test_data.py b/tests/test_data.py
@@ -240,7 +240,7 @@ def test_idims(self):
             arr = ds.t2m[1:, 1]
             arr.psy.init_accessor(base=ds)
             if not six.PY2:
-                with self.assertWarnsRegex(UserWarning, 'time'):
+                with self.assertWarnsRegex(RuntimeWarning, 'time'):
                     dims = arr.psy.idims
             l = psyd.ArrayList.from_dataset(
                 ds, name='t2m', time=slice(1, None), lev=85000., method='sel')
@@ -292,6 +292,7 @@ def test_get_variable_by_axis(self):
         decoder = psyd.CFDecoder(ds)
         arr = ds.t2m
         arr.attrs.pop('coordinates', None)
+        arr.encoding.pop('coordinates', None)
         for c in ds.coords.values():
             c.attrs.pop('axis', None)
         for dim in ['x', 'y', 'z', 't']:
