got old tests working

Author: rabernat

xarray/core/indexes.py

@@ -35,47 +35,6 @@ def __getitem__(self, key):
     def __unicode__(self):
         return formatting.indexes_repr(self)
 
-# class Indexes(Mapping, formatting.ReprMixin):
-#     """Ordered Mapping[str, pandas.Index] for xarray objects.
-#     """
-#
-#     def __init__(self, variables, sizes):
-#         """Not for public consumption.
-#
-#         Parameters
-#         ----------
-#         variables : OrderedDict[Any, Variable]
-#             Reference to OrderedDict holding variable objects. Should be the
-#             same dictionary used by the source object.
-#         sizes : OrderedDict[Any, int]
-#             Map from dimension names to sizes.
-#         """
-#         self._variables = variables
-#         self._sizes = sizes
-#
-#     def _is_index_variable(self, key):
-#         return (key in self._variables and key in self._sizes and
-#                 isinstance(self._variables[key], IndexVariable))
-#
-#     def __iter__(self):
-#         for key in self._sizes:
-#             if self._is_index_variable(key):
-#                 yield key
-#
-#     def __len__(self):
-#         return sum(self._is_index_variable(key) for key in self._sizes)
-#
-#     def __contains__(self, key):
-#         self._is_index_variable(key)
-#
-#     def __getitem__(self, key):
-#         if not self._is_index_variable(key):
-#             raise KeyError(key)
-#         return self._variables[key].to_index()
-#
-#     def __unicode__(self):
-#         return formatting.indexes_repr(self)
-
 
 def default_indexes(coords, dims):
     """Default indexes for a Dataset/DataArray.
@@ -93,4 +52,4 @@ def default_indexes(coords, dims):
     to indexes used for indexing along that dimension.
     """
     return OrderedDict((key, coords[key].to_index())
-                       for key in dims if key in coords)
+                       for key in dims if key in coords and coords[key].ndim==1)

xarray/tests/test_dataset.py

@@ -237,7 +237,10 @@ def test_constructor(self):
 
         with raises_regex(ValueError, 'conflicting sizes'):
             Dataset({'a': x1, 'b': x2})
-        with raises_regex(TypeError, 'tuples of form'):
+        # these are now allowed -- let's add a more explicit test
+        #with raises_regex(ValueError, "disallows such variables"):
+        #    Dataset({'a': x1, 'x': z})
+        with raises_regex(TypeError, 'tuple of form'):
             Dataset({'x': (1, 2, 3, 4, 5, 6, 7)})
         with raises_regex(ValueError, 'already exists as a scalar'):
             Dataset({'x': 0, 'y': ('x', [1, 2, 3])})