summaryrefslogtreecommitdiff
path: root/babel
diff options
context:
space:
mode:
authorAarni Koskela <akx@iki.fi>2023-01-18 20:07:31 +0200
committerAarni Koskela <akx@iki.fi>2023-01-18 21:20:51 +0200
commit3fb72cea613ba05480a9027aa927d2c8b817d693 (patch)
treedd17d47cc814123a5e4a3e3dad212d9acf3c0b4e /babel
parent67870e3ce54d6b0a61900e2436f3ffdfa4d6a83d (diff)
downloadbabel-3fb72cea613ba05480a9027aa927d2c8b817d693.tar.gz
Apply ruff I category fixes
Diffstat (limited to 'babel')
-rw-r--r--babel/dates.py2
-rw-r--r--babel/localtime/__init__.py2
-rw-r--r--babel/localtime/_unix.py6
-rw-r--r--babel/localtime/_win32.py3
-rw-r--r--babel/messages/catalog.py7
-rw-r--r--babel/messages/checkers.py3
-rw-r--r--babel/messages/extract.py18
-rw-r--r--babel/messages/frontend.py19
-rw-r--r--babel/messages/jslexer.py2
-rw-r--r--babel/messages/plurals.py2
-rw-r--r--babel/messages/pofile.py7
-rw-r--r--babel/numbers.py4
-rw-r--r--babel/support.py15
-rw-r--r--babel/util.py6
14 files changed, 57 insertions, 39 deletions
diff --git a/babel/dates.py b/babel/dates.py
index ee8bcfd..7bfea71 100644
--- a/babel/dates.py
+++ b/babel/dates.py
@@ -27,9 +27,9 @@ except ModuleNotFoundError:
pytz = None
import zoneinfo
+import datetime
from bisect import bisect_right
from collections.abc import Iterable
-import datetime
from babel import localtime
from babel.core import Locale, default_locale, get_global
diff --git a/babel/localtime/__init__.py b/babel/localtime/__init__.py
index 9d227c7..1d65fb2 100644
--- a/babel/localtime/__init__.py
+++ b/babel/localtime/__init__.py
@@ -9,9 +9,9 @@
:license: BSD, see LICENSE for more details.
"""
+import datetime
import sys
import time
-import datetime
from threading import RLock
if sys.platform == 'win32':
diff --git a/babel/localtime/_unix.py b/babel/localtime/_unix.py
index 89b461a..eb81beb 100644
--- a/babel/localtime/_unix.py
+++ b/babel/localtime/_unix.py
@@ -1,14 +1,14 @@
+import datetime
import os
import re
-import datetime
-
from babel.localtime._helpers import (
+ _get_tzinfo,
_get_tzinfo_from_file,
_get_tzinfo_or_raise,
- _get_tzinfo,
)
+
def _tz_from_env(tzenv: str) -> datetime.tzinfo:
if tzenv[0] == ':':
tzenv = tzenv[1:]
diff --git a/babel/localtime/_win32.py b/babel/localtime/_win32.py
index 42f819a..1a52567 100644
--- a/babel/localtime/_win32.py
+++ b/babel/localtime/_win32.py
@@ -6,9 +6,10 @@ except ImportError:
winreg = None
import datetime
+from typing import Any, Dict, cast
+
from babel.core import get_global
from babel.localtime._helpers import _get_tzinfo_or_raise
-from typing import Any, Dict, cast
# When building the cldr data on windows this module gets imported.
# Because at that point there is no global.dat yet this call will
diff --git a/babel/messages/catalog.py b/babel/messages/catalog.py
index 7b27f64..dbca10f 100644
--- a/babel/messages/catalog.py
+++ b/babel/messages/catalog.py
@@ -9,21 +9,20 @@
"""
from __future__ import annotations
+import datetime
import re
-
from collections import OrderedDict
from collections.abc import Iterable, Iterator
-import datetime
+from copy import copy
from difflib import get_close_matches
from email import message_from_string
-from copy import copy
from typing import TYPE_CHECKING
from babel import __version__ as VERSION
from babel.core import Locale, UnknownLocaleError
from babel.dates import format_datetime
from babel.messages.plurals import get_plural
-from babel.util import distinct, LOCALTZ, FixedOffsetTimezone, _cmp
+from babel.util import LOCALTZ, FixedOffsetTimezone, _cmp, distinct
if TYPE_CHECKING:
from typing_extensions import TypeAlias
diff --git a/babel/messages/checkers.py b/babel/messages/checkers.py
index 5e36b87..38a26e8 100644
--- a/babel/messages/checkers.py
+++ b/babel/messages/checkers.py
@@ -13,8 +13,7 @@ from __future__ import annotations
from collections.abc import Callable
-from babel.messages.catalog import Catalog, Message, TranslationError, PYTHON_FORMAT
-
+from babel.messages.catalog import PYTHON_FORMAT, Catalog, Message, TranslationError
#: list of format chars that are compatible to each other
_string_format_compatibilities = [
diff --git a/babel/messages/extract.py b/babel/messages/extract.py
index a426510..0934937 100644
--- a/babel/messages/extract.py
+++ b/babel/messages/extract.py
@@ -18,21 +18,29 @@
from __future__ import annotations
import ast
-from collections.abc import Callable, Collection, Generator, Iterable, Mapping, MutableSequence
import io
import os
import sys
+from collections.abc import (
+ Callable,
+ Collection,
+ Generator,
+ Iterable,
+ Mapping,
+ MutableSequence,
+)
from os.path import relpath
-from tokenize import generate_tokens, COMMENT, NAME, OP, STRING
-from typing import Any, TYPE_CHECKING
+from textwrap import dedent
+from tokenize import COMMENT, NAME, OP, STRING, generate_tokens
+from typing import TYPE_CHECKING, Any
from babel.util import parse_encoding, parse_future_flags, pathmatch
-from textwrap import dedent
if TYPE_CHECKING:
from typing import IO, Protocol
- from typing_extensions import Final, TypeAlias, TypedDict
+
from _typeshed import SupportsItems, SupportsRead, SupportsReadline
+ from typing_extensions import Final, TypeAlias, TypedDict
class _PyOptions(TypedDict, total=False):
encoding: str
diff --git a/babel/messages/frontend.py b/babel/messages/frontend.py
index a9a3e4d..98a1ca8 100644
--- a/babel/messages/frontend.py
+++ b/babel/messages/frontend.py
@@ -8,6 +8,7 @@
:license: BSD, see LICENSE for more details.
"""
+import datetime
import fnmatch
import logging
import optparse
@@ -18,15 +19,19 @@ import sys
import tempfile
from collections import OrderedDict
from configparser import RawConfigParser
-import datetime
from io import StringIO
from typing import Iterable
-from babel import __version__ as VERSION
from babel import Locale, localedata
+from babel import __version__ as VERSION
from babel.core import UnknownLocaleError
-from babel.messages.catalog import Catalog, DEFAULT_HEADER
-from babel.messages.extract import DEFAULT_KEYWORDS, DEFAULT_MAPPING, check_and_call_extract_file, extract_from_dir
+from babel.messages.catalog import DEFAULT_HEADER, Catalog
+from babel.messages.extract import (
+ DEFAULT_KEYWORDS,
+ DEFAULT_MAPPING,
+ check_and_call_extract_file,
+ extract_from_dir,
+)
from babel.messages.mofile import write_mo
from babel.messages.pofile import read_po, write_po
from babel.util import LOCALTZ
@@ -39,14 +44,16 @@ try:
distutils_log = log # "distutils.log → (no replacement yet)"
try:
- from setuptools.errors import OptionError, SetupError, BaseError
+ from setuptools.errors import BaseError, OptionError, SetupError
except ImportError: # Error aliases only added in setuptools 59 (2021-11).
OptionError = SetupError = BaseError = Exception
except ImportError:
from distutils import log as distutils_log
from distutils.cmd import Command as _Command
- from distutils.errors import DistutilsOptionError as OptionError, DistutilsSetupError as SetupError, DistutilsError as BaseError
+ from distutils.errors import DistutilsError as BaseError
+ from distutils.errors import DistutilsOptionError as OptionError
+ from distutils.errors import DistutilsSetupError as SetupError
diff --git a/babel/messages/jslexer.py b/babel/messages/jslexer.py
index 11ddf96..e6d20ae 100644
--- a/babel/messages/jslexer.py
+++ b/babel/messages/jslexer.py
@@ -11,8 +11,8 @@
"""
from __future__ import annotations
-from collections.abc import Generator
import re
+from collections.abc import Generator
from typing import NamedTuple
operators: list[str] = sorted([
diff --git a/babel/messages/plurals.py b/babel/messages/plurals.py
index 0fdf53b..eb8de47 100644
--- a/babel/messages/plurals.py
+++ b/babel/messages/plurals.py
@@ -9,9 +9,9 @@
"""
from __future__ import annotations
-from babel.core import default_locale, Locale
from operator import itemgetter
+from babel.core import Locale, default_locale
# XXX: remove this file, duplication with babel.plural
diff --git a/babel/messages/pofile.py b/babel/messages/pofile.py
index b6d0d6e..76d3123 100644
--- a/babel/messages/pofile.py
+++ b/babel/messages/pofile.py
@@ -14,14 +14,15 @@ import os
import re
from collections.abc import Iterable
from typing import TYPE_CHECKING
-from babel.core import Locale
+from babel.core import Locale
from babel.messages.catalog import Catalog, Message
-from babel.util import wraptext, _cmp
+from babel.util import _cmp, wraptext
if TYPE_CHECKING:
- from _typeshed import SupportsWrite
from typing import IO, AnyStr
+
+ from _typeshed import SupportsWrite
from typing_extensions import Literal
diff --git a/babel/numbers.py b/babel/numbers.py
index f229072..6ecd7dc 100644
--- a/babel/numbers.py
+++ b/babel/numbers.py
@@ -19,11 +19,11 @@
# - https://www.unicode.org/reports/tr35/ (Appendix G.6)
from __future__ import annotations
+import datetime
import decimal
import re
-from typing import TYPE_CHECKING, Any, overload
import warnings
-import datetime
+from typing import TYPE_CHECKING, Any, overload
from babel.core import Locale, default_locale, get_global
from babel.localedata import LocaleDataDict
diff --git a/babel/support.py b/babel/support.py
index 216c8f1..7092599 100644
--- a/babel/support.py
+++ b/babel/support.py
@@ -20,12 +20,15 @@ from collections.abc import Iterator
from typing import TYPE_CHECKING, Any, Callable
from babel.core import Locale
-
-from babel.dates import (format_date, format_datetime, format_time,
- format_timedelta)
-from babel.numbers import (format_compact_currency, format_compact_decimal,
- format_currency, format_decimal, format_percent,
- format_scientific)
+from babel.dates import format_date, format_datetime, format_time, format_timedelta
+from babel.numbers import (
+ format_compact_currency,
+ format_compact_decimal,
+ format_currency,
+ format_decimal,
+ format_percent,
+ format_scientific,
+)
if TYPE_CHECKING:
from typing_extensions import Literal
diff --git a/babel/util.py b/babel/util.py
index d25ec53..cf86f20 100644
--- a/babel/util.py
+++ b/babel/util.py
@@ -11,15 +11,15 @@ from __future__ import annotations
import codecs
import collections
+import datetime
import os
import re
import textwrap
-from babel import localtime, dates
-
from collections.abc import Generator, Iterable
-import datetime
from typing import IO, Any, TypeVar
+from babel import dates, localtime
+
missing = object()
_T = TypeVar("_T")