Apply some small miscellaneous formatting fixes

Author: akx

babel/core.py

@@ -46,6 +46,7 @@
 _global_data = None
 _default_plural_rule = PluralRule({})
 
+
 def _raise_no_data_error():
     raise RuntimeError('The babel data files are not available. '
                        'This usually happens because you are using '

babel/dates.py

@@ -1349,8 +1349,7 @@ def parse_date(
         month_idx = format_str.index('l')
     day_idx = format_str.index('d')
 
-    indexes = [(year_idx, 'Y'), (month_idx, 'M'), (day_idx, 'D')]
-    indexes.sort()
+    indexes = sorted([(year_idx, 'Y'), (month_idx, 'M'), (day_idx, 'D')])
     indexes = {item[1]: idx for idx, item in enumerate(indexes)}
 
     # FIXME: this currently only supports numbers, but should also support month
@@ -1399,8 +1398,7 @@ def parse_time(
     min_idx = format_str.index('m')
     sec_idx = format_str.index('s')
 
-    indexes = [(hour_idx, 'H'), (min_idx, 'M'), (sec_idx, 'S')]
-    indexes.sort()
+    indexes = sorted([(hour_idx, 'H'), (min_idx, 'M'), (sec_idx, 'S')])
     indexes = {item[1]: idx for idx, item in enumerate(indexes)}
 
     # TODO: support time zones
@@ -1436,7 +1434,7 @@ def __str__(self) -> str:
         return pat
 
     def __mod__(self, other: DateTimeFormat) -> str:
-        if type(other) is not DateTimeFormat:
+        if not isinstance(other, DateTimeFormat):
             return NotImplemented
         return self.format % other
 
@@ -1829,7 +1827,7 @@ def parse_pattern(pattern: str) -> DateTimePattern:
 
     :param pattern: the formatting pattern to parse
     """
-    if type(pattern) is DateTimePattern:
+    if isinstance(pattern, DateTimePattern):
         return pattern
 
     if pattern in _pattern_cache:

babel/localtime/_helpers.py

@@ -24,6 +24,7 @@ def _get_tzinfo(tzenv: str):
 
     return None
 
+
 def _get_tzinfo_or_raise(tzenv: str):
     tzinfo = _get_tzinfo(tzenv)
     if tzinfo is None:

babel/messages/catalog.py

@@ -240,6 +240,7 @@ class TranslationError(Exception):
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #"""
 
+
 def parse_separated_header(value: str) -> dict[str, str]:
     # Adapted from https://peps.python.org/pep-0594/#cgi
     from email.message import Message
@@ -736,7 +737,8 @@ def delete(self, id: _MessageID, context: str | None = None) -> None:
         if key in self._messages:
             del self._messages[key]
 
-    def update(self,
+    def update(
+        self,
         template: Catalog,
         no_fuzzy_matching: bool = False,
         update_header_comment: bool = False,

babel/messages/extract.py

@@ -90,7 +90,6 @@ def tell(self) -> int: ...
 DEFAULT_MAPPING: list[tuple[str, str]] = [('**.py', 'python')]
 
 
-
 def _strip_comment_tags(comments: MutableSequence[str], tags: Iterable[str]):
     """Helper function for `extract` that strips comment tags from strings
     in a list of comment lines.  This functions operates in-place.
@@ -660,8 +659,7 @@ def extract_javascript(
             token = Token('operator', ')', token.lineno)
 
         if options.get('parse_template_string') and not funcname and token.type == 'template_string':
-            for item in parse_template_string(token.value, keywords, comment_tags, options, token.lineno):
-                yield item
+            yield from parse_template_string(token.value, keywords, comment_tags, options, token.lineno)
 
         elif token.type == 'operator' and token.value == '(':
             if funcname:
@@ -794,8 +792,7 @@ def parse_template_string(
                 if level == 0 and expression_contents:
                     expression_contents = expression_contents[0:-1]
                     fake_file_obj = io.BytesIO(expression_contents.encode())
-                    for item in extract_javascript(fake_file_obj, keywords, comment_tags, options, lineno):
-                        yield item
+                    yield from extract_javascript(fake_file_obj, keywords, comment_tags, options, lineno)
                     lineno += len(line_re.findall(expression_contents))
                     expression_contents = ''
         prev_character = character

babel/messages/frontend.py

@@ -56,7 +56,6 @@
     from distutils.errors import DistutilsSetupError as SetupError
 
 
-
 def listify_value(arg, split=None):
     """
     Make a list out of an argument.
@@ -853,7 +852,7 @@ def run(self):
                              omit_header=self.omit_header,
                              ignore_obsolete=self.ignore_obsolete,
                              include_previous=self.previous, width=self.width)
-            except:
+            except Exception:
                 os.remove(tmpname)
                 raise
 

babel/messages/jslexer.py

@@ -32,11 +32,13 @@
 uni_escape_re = re.compile(r'[a-fA-F0-9]{1,4}')
 hex_escape_re = re.compile(r'[a-fA-F0-9]{1,2}')
 
+
 class Token(NamedTuple):
     type: str
     value: str
     lineno: int
 
+
 _rules: list[tuple[str | None, re.Pattern[str]]] = [
     (None, re.compile(r'\s+', re.UNICODE)),
     (None, re.compile(r'<!--.*')),
@@ -100,7 +102,7 @@ def unquote_string(string: str) -> str:
     add = result.append
     pos = 0
 
-    while 1:
+    while True:
         # scan for the next escape
         escape_pos = string.find('\\', pos)
         if escape_pos < 0:

babel/messages/pofile.py

@@ -134,7 +134,6 @@ def __ne__(self, other: object) -> bool:
         return self.__cmp__(other) != 0
 
 
-
 class PoFileParser:
     """Support class to  read messages from a ``gettext`` PO (portable object) file
     and add them to a `Catalog`
@@ -615,11 +614,13 @@ def _write_message(message, prefix=''):
                     locs.append(location)
             _write_comment(' '.join(locs), prefix=':')
         if message.flags:
-            _write('#%s\n' % ', '.join([''] + sorted(message.flags)))
+            _write(f"#{', '.join(['', *sorted(message.flags)])}\n")
 
         if message.previous_id and include_previous:
-            _write_comment('msgid %s' % _normalize(message.previous_id[0]),
-                           prefix='|')
+            _write_comment(
+                f'msgid {_normalize(message.previous_id[0])}',
+                prefix='|',
+            )
             if len(message.previous_id) > 1:
                 _write_comment('msgid_plural %s' % _normalize(
                     message.previous_id[1]

babel/plural.py

@@ -325,6 +325,7 @@ def cldr_modulo(a: float, b: float) -> float:
 class RuleError(Exception):
     """Raised if a rule is malformed."""
 
+
 _VARS = {
     'n',  # absolute value of the source number.
     'i',  # integer digits of n.
@@ -363,6 +364,7 @@ def tokenize_rule(s: str) -> list[tuple[str, str]]:
                             'Got unexpected %r' % s[pos])
     return result[::-1]
 
+
 def test_next_token(
     tokens: list[tuple[str, str]],
     type_: str,

babel/support.py

@@ -35,6 +35,7 @@
 
     from babel.dates import _PredefinedTimeFormat
 
+
 class Format:
     """Wrapper class providing the various date and number formatting functions
     bound to a specific locale and time-zone.