We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 0bf4532 commit 3ba410aCopy full SHA for 3ba410a
pandas/tests/indexes/datetimes/test_misc.py
@@ -307,5 +307,5 @@ def test_datetimeindex_accessors(self):
307
def test_nanosecond_field(self):
308
dti = DatetimeIndex(np.arange(10))
309
310
- self.assert_numpy_array_equal(dti.nanosecond,
311
- np.arange(10, dtype=np.int32))
+ self.assert_index_equal(dti.nanosecond,
+ pd.Index(np.arange(10, dtype=np.int64)))
pandas/tests/indexes/period/test_construction.py
@@ -91,8 +91,8 @@ def test_constructor_arrays_negative_year(self):
91
92
pindex = PeriodIndex(year=years, quarter=quarters)
93
94
- self.assert_numpy_array_equal(pindex.year, years)
95
- self.assert_numpy_array_equal(pindex.quarter, quarters)
+ self.assert_index_equal(pindex.year, pd.Index(years))
+ self.assert_index_equal(pindex.quarter, pd.Index(quarters))
96
97
def test_constructor_invalid_quarters(self):
98
self.assertRaises(ValueError, PeriodIndex, year=lrange(2000, 2004),
pandas/tests/indexes/period/test_period.py
@@ -653,10 +653,10 @@ def test_pindex_fieldaccessor_nat(self):
653
idx = PeriodIndex(['2011-01', '2011-02', 'NaT',
654
'2012-03', '2012-04'], freq='D')
655
656
- exp = np.array([2011, 2011, -1, 2012, 2012], dtype=np.int64)
657
- self.assert_numpy_array_equal(idx.year, exp)
658
- exp = np.array([1, 2, -1, 3, 4], dtype=np.int64)
659
- self.assert_numpy_array_equal(idx.month, exp)
+ exp = Index([2011, 2011, -1, 2012, 2012], dtype=np.int64)
+ self.assert_index_equal(idx.year, exp)
+ exp = Index([1, 2, -1, 3, 4], dtype=np.int64)
+ self.assert_index_equal(idx.month, exp)
660
661
def test_pindex_qaccess(self):
662
pi = PeriodIndex(['2Q05', '3Q05', '4Q05', '1Q06', '2Q06'], freq='Q')
pandas/tseries/index.py
@@ -77,16 +77,19 @@ def f(self):
77
78
result = tslib.get_start_end_field(values, field, self.freqstr,
79
month_kw)
80
+ result = self._maybe_mask_results(result, convert='float64')
81
+
82
elif field in ['weekday_name']:
83
result = tslib.get_date_name_field(values, field)
- return self._maybe_mask_results(result)
84
+ result = self._maybe_mask_results(result)
85
elif field in ['is_leap_year']:
86
# no need to mask NaT
- return tslib.get_date_field(values, field)
87
+ result = tslib.get_date_field(values, field)
88
else:
89
result = tslib.get_date_field(values, field)
90
- return self._maybe_mask_results(result, convert='float64')
+ return Index(result)
f.__name__ = name
f.__doc__ = docstring
@@ -1913,9 +1916,9 @@ def to_julian_date(self):
1913
1916
"""
1914
1917
1915
1918
# http://mysite.verizon.net/aesir_research/date/jdalg2.htm
- year = self.year
- month = self.month
- day = self.day
1919
+ year = np.asarray(self.year)
1920
+ month = np.asarray(self.month)
1921
+ day = np.asarray(self.day)
1922
testarr = month < 3
1923
year[testarr] -= 1
1924
month[testarr] += 12
pandas/tseries/period.py
@@ -52,7 +52,8 @@
52
def _field_accessor(name, alias, docstring=None):
53
def f(self):
54
base, mult = _gfc(self.freq)
55
- return get_period_field_arr(alias, self._values, base)
+ result = get_period_field_arr(alias, self._values, base)
56
57
58
59
return property(f)
@@ -585,7 +586,7 @@ def to_datetime(self, dayfirst=False):
585
586
@property
587
def is_leap_year(self):
588
""" Logical indicating if the date belongs to a leap year """
- return tslib._isleapyear_arr(self.year)
589
+ return tslib._isleapyear_arr(np.asarray(self.year))
590
591
592
def start_time(self):
0 commit comments