Skip to content

Commit 29cb1f7

Browse files
FIX PeriodConverter unicode parsing
1 parent bdc0d9f commit 29cb1f7

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

pandas/tseries/converter.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ class PeriodConverter(dates.DateConverter):
109109
def convert(values, units, axis):
110110
if not hasattr(axis, 'freq'):
111111
raise TypeError('Axis must have `freq` set to convert to Periods')
112-
valid_types = (str, datetime, Period, pydt.date, pydt.time)
112+
valid_types = (compat.string_types, datetime, Period, pydt.date, pydt.time)
113113
if (isinstance(values, valid_types) or com.is_integer(values) or
114114
com.is_float(values)):
115115
return get_datevalue(values, axis.freq)
@@ -127,7 +127,7 @@ def convert(values, units, axis):
127127
def get_datevalue(date, freq):
128128
if isinstance(date, Period):
129129
return date.asfreq(freq).ordinal
130-
elif isinstance(date, (str, datetime, pydt.date, pydt.time)):
130+
elif isinstance(date, (compat.string_types, datetime, pydt.date, pydt.time)):
131131
return Period(date, freq).ordinal
132132
elif (com.is_integer(date) or com.is_float(date) or
133133
(isinstance(date, (np.ndarray, Index)) and (date.size == 1))):

pandas/tseries/tests/test_converter.py

-2
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,6 @@ class Axis(object):
115115
self.axis.freq = 'D'
116116

117117
def test_convert_accepts_unicode(self):
118-
# FIXME
119-
raise nose.SkipTest("PeriodConverter does not yet handle unicode")
120118
r1 = self.pc.convert("2012-1-1", None, self.axis)
121119
r2 = self.pc.convert(u("2012-1-1"), None, self.axis)
122120
self.assert_equal(r1, r2, "PeriodConverter.convert should accept unicode")

0 commit comments

Comments
 (0)