Skip to content

Commit 194790d

Browse files
committed
Clean, remove unused code
1 parent c409277 commit 194790d

File tree

5 files changed

+13
-66
lines changed

5 files changed

+13
-66
lines changed

xarray/core/common.py

+11
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,17 @@ def squeeze(self, dim=None):
283283
class BaseDataObject(SharedMethodsMixin, AttrAccessMixin):
284284
"""Shared base class for Dataset and DataArray."""
285285

286+
def get_index(self, key):
287+
"""Get an index for a dimension, with fall-back to a default RangeIndex
288+
"""
289+
if key not in self.dims:
290+
raise KeyError(key)
291+
292+
try:
293+
return self.indexes[key]
294+
except KeyError:
295+
return pd.Index(range(self.sizes[key]), name=key)
296+
286297
def _calc_assign_results(self, kwargs):
287298
results = SortedKeysDict()
288299
for k, v in kwargs.items():

xarray/core/dataarray.py

-11
Original file line numberDiff line numberDiff line change
@@ -513,17 +513,6 @@ def indexes(self):
513513
"""
514514
return Indexes(self._coords, self.sizes)
515515

516-
def get_index(self, key):
517-
"""Get an index for a dimension, with fall-back to a default RangeIndex
518-
"""
519-
if key not in self.dims:
520-
raise KeyError(key)
521-
522-
if key in self._coords:
523-
return self._coords[key].to_index()
524-
else:
525-
return pd.Index(range(self.sizes[key]), name=key)
526-
527516
@property
528517
def coords(self):
529518
"""Dictionary-like container of coordinate arrays.

xarray/core/dataset.py

-11
Original file line numberDiff line numberDiff line change
@@ -644,17 +644,6 @@ def indexes(self):
644644
"""
645645
return Indexes(self._variables, self._dims)
646646

647-
def get_index(self, key):
648-
"""Get an index for a dimension, with fall-back to a default RangeIndex
649-
"""
650-
if key not in self.dims:
651-
raise KeyError(key)
652-
653-
if key in self._variables:
654-
return self._variables[key].to_index()
655-
else:
656-
return pd.Index(range(self.sizes[key]), name=key)
657-
658647
@property
659648
def coords(self):
660649
"""Dictionary of xarray.DataArray objects corresponding to coordinate

xarray/core/indexing.py

-41
Original file line numberDiff line numberDiff line change
@@ -327,47 +327,6 @@ def _index_indexer_1d(old_indexer, applied_indexer, size):
327327
return indexer
328328

329329

330-
class LazyIntegerRange(utils.NDArrayMixin):
331-
332-
def __init__(self, *args, **kwdargs):
333-
"""
334-
Parameters
335-
----------
336-
See np.arange
337-
"""
338-
self.args = args
339-
self.kwdargs = kwdargs
340-
assert 'dtype' not in self.kwdargs
341-
# range will fail if any arguments are not integers
342-
self.array = range(*args, **kwdargs)
343-
344-
@property
345-
def shape(self):
346-
return (len(self.array),)
347-
348-
@property
349-
def dtype(self):
350-
return np.dtype('int64')
351-
352-
@property
353-
def ndim(self):
354-
return 1
355-
356-
@property
357-
def size(self):
358-
return len(self.array)
359-
360-
def __getitem__(self, key):
361-
return np.array(self)[key]
362-
363-
def __array__(self, dtype=None):
364-
return np.arange(*self.args, **self.kwdargs)
365-
366-
def __repr__(self):
367-
return ('%s(array=%r)' %
368-
(type(self).__name__, self.array))
369-
370-
371330
class LazilyIndexedArray(utils.NDArrayMixin):
372331
"""Wrap an array that handles orthogonal indexing to make indexing lazy
373332
"""

xarray/core/merge.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import pandas as pd
22

33
from .alignment import align
4-
from .utils import Frozen, is_dict_like
5-
from .variable import (as_variable, default_index_coordinate,
6-
assert_unique_multiindex_level_names)
4+
from .utils import Frozen
5+
from .variable import (as_variable, assert_unique_multiindex_level_names)
76
from .pycompat import (basestring, OrderedDict)
87

98

0 commit comments

Comments
 (0)