Skip to content

de-privatize timezone functions #17543

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Sep 23, 2017
Merged

de-privatize timezone functions #17543

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d77c181
de-privatize timezone functions
jbrockmendel Sep 15, 2017
3f45e61
fixup typo
jbrockmendel Sep 15, 2017
4b33f33
typo fixup nameerror
jbrockmendel Sep 16, 2017
acf6dbd
Fix de-privatized import
jbrockmendel Sep 16, 2017
5fa670e
Import timezone funcs directly from tslibs.timezones
jbrockmendel Sep 16, 2017
d77cbba
flake8 fixup remove unused import
jbrockmendel Sep 17, 2017
4898150
reprivative p_tz_cache_key, lint whitespace fixup
jbrockmendel Sep 17, 2017
b945494
Dont alias dateutil_gettz
jbrockmendel Sep 17, 2017
b6a14c2
Remove aliasing for dateutil_gettz
jbrockmendel Sep 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Remove aliasing for dateutil_gettz
  • Loading branch information
@jbrockmendel
jbrockmendel committed Sep 18, 2017
commit b6a14c2bf0f628993c0410646c6019a3d7315658
10 changes: 5 additions & 5 deletions pandas/tests/scalar/test_period.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,29 +245,29 @@ def test_timestamp_tz_arg(self):
assert p.tz == exp.tz

def test_timestamp_tz_arg_dateutil(self):
from pandas._libs.tslibs.timezones import dateutil_gettz as gettz
from pandas._libs.tslibs.timezones import dateutil_gettz
from pandas._libs.tslibs.timezones import maybe_get_tz
for case in ['dateutil/Europe/Brussels', 'dateutil/Asia/Tokyo',
'dateutil/US/Pacific']:
p = Period('1/1/2005', freq='M').to_timestamp(
tz=maybe_get_tz(case))
exp = Timestamp('1/1/2005', tz='UTC').tz_convert(case)
assert p == exp
assert p.tz == gettz(case.split('/', 1)[1])
assert p.tz == dateutil_gettz(case.split('/', 1)[1])
assert p.tz == exp.tz

p = Period('1/1/2005',
freq='M').to_timestamp(freq='3H', tz=maybe_get_tz(case))
exp = Timestamp('1/1/2005', tz='UTC').tz_convert(case)
assert p == exp
assert p.tz == gettz(case.split('/', 1)[1])
assert p.tz == dateutil_gettz(case.split('/', 1)[1])
assert p.tz == exp.tz

def test_timestamp_tz_arg_dateutil_from_string(self):
from pandas._libs.tslibs.timezones import dateutil_gettz as gettz
from pandas._libs.tslibs.timezones import dateutil_gettz
p = Period('1/1/2005',
freq='M').to_timestamp(tz='dateutil/Europe/Brussels')
assert p.tz == gettz('Europe/Brussels')
assert p.tz == dateutil_gettz('Europe/Brussels')

def test_timestamp_mult(self):
p = pd.Period('2011-01', freq='M')
Expand Down