change signature of Coordinate.__init__

Author: Benoit Bovy

xarray/core/variable.py

@@ -1072,20 +1072,18 @@ class Coordinate(Variable):
 
     The most important difference is that Coordinate objects must always have a
     name, which is the dimension along which they index values unless another
-    dimension name is specified.
+    name is specified.
 
     Coordinates must always be 1-dimensional. In addition to Variable methods
     and properties (attributes, encoding, broadcasting), they support some
     pandas.Index methods directly (e.g., get_indexer), even though pandas does
     not (yet) support duck-typing for indexes.
     """
 
-    def __init__(self, name, data, attrs=None, encoding=None,
-                 fastpath=False, dim=None):
-        if dim is None:
-            dim = name
+    def __init__(self, dims, data, attrs=None, encoding=None,
+                 name=None, fastpath=False):
 
-        super(Coordinate, self).__init__(dim, data, attrs, encoding, fastpath)
+        super(Coordinate, self).__init__(dims, data, attrs, encoding, fastpath)
         if self.ndim != 1:
             raise ValueError('%s objects must be 1-dimensional' %
                              type(self).__name__)
@@ -1106,8 +1104,8 @@ def __getitem__(self, key):
         if not hasattr(values, 'ndim') or values.ndim == 0:
             return Variable((), values, self._attrs, self._encoding)
         else:
-            return type(self)(self._name, values, self._attrs,
-                              self._encoding, fastpath=True, dim=self.dims)
+            return type(self)(self.dims, values, self._attrs,
+                              self._encoding, name=self._name, fastpath=True)
 
     def __setitem__(self, key, value):
         raise TypeError('%s values cannot be modified' % type(self).__name__)
@@ -1159,8 +1157,8 @@ def copy(self, deep=True):
         # there is no need to copy the index values here even if deep=True
         # since pandas.Index objects are immutable
         data = PandasIndexAdapter(self) if deep else self._data
-        return type(self)(self._name, data, self._attrs,
-                          self._encoding, fastpath=True, dim=self.dims)
+        return type(self)(self.dims, data, self._attrs,
+                          self._encoding, name=self._name, fastpath=True)
 
     def _data_equals(self, other):
         return self.to_index().equals(other.to_index())
@@ -1205,7 +1203,7 @@ def get_level_coord(self, level):
         if self.level_names is None:
             raise ValueError("Coordinate %s has no MultiIndex" % self.name)
         index = self.to_index()
-        return type(self)(level, index.get_level_values(level), dim=self.name)
+        return type(self)(self.dims, index.get_level_values(level), name=level)
 
     @property
     def name(self):