diff options
author | Aarni Koskela <akx@iki.fi> | 2023-01-18 20:30:25 +0200 |
---|---|---|
committer | Aarni Koskela <akx@iki.fi> | 2023-01-18 21:20:51 +0200 |
commit | d14f9565c03ba10d493437784db439ca260ba69d (patch) | |
tree | c75005ebf3ac8b79a6058da9823331f7d3d3765e | |
parent | 82d345a66e850f643607ac9fcafd9b9a2a89d1e1 (diff) | |
download | babel-d14f9565c03ba10d493437784db439ca260ba69d.tar.gz |
Enable E741 (ambiguous variable name) lint
-rw-r--r-- | babel/messages/pofile.py | 6 | ||||
-rw-r--r-- | babel/plural.py | 2 | ||||
-rw-r--r-- | tests/test_core.py | 52 | ||||
-rw-r--r-- | tests/test_dates.py | 18 | ||||
-rw-r--r-- | tests/test_localedata.py | 8 |
5 files changed, 43 insertions, 43 deletions
diff --git a/babel/messages/pofile.py b/babel/messages/pofile.py index 88cc043..aef8cbf 100644 --- a/babel/messages/pofile.py +++ b/babel/messages/pofile.py @@ -451,10 +451,10 @@ def normalize(string: str, prefix: str = '', width: int = 76) -> str: buf = [] size = 2 while chunks: - l = len(escape(chunks[-1])) - 2 + prefixlen - if size + l < width: + length = len(escape(chunks[-1])) - 2 + prefixlen + if size + length < width: buf.append(chunks.pop()) - size += l + size += length else: if not buf: # handle long chunks by putting them on a diff --git a/babel/plural.py b/babel/plural.py index fe1ee25..26073ff 100644 --- a/babel/plural.py +++ b/babel/plural.py @@ -521,7 +521,7 @@ class _Parser: def _binary_compiler(tmpl): """Compiler factory for the `_Compiler`.""" - return lambda self, l, r: tmpl % (self.compile(l), self.compile(r)) + return lambda self, left, right: tmpl % (self.compile(left), self.compile(right)) def _unary_compiler(tmpl): diff --git a/tests/test_core.py b/tests/test_core.py index c0e0b3d..d315018 100644 --- a/tests/test_core.py +++ b/tests/test_core.py @@ -96,36 +96,36 @@ class TestLocaleClass: assert (de_DE.language, de_DE.territory) == ('de', 'DE') def test_parse(self): - l = Locale.parse('de-DE', sep='-') - assert l.display_name == 'Deutsch (Deutschland)' + locale = Locale.parse('de-DE', sep='-') + assert locale.display_name == 'Deutsch (Deutschland)' - de_DE = Locale.parse(l) + de_DE = Locale.parse(locale) assert (de_DE.language, de_DE.territory) == ('de', 'DE') def test_parse_likely_subtags(self): - l = Locale.parse('zh-TW', sep='-') - assert l.language == 'zh' - assert l.territory == 'TW' - assert l.script == 'Hant' - - l = Locale.parse('zh_CN') - assert l.language == 'zh' - assert l.territory == 'CN' - assert l.script == 'Hans' - - l = Locale.parse('zh_SG') - assert l.language == 'zh' - assert l.territory == 'SG' - assert l.script == 'Hans' - - l = Locale.parse('und_AT') - assert l.language == 'de' - assert l.territory == 'AT' - - l = Locale.parse('und_UK') - assert l.language == 'en' - assert l.territory == 'GB' - assert l.script is None + locale = Locale.parse('zh-TW', sep='-') + assert locale.language == 'zh' + assert locale.territory == 'TW' + assert locale.script == 'Hant' + + locale = Locale.parse('zh_CN') + assert locale.language == 'zh' + assert locale.territory == 'CN' + assert locale.script == 'Hans' + + locale = Locale.parse('zh_SG') + assert locale.language == 'zh' + assert locale.territory == 'SG' + assert locale.script == 'Hans' + + locale = Locale.parse('und_AT') + assert locale.language == 'de' + assert locale.territory == 'AT' + + locale = Locale.parse('und_UK') + assert locale.language == 'en' + assert locale.territory == 'GB' + assert locale.script is None def test_get_display_name(self): zh_CN = Locale('zh', 'CN', script='Hans') diff --git a/tests/test_dates.py b/tests/test_dates.py index 2e3c880..0c8bd17 100644 --- a/tests/test_dates.py +++ b/tests/test_dates.py @@ -216,17 +216,17 @@ class DateTimeFormatTestCase: assert dates.DateTimeFormat(t, locale='fr_FR')['vvvv'] == 'heure d’Europe centrale' def test_hour_formatting(self): - l = 'en_US' + locale = 'en_US' t = time(0, 0, 0) - assert dates.format_time(t, 'h a', locale=l) == '12 AM' - assert dates.format_time(t, 'H', locale=l) == '0' - assert dates.format_time(t, 'k', locale=l) == '24' - assert dates.format_time(t, 'K a', locale=l) == '0 AM' + assert dates.format_time(t, 'h a', locale=locale) == '12 AM' + assert dates.format_time(t, 'H', locale=locale) == '0' + assert dates.format_time(t, 'k', locale=locale) == '24' + assert dates.format_time(t, 'K a', locale=locale) == '0 AM' t = time(12, 0, 0) - assert dates.format_time(t, 'h a', locale=l) == '12 PM' - assert dates.format_time(t, 'H', locale=l) == '12' - assert dates.format_time(t, 'k', locale=l) == '12' - assert dates.format_time(t, 'K a', locale=l) == '0 PM' + assert dates.format_time(t, 'h a', locale=locale) == '12 PM' + assert dates.format_time(t, 'H', locale=locale) == '12' + assert dates.format_time(t, 'k', locale=locale) == '12' + assert dates.format_time(t, 'K a', locale=locale) == '0 PM' class FormatDateTestCase: diff --git a/tests/test_localedata.py b/tests/test_localedata.py index 36f3e73..913922e 100644 --- a/tests/test_localedata.py +++ b/tests/test_localedata.py @@ -70,8 +70,8 @@ def test_merge(): def test_locale_identification(): - for l in localedata.locale_identifiers(): - assert localedata.exists(l) + for locale in localedata.locale_identifiers(): + assert localedata.exists(locale) def test_unique_ids(): @@ -84,9 +84,9 @@ def test_unique_ids(): def test_mixedcased_locale(): - for l in localedata.locale_identifiers(): + for locale in localedata.locale_identifiers(): locale_id = ''.join([ - methodcaller(random.choice(['lower', 'upper']))(c) for c in l]) + methodcaller(random.choice(['lower', 'upper']))(c) for c in locale]) assert localedata.exists(locale_id) |