From: Hugo Date: Wed, 27 Dec 2017 22:25:54 +0000 (+0200) Subject: Replace function call with set literal X-Git-Tag: v2.6.0~13^2~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44f509c6ab67a1a7154d0ffbb8e626e80c3d32be;p=thirdparty%2Fbabel.git Replace function call with set literal --- diff --git a/babel/languages.py b/babel/languages.py index 40f5d982..0513d002 100644 --- a/babel/languages.py +++ b/babel/languages.py @@ -26,7 +26,7 @@ def get_official_languages(territory, regional=False, de_facto=False): """ territory = str(territory).upper() - allowed_stati = set(("official",)) + allowed_stati = {"official"} if regional: allowed_stati.add("official_regional") if de_facto: diff --git a/babel/messages/catalog.py b/babel/messages/catalog.py index fd40058a..93d0440a 100644 --- a/babel/messages/catalog.py +++ b/babel/messages/catalog.py @@ -531,7 +531,7 @@ class Catalog(object): buf.append('%s: %s' % (name, value)) flags = set() if self.fuzzy: - flags |= set(['fuzzy']) + flags |= {'fuzzy'} yield Message(u'', '\n'.join(buf), flags=flags) for key in self._messages: yield self._messages[key] @@ -762,7 +762,7 @@ class Catalog(object): message.string = message.string[0] message.flags |= oldmsg.flags if fuzzy: - message.flags |= set([u'fuzzy']) + message.flags |= {u'fuzzy'} self[message.id] = message for message in template: diff --git a/babel/messages/checkers.py b/babel/messages/checkers.py index 24ecdcfe..97e6e197 100644 --- a/babel/messages/checkers.py +++ b/babel/messages/checkers.py @@ -17,9 +17,9 @@ from babel._compat import string_types, izip #: list of format chars that are compatible to each other _string_format_compatibilities = [ - set(['i', 'd', 'u']), - set(['x', 'X']), - set(['f', 'F', 'g', 'G']) + {'i', 'd', 'u'}, + {'x', 'X'}, + {'f', 'F', 'g', 'G'} ] diff --git a/babel/plural.py b/babel/plural.py index a23f8b53..06f349ea 100644 --- a/babel/plural.py +++ b/babel/plural.py @@ -241,7 +241,7 @@ def to_gettext(rule): """ rule = PluralRule.parse(rule) - used_tags = rule.tags | set([_fallback_tag]) + used_tags = rule.tags | {_fallback_tag} _compile = _GettextCompiler().compile _get_index = [tag for tag in _plural_tags if tag in used_tags].index diff --git a/tests/messages/test_frontend.py b/tests/messages/test_frontend.py index 20904a35..3ac0ac31 100644 --- a/tests/messages/test_frontend.py +++ b/tests/messages/test_frontend.py @@ -1343,26 +1343,14 @@ def test_extract_keyword_args_384(split, arg_name): "extract -F babel-django.cfg --add-comments Translators: -o django232.pot %s ." % kwarg_text ) assert isinstance(cmdinst, extract_messages) - assert set(cmdinst.keywords.keys()) == set(( - '_', - 'dgettext', - 'dngettext', - 'gettext', - 'gettext_lazy', - 'gettext_noop', - 'N_', - 'ngettext', - 'ngettext_lazy', - 'npgettext', - 'npgettext_lazy', - 'pgettext', - 'pgettext_lazy', - 'ugettext', - 'ugettext_lazy', - 'ugettext_noop', - 'ungettext', - 'ungettext_lazy', - )) + assert set(cmdinst.keywords.keys()) == {'_', 'dgettext', 'dngettext', + 'gettext', 'gettext_lazy', + 'gettext_noop', 'N_', 'ngettext', + 'ngettext_lazy', 'npgettext', + 'npgettext_lazy', 'pgettext', + 'pgettext_lazy', 'ugettext', + 'ugettext_lazy', 'ugettext_noop', + 'ungettext', 'ungettext_lazy'} @pytest.mark.parametrize("kwarg,expected", [ @@ -1384,7 +1372,7 @@ def test_extract_distutils_keyword_arg_388(kwarg, expected): assert set(cmdinst.keywords.keys()) == set(expected) # Test the comma-separated comment argument while we're at it: - assert set(cmdinst.add_comments) == set(("Bar", "Foo")) + assert set(cmdinst.add_comments) == {"Bar", "Foo"} def test_update_catalog_boolean_args(): diff --git a/tests/test_languages.py b/tests/test_languages.py index 594149fa..23af26d5 100644 --- a/tests/test_languages.py +++ b/tests/test_languages.py @@ -11,4 +11,6 @@ def test_official_languages(): def test_get_language_info(): - assert set(get_territory_language_info("HU").keys()) == set(("hu", "en", "de", "ro", "hr", "sk", "sl")) + assert set(get_territory_language_info("HU").keys()) == {"hu", "en", "de", + "ro", "hr", "sk", + "sl"} diff --git a/tests/test_numbers.py b/tests/test_numbers.py index 48a260b4..6cc6e438 100644 --- a/tests/test_numbers.py +++ b/tests/test_numbers.py @@ -177,7 +177,7 @@ def test_list_currencies(): list_currencies('yo!') assert excinfo.value.args[0] == "expected only letters, got 'yo!'" - assert list_currencies(locale='pa_Arab') == set(['PKR', 'INR', 'EUR']) + assert list_currencies(locale='pa_Arab') == {'PKR', 'INR', 'EUR'} assert list_currencies(locale='kok') == set([]) assert len(list_currencies()) == 296 diff --git a/tests/test_support.py b/tests/test_support.py index f2a99b7b..6f9fb324 100644 --- a/tests/test_support.py +++ b/tests/test_support.py @@ -358,4 +358,4 @@ def test_catalog_merge_files(): t2._catalog["bar"] = "quux" t1.merge(t2) assert t1.files == ["pro.mo"] - assert set(t1._catalog.keys()) == set(('', 'foo', 'bar')) + assert set(t1._catalog.keys()) == {'', 'foo', 'bar'}