Pywikibot-commits November 2015

pywikibot-commits@lists.wikimedia.org

2 participants
37 discussions

[Gerrit] use a different year for the first and second timestamp - change (pywikibot/core)
by jenkins-bot (Code Review) 18 Nov '15

18 Nov '15

jenkins-bot has submitted this change and it was merged. Change subject: use a different year for the first and second timestamp ...................................................................... use a different year for the first and second timestamp - validate whether we got the right value back - use the same date for the first timestamp in sites['viwiki']['match'] - keep the comparison unchanged because the second timestamp will be fetched only Change-Id: I4ffe12428de7c49ea52d0f6ce82b77d051d51ac5 --- M tests/timestripper_tests.py 1 file changed, 14 insertions(+), 14 deletions(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/timestripper_tests.py b/tests/timestripper_tests.py index f3e50c0..61a20ab 100644 --- a/tests/timestripper_tests.py +++ b/tests/timestripper_tests.py @@ -136,51 +136,51 @@ 'cswiki': { 'family': 'wikipedia', 'code': 'cs', - 'match': u'3. 2. 2010, 19:48 (UTC) 7. 2. 2010 19:48 (UTC)', + 'match': u'3. 2. 2011, 19:48 (UTC) 7. 2. 2010 19:48 (UTC)', }, 'enwiki': { 'family': 'wikipedia', 'code': 'en', - 'match': u'3 February 2010 19:48 (UTC) 7 February 2010 19:48 (UTC)', - 'nomatch': u'3. 2. 2010, 19:48 (UTC) 7. 2. 2010 19:48 (UTC)', + 'match': u'3 February 2011 19:48 (UTC) 7 February 2010 19:48 (UTC)', + 'nomatch': u'3. 2. 2011, 19:48 (UTC) 7. 2. 2010 19:48 (UTC)', }, 'fawiki': { 'family': 'wikipedia', 'code': 'fa', - 'match': u'۳ فوریهٔ ۲۰۱۰، ساعت ۱۹:۴۸ (UTC) ۷ فوریهٔ ۲۰۱۰، ساعت ۱۹:۴۸ (UTC)', + 'match': u'۳ فوریهٔ ۲۰۱۱، ساعت ۱۹:۴۸ (UTC) ۷ فوریهٔ ۲۰۱۰، ساعت ۱۹:۴۸ (UTC)', 'nomatch': u'۳ ۲ ۲۰۱۴ ۱۹:۴۸ (UTC) ۷ ۲ ۲۰۱۰ ۱۹:۴۸ (UTC)', }, 'frwiki': { 'family': 'wikipedia', 'code': 'fr', - 'match': u'3 février 2010 à 19:48 (CET) 7 février 2010 à 19:48 (CET)', - 'nomatch': u'3 March 2010 19:48 (CET) 7 March 2010 19:48 (CET)', + 'match': u'3 février 2011 à 19:48 (CET) 7 février 2010 à 19:48 (CET)', + 'nomatch': u'3 March 2011 19:48 (CET) 7 March 2010 19:48 (CET)', }, 'kowiki': { 'family': 'wikipedia', 'code': 'ko', - 'match': u'2010년 2월 3일 (수) 19:48 (KST) 2010년 2월 7일 (수) 19:48 (KST)', + 'match': u'2011년 2월 3일 (수) 19:48 (KST) 2010년 2월 7일 (수) 19:48 (KST)', }, 'nowiki': { 'family': 'wikipedia', 'code': 'no', - 'match': u'3. feb 2010 kl. 19:48 (CET) 7. feb 2010 kl. 19:48 (UTC)', + 'match': u'3. feb 2011 kl. 19:48 (CET) 7. feb 2010 kl. 19:48 (UTC)', }, 'ptwiki': { 'family': 'wikipedia', 'code': 'pt', - 'match': '19h48min de 3 de fevereiro de 2010‎ (UTC) 19h48min ' + 'match': '19h48min de 3 de fevereiro de 2011‎ (UTC) 19h48min ' 'de 7 de fevereiro de 2010‎ (UTC)', }, 'viwiki': { 'family': 'wikipedia', 'code': 'vi', - 'match': '19:48, ngày 15 tháng 9 năm 2008 (UTC) 19:48, ngày 7 tháng 2 năm 2010 (UTC)', - 'match2': '16:41, ngày 15 tháng 9 năm 2008 (UTC) 16:41, ' + 'match': '19:48, ngày 3 tháng 2 năm 2011 (UTC) 19:48, ngày 7 tháng 2 năm 2010 (UTC)', + 'match2': '16:41, ngày 15 tháng 9 năm 2001 (UTC) 16:41, ' 'ngày 12 tháng 9 năm 2008 (UTC)', - 'match3': '21:18, ngày 13 tháng 8 năm 2014 (UTC) 21:18, ' + 'match3': '21:18, ngày 13 tháng 8 năm 2011 (UTC) 21:18, ' 'ngày 14 tháng 8 năm 2014 (UTC)', - 'nomatch1': '21:18, ngày 13 March 8 năm 2014 (UTC) 21:18, ' + 'nomatch1': '21:18, ngày 13 March 8 năm 2011 (UTC) 21:18, ' 'ngày 14 March 8 năm 2014 (UTC)', }, } @@ -225,7 +225,7 @@ if 'nomatch' in self.sites[key]: txtNoMatch = self.sites[key]['nomatch'] else: - txtNoMatch = u'3 March 2010 19:48 (UTC) 7 March 2010 19:48 (UTC)' + txtNoMatch = u'3 March 2011 19:48 (UTC) 7 March 2010 19:48 (UTC)' self.assertEqual(self.ts.timestripper(txtNoMatch), None) -- To view, visit https://gerrit.wikimedia.org/r/253866 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4ffe12428de7c49ea52d0f6ce82b77d051d51ac5 Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] Fix Hunk.color_line - change (pywikibot/core)
by jenkins-bot (Code Review) 12 Nov '15

