From d51f7e2fd6373f0db151a17b61ceb08d83a48e14 Mon Sep 17 00:00:00 2001 From: gfyoung Date: Fri, 31 May 2019 23:30:31 -0700 Subject: [PATCH] CLN: Condense TIMEZONE ID labeling Follow-up to gh-26596 --- pandas/conftest.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pandas/conftest.py b/pandas/conftest.py index 09fe8e0829fa1..c4285e9db038a 100644 --- a/pandas/conftest.py +++ b/pandas/conftest.py @@ -378,12 +378,7 @@ def unique_nulls_fixture(request): FixedOffset(0), FixedOffset(-300), timezone.utc, timezone(timedelta(hours=1)), timezone(timedelta(hours=-1), name='foo')] -TIMEZONE_IDS = ['None', 'UTC', 'US/Eastern', 'Asia/Tokyp', - 'dateutil/US/Pacific', 'dateutil/Asia/Singapore', - 'dateutil.tz.tzutz()', 'dateutil.tz.tzlocal()', - 'pytz.FixedOffset(300)', 'pytz.FixedOffset(0)', - 'pytz.FixedOffset(-300)', 'datetime.timezone.utc', - 'datetime.timezone.+1', 'datetime.timezone.-1.named'] +TIMEZONE_IDS = [repr(i) for i in TIMEZONES] @td.parametrize_fixture_doc(str(TIMEZONE_IDS))