Skip to content

Commit d5f1686

Browse files
committed
Merge pull request #3135 from jreback/GH2787
BUG: fix NameError issue in GH2787
2 parents 0bd888b + bfbe15f commit d5f1686

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

RELEASE.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ pandas 0.11.0
202202
- Fixed bug in Timestamp(d,tz=foo) when d is date() rather then datetime() (GH2993_)
203203
- series.plot(kind='bar') now respects pylab color schem (GH3115_)
204204
- Fixed bug in reshape if not passed correct input, now raises TypeError (GH2719_)
205+
- Fix NameError issue on RESO_US (GH2787_)
205206

206207
.. _GH2758: https://github.com/pydata/pandas/issues/2758
207208
.. _GH2809: https://github.com/pydata/pandas/issues/2809
@@ -227,6 +228,7 @@ pandas 0.11.0
227228
.. _GH2751: https://github.com/pydata/pandas/issues/2751
228229
.. _GH2776: https://github.com/pydata/pandas/issues/2776
229230
.. _GH2778: https://github.com/pydata/pandas/issues/2778
231+
.. _GH2787: https://github.com/pydata/pandas/issues/2787
230232
.. _GH2793: https://github.com/pydata/pandas/issues/2793
231233
.. _GH2795: https://github.com/pydata/pandas/issues/2795
232234
.. _GH2819: https://github.com/pydata/pandas/issues/2819

pandas/tseries/frequencies.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ class Resolution(object):
3434

3535
@classmethod
3636
def get_str(cls, reso):
37-
return {RESO_US: 'microsecond',
38-
RESO_SEC: 'second',
39-
RESO_MIN: 'minute',
40-
RESO_HR: 'hour',
41-
RESO_DAY: 'day'}.get(reso, 'day')
37+
return {cls.RESO_US: 'microsecond',
38+
cls.RESO_SEC: 'second',
39+
cls.RESO_MIN: 'minute',
40+
cls.RESO_HR: 'hour',
41+
cls.RESO_DAY: 'day'}.get(reso, 'day')
4242

4343

4444
def get_reso_string(reso):

0 commit comments

Comments
 (0)