Update ruff, apply autofix

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index d1935c00604859958fd0a25ab6f4be2aeafa7c6c..1b5cf5a0a6cb9ac6ba1caa0aed2a6d705bf8172a 100644 (file)
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
-  - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.0.247
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.0.275
     hooks:
       - id: ruff
         args:

diff --git a/babel/messages/checkers.py b/babel/messages/checkers.py
index 056f3e9829ab925df3cd90db3f32ab1ff31deca5..f4070e56d2f3a0d987cf57c1aafa065d728d881e 100644 (file)
--- a/babel/messages/checkers.py
+++ b/babel/messages/checkers.py
@@ -148,10 +148,10 @@ def _validate_format(format: str, alternative: str) -> None:
             if name not in type_map:
                 raise TranslationError(f'unknown named placeholder {name!r}')
             elif not _compatible(typechar, type_map[name]):
-                raise TranslationError('incompatible format for '
-                                       'placeholder %r: '
-                                       '%r and %r are not compatible' %
-                                       (name, typechar, type_map[name]))
+                raise TranslationError(
+                    f'incompatible format for placeholder {name!r}: '
+                    f'{typechar!r} and {type_map[name]!r} are not compatible'
+                )
 
 
 def _find_checkers() -> list[Callable[[Catalog | None, Message], object]]:

diff --git a/babel/messages/plurals.py b/babel/messages/plurals.py
index 86ec8008b18097b0b4ebb9a2f79c9445b741614b..5341b8356b9202641535d4fe87cabaa33d3aba1a 100644 (file)
--- a/babel/messages/plurals.py
+++ b/babel/messages/plurals.py
@@ -213,7 +213,7 @@ class _PluralTuple(tuple):
     The number of plurals used by the locale.""")
     plural_expr = property(itemgetter(1), doc="""
     The plural expression used by the locale.""")
-    plural_forms = property(lambda x: 'nplurals=%s; plural=%s;' % x, doc="""
+    plural_forms = property(lambda x: 'nplurals={}; plural={};'.format(*x), doc="""
     The plural expression used by the catalog or locale.""")
 
     def __str__(self) -> str:

diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index 5a4a3a817926b14b17226c8c9fc9a1d1d459c912..4937874072dd9ccb0642fad1319b51e2120f4c08 100755 (executable)
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -525,25 +525,25 @@ def parse_dates(data, tree, sup, regions, territory):
         if _should_skip_elem(elem):
             continue
         territories = elem.attrib['territories'].split()
-        if territory in territories or any([r in territories for r in regions]):
+        if territory in territories or any(r in territories for r in regions):
             week_data['min_days'] = int(elem.attrib['count'])
     for elem in supelem.findall('firstDay'):
         if _should_skip_elem(elem):
             continue
         territories = elem.attrib['territories'].split()
-        if territory in territories or any([r in territories for r in regions]):
+        if territory in territories or any(r in territories for r in regions):
             week_data['first_day'] = weekdays[elem.attrib['day']]
     for elem in supelem.findall('weekendStart'):
         if _should_skip_elem(elem):
             continue
         territories = elem.attrib['territories'].split()
-        if territory in territories or any([r in territories for r in regions]):
+        if territory in territories or any(r in territories for r in regions):
             week_data['weekend_start'] = weekdays[elem.attrib['day']]
     for elem in supelem.findall('weekendEnd'):
         if _should_skip_elem(elem):
             continue
         territories = elem.attrib['territories'].split()
-        if territory in territories or any([r in territories for r in regions]):
+        if territory in territories or any(r in territories for r in regions):
             week_data['weekend_end'] = weekdays[elem.attrib['day']]
     zone_formats = data.setdefault('zone_formats', {})
     for elem in tree.findall('.//timeZoneNames/gmtFormat'):