CLN: Condense TIMEZONE ID labeling

Follow-up to pandas-devgh-26596

Author: gfyoung

pandas/conftest.py

@@ -9,8 +9,6 @@
 import pytest
 from pytz import FixedOffset, utc
 
-import pandas.util._test_decorators as td
-
 import pandas as pd
 from pandas import DataFrame
 import pandas.util.testing as tm
@@ -378,28 +376,20 @@ 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']
 
 
-@td.parametrize_fixture_doc(str(TIMEZONE_IDS))
-@pytest.fixture(params=TIMEZONES, ids=TIMEZONE_IDS)
+@pytest.fixture(params=TIMEZONES, ids=repr)
 def tz_naive_fixture(request):
     """
-    Fixture for trying timezones including default (None): {0}
+    Fixture for trying timezones including default (None)
     """
     return request.param
 
 
-@td.parametrize_fixture_doc(str(TIMEZONE_IDS[1:]))
-@pytest.fixture(params=TIMEZONES[1:], ids=TIMEZONE_IDS[1:])
+@pytest.fixture(params=TIMEZONES[1:], ids=repr)
 def tz_aware_fixture(request):
     """
-    Fixture for trying explicit timezones: {0}
+    Fixture for trying explicit timezones
     """
     return request.param
 

pandas/util/_test_decorators.py

@@ -157,28 +157,3 @@ def decorated_func(func):
                                    "installed->{installed}".format(
                                        enabled=_USE_NUMEXPR,
                                        installed=_NUMEXPR_INSTALLED))
-
-
-def parametrize_fixture_doc(*args):
-    """
-    Intended for use as a decorator for parametrized fixture,
-    this function will wrap the decorated function with a pytest
-    ``parametrize_fixture_doc`` mark. That mark will format
-    initial fixture docstring by replacing placeholders {0}, {1} etc
-    with parameters passed as arguments.
-
-    Parameters:
-    ----------
-        args: iterable
-            Positional arguments for docstring.
-
-    Returns:
-    -------
-    documented_fixture: function
-        The decorated function wrapped within a pytest
-        ``parametrize_fixture_doc`` mark
-    """
-    def documented_fixture(fixture):
-        fixture.__doc__ = fixture.__doc__.format(*args)
-        return fixture
-    return documented_fixture