Skip to content

Commit 8ea1a51

Browse files
committed
BUG: DateTimeConverter typo calls np._asarray_tuplesafe. TST: a few more test cases for DateTimeConverter.convert
1 parent 93afe8b commit 8ea1a51

File tree

2 files changed

+21
-3
lines changed

2 files changed

+21
-3
lines changed

pandas/tseries/converter.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ class DatetimeConverter(dates.DateConverter):
137137

138138
@staticmethod
139139
def convert(values, unit, axis):
140-
from pandas.tseries.index import DatetimeIndex
141140
def try_parse(values):
142141
try:
143142
return _dt_to_float_ordinal(tools.to_datetime(values))
@@ -154,7 +153,7 @@ def try_parse(values):
154153
return try_parse(values)
155154
elif isinstance(values, (list, tuple, np.ndarray)):
156155
if not isinstance(values, np.ndarray):
157-
values = np._asarray_tuplesafe(values)
156+
values = com._asarray_tuplesafe(values)
158157

159158
if com.is_integer_dtype(values) or com.is_float_dtype(values):
160159
return values

pandas/tseries/tests/test_converter.py

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from datetime import datetime, time, timedelta
1+
from datetime import datetime, time, timedelta, date
22
import sys
33
import os
44
import unittest
@@ -25,6 +25,25 @@ def test_convert_accepts_unicode(self):
2525
r2 = self.dtc.convert(u"12:22",None,None)
2626
assert(r1==r2), "DatetimeConverter.convert should accept unicode"
2727

28+
def test_conversion(self):
29+
rs = self.dtc.convert(['2012-1-1'], None, None)[0]
30+
xp = datetime(2012, 1, 1).toordinal()
31+
self.assertEqual(rs, xp)
32+
33+
rs = self.dtc.convert('2012-1-1', None, None)
34+
self.assertEqual(rs, xp)
35+
36+
rs = self.dtc.convert(date(2012, 1, 1), None, None)
37+
self.assertEqual(rs, xp)
38+
39+
rs = self.dtc.convert(datetime(2012, 1, 1).toordinal(), None, None)
40+
self.assertEqual(rs, xp)
41+
42+
rs = self.dtc.convert('2012-1-1', None, None)
43+
self.assertEqual(rs, xp)
44+
45+
46+
2847
if __name__ == '__main__':
2948
import nose
3049
nose.runmodule(argv=[__file__,'-vvs','-x','--pdb', '--pdb-failure'],

0 commit comments

Comments
 (0)