jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/688421 )
Change subject: [IMPR] Solve duplicate string formatting arguments ......................................................................
[IMPR] Solve duplicate string formatting arguments
Change-Id: Id6ee6bd4ad2c1f25b4141c14ff04edfca3d51f1a --- M pywikibot/userinterfaces/transliteration.py M scripts/category.py M tests/sparql_tests.py 3 files changed, 7 insertions(+), 10 deletions(-)
Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified
diff --git a/pywikibot/userinterfaces/transliteration.py b/pywikibot/userinterfaces/transliteration.py index 158f6ae..4bc176a 100644 --- a/pywikibot/userinterfaces/transliteration.py +++ b/pywikibot/userinterfaces/transliteration.py @@ -1104,7 +1104,7 @@ while (value.encode(encoding, 'replace').decode(encoding) == '?' and value in trans): assert value != trans[value], \ - '{!r} == trans[{!r}]!'.format(value, value) + '{0!r} == trans[{0!r}]!'.format(value) value = trans[value] trans[char] = value self.trans = trans diff --git a/scripts/category.py b/scripts/category.py index 31dfabd..53b2865 100755 --- a/scripts/category.py +++ b/scripts/category.py @@ -1049,10 +1049,7 @@ new_column = 0
# determine number format - if count > 9: - index = '%2d' - else: - index = '%d' + index = '%2d' if count > 9 else '%d'
lines = [] for i, cat in enumerate(cat_list): @@ -1062,9 +1059,9 @@ # columnify i2 = i + new_column if i2 < count: - lines.append('[{}{}] {:35}[{}{}] {}'.format( - prefix, index % i, cat, - prefix, index % i2, cat_list[i2])) + lines.append('[{0}{1}] {2:35}[{0}{3}] {4}' + .format(prefix, index % i, cat, + index % i2, cat_list[i2])) else: lines.append('[{}{}] {}'.format( prefix, index % i, cat)) diff --git a/tests/sparql_tests.py b/tests/sparql_tests.py index 1cc9914..57e89d5 100644 --- a/tests/sparql_tests.py +++ b/tests/sparql_tests.py @@ -146,8 +146,8 @@ def testGetItems(self, mock_method): """Test item list retrieval via SPARQL.""" mock_method.return_value = Container( - SQL_RESPONSE_CONTAINER % '{}, {}, {}'.format( - ITEM_Q498787, ITEM_Q677525, ITEM_Q677525)) + SQL_RESPONSE_CONTAINER % '{0}, {1}, {1}'.format(ITEM_Q498787, + ITEM_Q677525)) q = sparql.SparqlQuery() res = q.get_items('SELECT * WHERE { ?x ?y ?z }', 'cat') self.assertSetEqual(res, {'Q498787', 'Q677525'})
pywikibot-commits@lists.wikimedia.org