Skip to content

Commit fb27aa4

Browse files
committed
BUG: fix buglets surfacing from merge
1 parent 62de8da commit fb27aa4

File tree

6 files changed

+19
-7
lines changed

6 files changed

+19
-7
lines changed

pandas/core/index.py

+3
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,9 @@ def __new__(cls, data, dtype=None, copy=False, name=None):
103103
def __array_finalize__(self, obj):
104104
self.name = getattr(obj, 'name', None)
105105

106+
def _shallow_copy(self):
107+
return self.view(type(self))
108+
106109
def __repr__(self):
107110
try:
108111
result = np.ndarray.__repr__(self)

pandas/core/series.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -264,8 +264,10 @@ def __new__(cls, data=None, index=None, dtype=None, name=None,
264264
try:
265265
if isinstance(index, DatetimeIndex):
266266
# coerce back to datetime objects for lookup
267-
index = index.astype('O')
268-
data = lib.fast_multiget(data, index, default=np.nan)
267+
data = lib.fast_multiget(data, index.astype('O'),
268+
default=np.nan)
269+
else:
270+
data = lib.fast_multiget(data, index, default=np.nan)
269271
except TypeError:
270272
data = [data.get(i, nan) for i in index]
271273

pandas/io/tests/test_pytables.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import numpy as np
1010

1111
from pandas import Series, DataFrame, Panel, MultiIndex, bdate_range
12-
from pandas.io.pytables import HDFStore
12+
from pandas.io.pytables import HDFStore, get_store
1313
import pandas.util.testing as tm
1414

1515
try:

pandas/sparse/panel.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -218,9 +218,9 @@ def __setstate__(self, state):
218218

219219
self.default_fill_value = fv
220220
self.default_kind = kind
221-
self._items = _ensure_index(_unpickle_array(items))
222-
self._major_axis = _ensure_index(_unpickle_array(major))
223-
self._minor_axis = _ensure_index(_unpickle_array(minor))
221+
self._items = _ensure_index(com._unpickle_array(items))
222+
self._major_axis = _ensure_index(com._unpickle_array(major))
223+
self._minor_axis = _ensure_index(com._unpickle_array(minor))
224224
self._frames = frames
225225

226226
def copy(self):

pandas/sparse/tests/test_sparse.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
from pandas import Series, DataFrame, bdate_range, Panel
1818
from pandas.core.datetools import BDay
19-
from pandas.core.index import DatetimeIndex
19+
from pandas.core.index import DatetimeIndex, Index
2020
import pandas.core.datetools as datetools
2121
import pandas.util.testing as tm
2222

pandas/tests/test_timeseries.py

+7
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,13 @@ def test_getitem_median_slice_bug(self):
151151
expected = s[indexer[0]]
152152
assert_series_equal(result, expected)
153153

154+
def test_series_ctor_plus_datetimeindex(self):
155+
rng = date_range('20090415', '20090519', freq='B')
156+
data = dict((k, 1) for k in rng)
157+
158+
result = Series(data, index=rng)
159+
self.assert_(result.index is rng)
160+
154161
def test_series_pad_backfill_limit(self):
155162
index = np.arange(10)
156163
s = Series(np.random.randn(10), index=index)

0 commit comments

Comments
 (0)