Skip to content

Commit

Permalink
Merge pull request #3135 from jreback/GH2787
Browse files Browse the repository at this point in the history
BUG: fix NameError issue in GH2787
  • Loading branch information
jreback committed Mar 22, 2013
2 parents 0bd888b + bfbe15f commit d5f1686
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
2 changes: 2 additions & 0 deletions RELEASE.rst
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ pandas 0.11.0
- Fixed bug in Timestamp(d,tz=foo) when d is date() rather then datetime() (GH2993_)
- series.plot(kind='bar') now respects pylab color schem (GH3115_)
- Fixed bug in reshape if not passed correct input, now raises TypeError (GH2719_)
- Fix NameError issue on RESO_US (GH2787_)

.. _GH2758: https://github.com/pydata/pandas/issues/2758
.. _GH2809: https://github.com/pydata/pandas/issues/2809
Expand All @@ -227,6 +228,7 @@ pandas 0.11.0
.. _GH2751: https://github.com/pydata/pandas/issues/2751
.. _GH2776: https://github.com/pydata/pandas/issues/2776
.. _GH2778: https://github.com/pydata/pandas/issues/2778
.. _GH2787: https://github.com/pydata/pandas/issues/2787
.. _GH2793: https://github.com/pydata/pandas/issues/2793
.. _GH2795: https://github.com/pydata/pandas/issues/2795
.. _GH2819: https://github.com/pydata/pandas/issues/2819
Expand Down
10 changes: 5 additions & 5 deletions pandas/tseries/frequencies.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ class Resolution(object):

@classmethod
def get_str(cls, reso):
return {RESO_US: 'microsecond',
RESO_SEC: 'second',
RESO_MIN: 'minute',
RESO_HR: 'hour',
RESO_DAY: 'day'}.get(reso, 'day')
return {cls.RESO_US: 'microsecond',
cls.RESO_SEC: 'second',
cls.RESO_MIN: 'minute',
cls.RESO_HR: 'hour',
cls.RESO_DAY: 'day'}.get(reso, 'day')


def get_reso_string(reso):
Expand Down

0 comments on commit d5f1686

Please sign in to comment.