diff options
author | Hugo <hugovk@users.noreply.github.com> | 2017-12-28 11:06:59 +0200 |
---|---|---|
committer | Hugo <hugovk@users.noreply.github.com> | 2017-12-28 11:06:59 +0200 |
commit | 2e6f6b9bd48f93a86dec5b317d4c2eb89a3a6301 (patch) | |
tree | be1ff734d91202842ded8a22ae507ee0cd63580e | |
parent | 44f509c6ab67a1a7154d0ffbb8e626e80c3d32be (diff) | |
download | babel-2e6f6b9bd48f93a86dec5b317d4c2eb89a3a6301.tar.gz |
Remove redundant parentheses
-rw-r--r-- | babel/dates.py | 4 | ||||
-rw-r--r-- | babel/messages/catalog.py | 4 | ||||
-rw-r--r-- | babel/messages/frontend.py | 2 | ||||
-rw-r--r-- | tests/messages/test_catalog.py | 2 | ||||
-rw-r--r-- | tests/messages/test_extract.py | 4 | ||||
-rw-r--r-- | tests/messages/test_frontend.py | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/babel/dates.py b/babel/dates.py index d1fafe2..377dfeb 100644 --- a/babel/dates.py +++ b/babel/dates.py @@ -521,7 +521,7 @@ def get_timezone_location(dt_or_tzinfo=None, locale=LC_TIME, return_city=False): territory = 'ZZ' # invalid/unknown territory_name = locale.territories[territory] if not return_city and territory and len(get_global('territory_zones').get(territory, [])) == 1: - return region_format % (territory_name) + return region_format % territory_name # Otherwise, include the city in the output fallback_format = locale.zone_formats['fallback'] @@ -1303,7 +1303,7 @@ class DateTimeFormat(object): elif char == 'H': return self.value.hour elif char == 'h': - return (self.value.hour % 12 or 12) + return self.value.hour % 12 or 12 elif char == 'm': return self.value.minute elif char == 'a': diff --git a/babel/messages/catalog.py b/babel/messages/catalog.py index 93d0440..b293e3c 100644 --- a/babel/messages/catalog.py +++ b/babel/messages/catalog.py @@ -120,8 +120,8 @@ class Message(object): """Compare Messages, taking into account plural ids""" def values_to_compare(obj): if isinstance(obj, Message) and obj.pluralizable: - return (obj.id[0], obj.context or '') - return (obj.id, obj.context or '') + return obj.id[0], obj.context or '' + return obj.id, obj.context or '' return cmp(values_to_compare(self), values_to_compare(other)) def __gt__(self, other): diff --git a/babel/messages/frontend.py b/babel/messages/frontend.py index fb171e3..bee745a 100644 --- a/babel/messages/frontend.py +++ b/babel/messages/frontend.py @@ -978,7 +978,7 @@ def parse_mapping(fileobj, filename=None): method = extractors[method] method_map[idx] = (pattern, method) - return (method_map, options_map) + return method_map, options_map def parse_keywords(strings=[]): diff --git a/tests/messages/test_catalog.py b/tests/messages/test_catalog.py index 2d2880c..07ed724 100644 --- a/tests/messages/test_catalog.py +++ b/tests/messages/test_catalog.py @@ -101,7 +101,7 @@ class CatalogTestCase(unittest.TestCase): def test_update_message_changed_to_simple(self): cat = catalog.Catalog() - cat.add((u'foo' u'foos'), (u'Voh', u'Vöhs')) + cat.add(u'foo' u'foos', (u'Voh', u'Vöhs')) tmpl = catalog.Catalog() tmpl.add(u'foo') cat.update(tmpl) diff --git a/tests/messages/test_extract.py b/tests/messages/test_extract.py index 873439d..17b090f 100644 --- a/tests/messages/test_extract.py +++ b/tests/messages/test_extract.py @@ -178,7 +178,7 @@ msg2 = ngettext(\"\"\"elvis\"\"\", 'elvises', count) messages = list(extract.extract_python(buf, extract.DEFAULT_KEYWORDS.keys(), [], {})) - self.assertEqual([(1, '_', (u'pylons'), []), + self.assertEqual([(1, '_', u'pylons', []), (2, 'ngettext', (u'elvis', u'elvises', None), []), (3, 'ngettext', (u'elvis', u'elvises', None), [])], messages) @@ -350,7 +350,7 @@ n = ngettext('foo') self.assertEqual((None, u'hello', u'there'), messages[2][2]) self.assertEqual((None, None), messages[3][2]) self.assertEqual(None, messages[4][2]) - self.assertEqual(('foo'), messages[5][2]) + self.assertEqual('foo', messages[5][2]) def test_utf8_message(self): buf = BytesIO(u""" diff --git a/tests/messages/test_frontend.py b/tests/messages/test_frontend.py index 3ac0ac3..10325fe 100644 --- a/tests/messages/test_frontend.py +++ b/tests/messages/test_frontend.py @@ -1140,7 +1140,7 @@ msgstr[2] "" assert not os.path.isfile(mo_file), 'Expected no file at %r' % mo_file self.assertEqual("""\ catalog %s is marked as fuzzy, skipping -""" % (po_file), sys.stderr.getvalue()) +""" % po_file, sys.stderr.getvalue()) def test_compile_fuzzy_catalog(self): po_file = self._po_file('de_DE') |