Minor cleanups (#948)

* Add __all__s to be cleaner about re-exports
* Move timezone_getter to conftest
* Apply spelling corrections suggested by codespell

5 files changed, 31 insertions, 35 deletions

diff --git a/tests/conftest.py b/tests/conftest.py
index 5b14b1c..0506a83 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,6 +1,19 @@
 import os
 import pytest
 
+try:
+    import zoneinfo
+except ModuleNotFoundError:
+    try:
+        from backports import zoneinfo
+    except ImportError:
+        zoneinfo = None
+
+try:
+    import pytz
+except ModuleNotFoundError:
+    pytz = None
+
 
 @pytest.fixture
 def os_environ(monkeypatch):
@@ -16,3 +29,19 @@ def pytest_generate_tests(metafunc):
                 from babel.localedata import locale_identifiers
                 metafunc.parametrize("locale", list(locale_identifiers()))
                 break
+
+
+@pytest.fixture(params=["pytz.timezone", "zoneinfo.ZoneInfo"], scope="package")
+def timezone_getter(request):
+    if request.param == "pytz.timezone":
+        if pytz:
+            return pytz.timezone
+        else:
+            pytest.skip("pytz not available")
+    elif request.param == "zoneinfo.ZoneInfo":
+        if zoneinfo:
+            return zoneinfo.ZoneInfo
+        else:
+            pytest.skip("zoneinfo not available")
+    else:
+        raise NotImplementedError
diff --git a/tests/test_date_intervals.py b/tests/test_date_intervals.py
index eb3aa89..8e84a9e 100644
--- a/tests/test_date_intervals.py
+++ b/tests/test_date_intervals.py
@@ -2,7 +2,6 @@ import datetime
 
 from babel import dates
 from babel.util import UTC
-from .test_dates import timezone_getter
 
 TEST_DT = datetime.datetime(2016, 1, 8, 11, 46, 15)
 TEST_TIME = TEST_DT.time()
diff --git a/tests/test_dates.py b/tests/test_dates.py
index 9fd7314..a4fb9c5 100644
--- a/tests/test_dates.py
+++ b/tests/test_dates.py
@@ -16,41 +16,11 @@ from datetime import date, datetime, time, timedelta
 import freezegun
 import pytest
 
-# for tests it can be useful to have both zoneinfo and pytz available
-try:
-    import zoneinfo
-except ModuleNotFoundError:
-    try:
-        from backports import zoneinfo
-    except ImportError:
-        zoneinfo = None
-
-try:
-    import pytz
-except ModuleNotFoundError:
-    pytz = None
-
 from babel import dates, Locale
-from babel.dates import NO_INHERITANCE_MARKER, _localize, _get_tz_name, LOCALTZ
+from babel.dates import NO_INHERITANCE_MARKER, _localize
 from babel.util import FixedOffsetTimezone
 
 
-@pytest.fixture(params=["pytz.timezone", "zoneinfo.ZoneInfo"], scope="package")
-def timezone_getter(request):
-    if request.param == "pytz.timezone":
-        if pytz:
-            return pytz.timezone
-        else:
-            pytest.skip("pytz not available")
-    elif request.param == "zoneinfo.ZoneInfo":
-        if zoneinfo:
-            return zoneinfo.ZoneInfo
-        else:
-            pytest.skip("zoneinfo not available")
-    else:
-        raise NotImplementedError
-
-
 class DateTimeFormatTestCase:
 
     def test_quarter_format(self):
diff --git a/tests/test_numbers.py b/tests/test_numbers.py
index 37d2f9e..0939562 100644
--- a/tests/test_numbers.py
+++ b/tests/test_numbers.py
@@ -28,7 +28,7 @@ class FormatDecimalTestCase(unittest.TestCase):
         assert numbers.format_decimal(12345, '##0', locale='en_US') == '12345'
         assert numbers.format_decimal(6.5, '0.00', locale='sv') == '6,50'
         assert numbers.format_decimal((10.0 ** 20), '#.00', locale='en_US') == '100000000000000000000.00'
-        # regression test for #183, fraction digits were not correctly cutted
+        # regression test for #183, fraction digits were not correctly cut
         # if the input was a float value and the value had more than 7
         # significant digits
         assert numbers.format_decimal(12345678.051, '#,##0.00', locale='en_US') == u'12,345,678.05'
diff --git a/tests/test_support.py b/tests/test_support.py
index d39d8ef..3ca0be3 100644
--- a/tests/test_support.py
+++ b/tests/test_support.py
@@ -23,8 +23,6 @@ from io import BytesIO
 from babel import support
 from babel.messages import Catalog
 from babel.messages.mofile import write_mo
-from babel.dates import get_timezone
-from .test_dates import timezone_getter
 
 
 SKIP_LGETTEXT = sys.version_info >= (3, 8)