12 Nov '15

jenkins-bot has submitted this change and it was merged. Change subject: Fix Hunk.color_line ...................................................................... Fix Hunk.color_line 9146f171 introduced a new approach to specifying color, which was used by Hunk.color_line. However it was not correctly used in all instances of that method. Bug: T118371 Change-Id: I7dc19023ec0ae8795d243cc24561f95a33758cdd --- M pywikibot/diff.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/diff.py b/pywikibot/diff.py index 299c65a..f83033f 100644 --- a/pywikibot/diff.py +++ b/pywikibot/diff.py @@ -161,7 +161,7 @@ if color_closed: if char_ref != ' ': char_tagged = color_format('{color}{0}', - char, self.colors[color]) + char, color=self.colors[color]) color_closed = False else: if char_ref == ' ': -- To view, visit https://gerrit.wikimedia.org/r/252616 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7dc19023ec0ae8795d243cc24561f95a33758cdd Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] replace.py: use keyword args for explicitly in save() - change (pywikibot/core)
by jenkins-bot (Code Review) 12 Nov '15

12 Nov '15

jenkins-bot has submitted this change and it was merged. Change subject: replace.py: use keyword args for explicitly in save() ...................................................................... replace.py: use keyword args for explicitly in save() Use keywords arguments explicitly in save(). It might create conflicts when Page is subclassed and *args, **kwargs are used when overriding save() method. See e.g. ProofreadPage.save() method. Change-Id: I05763aa4f5c0e49b69c2a00ecd6b278aa9c82255 --- M scripts/replace.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/replace.py b/scripts/replace.py index 2ccebd4..8fd216d 100755 --- a/scripts/replace.py +++ b/scripts/replace.py @@ -755,7 +755,7 @@ self.options['always'] = True if choice == 'y': page.text = new_text - page.save(self.generate_summary(applied), async=True, + page.save(summary=self.generate_summary(applied), async=True, callback=self._count_changes, quiet=True) while not self._pending_processed_titles.empty(): proc_title, res = self._pending_processed_titles.get() @@ -766,7 +766,7 @@ if self.getOption('always') and new_text != original_text: try: page.text = new_text - page.save(self.generate_summary(applied), + page.save(summary=self.generate_summary(applied), callback=self._count_changes, quiet=True) except pywikibot.EditConflict: pywikibot.output(u'Skipping %s because of edit conflict' -- To view, visit https://gerrit.wikimedia.org/r/252350 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I05763aa4f5c0e49b69c2a00ecd6b278aa9c82255 Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] paraminfo_tests: update and add version checks - change (pywikibot/core)
by jenkins-bot (Code Review) 11 Nov '15

11 Nov '15

jenkins-bot has submitted this change and it was merged. Change subject: paraminfo_tests: update and add version checks ...................................................................... paraminfo_tests: update and add version checks Add watchlist type 'categorize', added in 1.27.0-wmf.4 (MW d40cd42b) Check version for watchlist type 'external', added in 1.20 (MW df0cf1e3) Check version for content model and format 'json', added in 1.24 (MW d2a82fcb). Change-Id: I1c8d3c1251df582b4abdf043b1acbb4404f034d6 --- M tests/paraminfo_tests.py 1 file changed, 15 insertions(+), 3 deletions(-) Approvals: John Vandenberg: Looks good to me, but someone else must approve Mpaa: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/paraminfo_tests.py b/tests/paraminfo_tests.py index d4fd436..e4b98fb 100644 --- a/tests/paraminfo_tests.py +++ b/tests/paraminfo_tests.py @@ -87,7 +87,15 @@ def test_watchlist_type(self): """Test watchlist type.""" - known = ['edit', 'external', 'new', 'log'] # 'external' is likely new + known = ['edit', 'new', 'log'] + + _version = MediaWikiVersion(self.site.version()) + + if _version >= MediaWikiVersion('1.20'): + known.append('external') + if _version.version >= (1, 27): + if _version >= MediaWikiVersion('1.27.0-wmf.4') or _version.suffix == 'alpha': + known.append('categorize') self._check_param_values(self.site, 'query+watchlist', 'type', known) @@ -110,10 +118,12 @@ base = [ 'text/x-wiki', 'text/javascript', - 'application/json', 'text/css', 'text/plain', ] + if MediaWikiVersion(self.site.version()) >= MediaWikiVersion('1.24'): + base.append('application/json') + self._check_param_values(self.site, 'edit', 'contentformat', base) self._check_param_values(self.site, 'parse', 'contentformat', base) @@ -122,7 +132,6 @@ base = [ 'wikitext', 'javascript', - 'json', 'css', 'text', ] @@ -133,6 +142,9 @@ 'Scribunto', 'JsonSchema', ] + if MediaWikiVersion(self.site.version()) >= MediaWikiVersion('1.24'): + base.append('json') + self._check_param_subset(self.site, 'edit', 'contentmodel', base) self._check_param_subset(self.site, 'parse', 'contentmodel', base) -- To view, visit https://gerrit.wikimedia.org/r/247947 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1c8d3c1251df582b4abdf043b1acbb4404f034d6 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Ricordisamoa <ricordisamoa(a)openmailbox.org> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

Failed: wikimedia/pywikibot-core#3075 (master - 08ef628)
by Travis CI 11 Nov '15

11 Nov '15

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3075 Status: Failed Duration: 34 minutes and 20 seconds Commit: 08ef628 (master) Author: jenkins-bot Message: Merge "Add codecov to Appveyor builds" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/ec91fd8e43c3...08ef6280… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/90604299 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

1 0

[Gerrit] Add codecov to Appveyor builds - change (pywikibot/core)
by jenkins-bot (Code Review) 11 Nov '15

11 Nov '15

jenkins-bot has submitted this change and it was merged. Change subject: Add codecov to Appveyor builds ...................................................................... Add codecov to Appveyor builds Change-Id: I120309d97ff0543ce5b3beb339fdf4062572bd7d --- M .appveyor.yml 1 file changed, 5 insertions(+), 2 deletions(-) Approvals: John Vandenberg: Looks good to me, approved Ladsgroup: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/.appveyor.yml b/.appveyor.yml index c2ffc88..6e24d79 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -95,7 +95,10 @@ - ps: "[IO.File]::AppendAllText($env:PYWIKIBOT2_USER_CONFIG, 'max_retries = 2; maximum_GET_length = 5000; transliteration_target = None;')" - set PYSETUP_TEST_NO_UI=1 - - "%CMD_IN_ENV% python setup.py test" + - "%CMD_IN_ENV% coverage run setup.py test" + +after_test: + - codecov artifacts: - - path: dist\* + - path: dist\* .coverage coverage.xml -- To view, visit https://gerrit.wikimedia.org/r/244878 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I120309d97ff0543ce5b3beb339fdf4062572bd7d Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

Errored: wikimedia/pywikibot-core#3074 (master - ec91fd8)
by Travis CI 11 Nov '15

11 Nov '15

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3074 Status: Errored Duration: 1 hour, 14 minutes, and 9 seconds Commit: ec91fd8 (master) Author: John Vandenberg Message: Fix tools._ColorFormatter.get_value My amendments to 9146f17 introduced a crash. Bug: T118371 Change-Id: I85bf51d75390c06c36fd532f2f56e656846a538c View the changeset: https://github.com/wikimedia/pywikibot-core/compare/af7dd3c13d8c...ec91fd8e… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/90476570 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

1 0

[Gerrit] Fix tools._ColorFormatter.get_value - change (pywikibot/core)
by jenkins-bot (Code Review) 11 Nov '15

11 Nov '15

jenkins-bot has submitted this change and it was merged. Change subject: Fix tools._ColorFormatter.get_value ...................................................................... Fix tools._ColorFormatter.get_value My amendments to 9146f17 introduced a crash. Bug: T118371 Change-Id: I85bf51d75390c06c36fd532f2f56e656846a538c --- M pywikibot/tools/formatter.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/tools/formatter.py b/pywikibot/tools/formatter.py index 7697180..ee34057 100644 --- a/pywikibot/tools/formatter.py +++ b/pywikibot/tools/formatter.py @@ -76,7 +76,7 @@ def get_value(self, key, args, kwargs): """Get value, filling in 'color' when it is a valid color.""" - if key == 'color' and kwargs['color'] in self.colors: + if key == 'color' and kwargs.get('color') in self.colors: return '\03{{{0}}}'.format(kwargs[key]) else: return super(_ColorFormatter, self).get_value(key, args, kwargs) -- To view, visit https://gerrit.wikimedia.org/r/252400 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I85bf51d75390c06c36fd532f2f56e656846a538c Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

Errored: wikimedia/pywikibot-core#3073 (master - af7dd3c)
by Travis CI 11 Nov '15

11 Nov '15

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3073 Status: Errored Duration: 1 hour, 12 minutes, and 30 seconds Commit: af7dd3c (master) Author: jenkins-bot Message: Merge "[color] use pywikibot.tools.formatter.color_format" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/0e1dff56ab87...af7dd3c1… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/90460918 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

1 0

[Gerrit] [color] use pywikibot.tools.formatter.color_format - change (pywikibot/core)
by jenkins-bot (Code Review) 11 Nov '15

11 Nov '15

jenkins-bot has submitted this change and it was merged. Change subject: [color] use pywikibot.tools.formatter.color_format ...................................................................... [color] use pywikibot.tools.formatter.color_format Introduce a format variant {color} to be able to assign a color argument to the format string to be more flexible. Some tests added. Change-Id: I203e58e0d4fb5bd7fc8702485beae3f5c2e562e2 --- M pywikibot/diff.py M pywikibot/tools/formatter.py M scripts/welcome.py M tests/tools_formatter_tests.py 4 files changed, 45 insertions(+), 19 deletions(-) Approvals: John Vandenberg: Looks good to me, approved Xqt: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/pywikibot/diff.py b/pywikibot/diff.py index 1a91ef5..299c65a 100644 --- a/pywikibot/diff.py +++ b/pywikibot/diff.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Diff module.""" # -# (C) Pywikibot team, 2014 +# (C) Pywikibot team, 2014-2015 # # Distributed under the terms of the MIT license. # @@ -30,6 +30,7 @@ from pywikibot.backports import format_range_unified # introduced in 2.7.2 from pywikibot.tools import deprecated_args +from pywikibot.tools.formatter import color_format class Hunk(object): @@ -147,7 +148,8 @@ if line_ref is None: if color in self.colors: - colored_line = '\03{%s}%s\03{default}' % (self.colors[color], line) + colored_line = color_format('{color}{0}{default}', + line, color=self.colors[color]) return colored_line else: return line @@ -158,16 +160,17 @@ char_tagged = char if color_closed: if char_ref != ' ': - char_tagged = '\03{%s}%s' % (self.colors[color], char) + char_tagged = color_format('{color}{0}', + char, self.colors[color]) color_closed = False else: if char_ref == ' ': - char_tagged = '\03{default}%s' % char + char_tagged = color_format('{default}{0}', char) color_closed = True colored_line += char_tagged if not color_closed: - colored_line += '\03{default}' + colored_line += color_format('{default}') return colored_line @@ -351,9 +354,10 @@ context_range = self._get_context_range(hunks) - output = ('\03{aqua}' + - Hunk.get_header_text(*context_range) + '\03{default}\n' + - extend_context(context_range[0][0], hunks[0].a_rng[0])) + output = color_format('{aqua}{0}{default}\n{1}', + Hunk.get_header_text(*context_range), + extend_context(context_range[0][0], + hunks[0].a_rng[0])) previous_hunk = None for hunk in hunks: if previous_hunk: @@ -498,10 +502,10 @@ super_hunks[position + 1:]) pywikibot.output('Split into {0} hunks'.format(len(super_hunk._hunks))) elif choice == '?': - pywikibot.output( - '\03{purple}%s\03{default}' % '\n'.join( + pywikibot.output(color_format( + '{purple}{0}{default}', '\n'.join( '{0} -> {1}'.format(answer, help_msg[answer]) - for answer in answers)) + for answer in answers))) else: assert False, '%s is not a valid option' % choice @@ -539,22 +543,24 @@ by_letter: if text_a and text_b are single lines, comparison can be done """ + FORMAT = '{2}{lightpurple}{0:{1}^50}{default}{2}' + patch = PatchManager(oldtext, newtext, n=n, by_letter=by_letter) - pywikibot.output('\03{{lightpurple}}\n{0:*^50}\03{{default}}\n'.format(' ALL CHANGES ')) + pywikibot.output(color_format(FORMAT, ' ALL CHANGES ', '*', '\n')) for hunk in patch.hunks: pywikibot.output(hunk.diff_text) - pywikibot.output('\03{{lightpurple}}\n{0:*^50}\03{{default}}\n'.format(' REVIEW CHANGES ')) + pywikibot.output(color_format(FORMAT, ' REVIEW CHANGES ', '*', '\n')) text_list = patch.apply() - pywikibot.output('\03{{lightpurple}}\n{0:*^50}\03{{default}}\n'.format(' APPROVED CHANGES ')) + pywikibot.output(color_format(FORMAT, ' APPROVED CHANGES ', '*', '\n')) if any(hunk.reviewed == hunk.APPR for hunk in patch.hunks): for hunk in patch.hunks: if hunk.reviewed == hunk.APPR: pywikibot.output(hunk.diff_text) else: - pywikibot.output('\03{{lightpurple}}{0:^50}\03{{default}}'.format('None.')) + pywikibot.output(color_format(FORMAT, 'None.', '', '')) text = ''.join(text_list) diff --git a/pywikibot/tools/formatter.py b/pywikibot/tools/formatter.py index ae9c530..7697180 100644 --- a/pywikibot/tools/formatter.py +++ b/pywikibot/tools/formatter.py @@ -15,7 +15,7 @@ from string import Formatter from pywikibot.logging import output -from pywikibot.tools import UnicodeType +from pywikibot.tools import PY2, UnicodeType from pywikibot.userinterfaces.terminal_interface_base import colors @@ -74,6 +74,13 @@ super(_ColorFormatter, self).__init__() self._depth = len(inspect.stack()) + def get_value(self, key, args, kwargs): + """Get value, filling in 'color' when it is a valid color.""" + if key == 'color' and kwargs['color'] in self.colors: + return '\03{{{0}}}'.format(kwargs[key]) + else: + return super(_ColorFormatter, self).get_value(key, args, kwargs) + def parse(self, format_string): """Yield results similar to parse but skip colors.""" previous_literal = '' @@ -116,9 +123,11 @@ @rtype: unicode """ result = super(_ColorFormatter, self)._vformat(*args, **kwargs) - if not isinstance(result, UnicodeType): + if PY2 and isinstance(result, str): assert result == b'' result = '' # This is changing it into a unicode + elif not isinstance(result, UnicodeType): + result = UnicodeType(result) return result def vformat(self, format_string, args, kwargs): @@ -150,6 +159,9 @@ It is automatically adding \03 in front of color fields so it's unnecessary to add them manually. Any other \03 in the text is disallowed. + You may use a variant {color} by assigning a valid color to a named + parameter color. + @param text: The format template string @type text: unicode @return: The formatted string diff --git a/scripts/welcome.py b/scripts/welcome.py index 11224e7..45ac857 100755 --- a/scripts/welcome.py +++ b/scripts/welcome.py @@ -195,6 +195,7 @@ from pywikibot import config from pywikibot import i18n +from pywikibot.tools.formatter import color_format if sys.version_info[0] > 2: unicode = str @@ -882,8 +883,8 @@ 4: 'Warning', 5: 'Done ', } - pywikibot.output("\03{%s}[%s]\03{default} " - % (staColor[n], staMsg[n]), newline=False) + pywikibot.output(color_format('{color}[{0}]{default} ', + staMsg[n], color=staColor[n]), newline=False) def load_word_function(raw): diff --git a/tests/tools_formatter_tests.py b/tests/tools_formatter_tests.py index bd3a2df..d6803f3 100644 --- a/tests/tools_formatter_tests.py +++ b/tests/tools_formatter_tests.py @@ -97,6 +97,13 @@ self.assertRaises(TypeError, formatter.color_format, b'{0}', 'a') self.assertRaises(TypeError, formatter.color_format, b'{black}{0}', 'a') + def test_variant_colors(self): + """Test variant colors with {color} parameter.""" + self.assert_format('{0}{color}', '42\03{black}', 42, color='black') + self.assert_format('{ans}{color}', '42\03{black}', ans=42, + color='black') + self.assert_format('{color}', '42', color=42) + if __name__ == '__main__': try: -- To view, visit https://gerrit.wikimedia.org/r/239689 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I203e58e0d4fb5bd7fc8702485beae3f5c2e562e2 Gerrit-PatchSet: 9 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits November 2015