Pywikibot-commits July 2017

pywikibot-commits@lists.wikimedia.org

2 participants
54 discussions

[Gerrit] pywikibot/core[master]: welcome.py: TypeError: decoding str is not supported

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/367493 ) Change subject: welcome.py: TypeError: decoding str is not supported ...................................................................... welcome.py: TypeError: decoding str is not supported Fix "TypeError: decoding str is not supported" (python3). Bug: T171051 Change-Id: I8513da1dace94294f983af72dd181dad853e6cdb --- M scripts/welcome.py 1 file changed, 5 insertions(+), 8 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/scripts/welcome.py b/scripts/welcome.py index 7297944..977923c 100755 --- a/scripts/welcome.py +++ b/scripts/welcome.py @@ -180,10 +180,7 @@ from pywikibot import config, i18n from pywikibot.tools.formatter import color_format -from pywikibot.tools import issue_deprecation_warning - -if sys.version_info[0] > 2: - unicode = str +from pywikibot.tools import issue_deprecation_warning, UnicodeType locale.setlocale(locale.LC_ALL, '') @@ -831,10 +828,10 @@ if globalvar.recursive: showStatus() if locale.getlocale()[1]: - strfstr = unicode( - time.strftime(u"%d %b %Y %H:%M:%S (UTC)", - time.gmtime()), - locale.getlocale()[1]) + strfstr = time.strftime( + '%d %b %Y %H:%M:%S (UTC)', time.gmtime()) + if not isinstance(strfstr, UnicodeType): # py2-py3 compatibility + strfstr = strfstr.decode(locale.getlocale()[1]) else: strfstr = time.strftime( u"%d %b %Y %H:%M:%S (UTC)", time.gmtime()) -- To view, visit https://gerrit.wikimedia.org/r/367493 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8513da1dace94294f983af72dd181dad853e6cdb Gerrit-PatchSet: 1 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: Magul <tomasz.magulski(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

6 years, 9 months

[Gerrit] pywikibot/core[master]: Use WbUnknown when encountering an unknown data type

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/364728 ) Change subject: Use WbUnknown when encountering an unknown data type ...................................................................... Use WbUnknown when encountering an unknown data type @Todo: * Unittests Bug: T165996 Change-Id: I54d9a830d80f1ba6d91416b7e72b9a51d18d6e31 --- M pywikibot/page.py M tests/paraminfo_tests.py 2 files changed, 13 insertions(+), 5 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/pywikibot/page.py b/pywikibot/page.py index 32663d6..bb8b224 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -4470,6 +4470,7 @@ 'tabular-data': pywikibot.WbTabularData, } + # the value type where different from the type value_types = {'wikibase-item': 'wikibase-entityid', 'wikibase-property': 'wikibase-entityid', 'commonsMedia': 'string', @@ -4672,8 +4673,13 @@ if claim.getSnakType() == 'value': value = data['mainsnak']['datavalue']['value'] # The default covers string, url types - claim.target = cls.TARGET_CONVERTER.get( - claim.type, lambda value, site: value)(value, site) + if claim.type in cls.types or claim.type == 'wikibase-property': + claim.target = cls.TARGET_CONVERTER.get( + claim.type, lambda value, site: value)(value, site) + else: + pywikibot.warning( + '{0} datatype is not supported yet.'.format(claim.type)) + claim.target = pywikibot.WbUnknown.fromWikibase(value) if 'rank' in data: # References/Qualifiers don't have ranks claim.rank = data['rank'] if 'references' in data: @@ -5043,9 +5049,10 @@ 'quantity', 'monolingualtext', 'geo-shape', 'tabular-data'): value = self.getTarget().toWikibase() - else: - raise NotImplementedError('%s datatype is not supported yet.' - % self.type) + else: # WbUnknown + pywikibot.warning( + '{0} datatype is not supported yet.'.format(self.type)) + value = self.getTarget().toWikibase() return value def _formatDataValue(self): diff --git a/tests/paraminfo_tests.py b/tests/paraminfo_tests.py index e2e4263..e221120 100644 --- a/tests/paraminfo_tests.py +++ b/tests/paraminfo_tests.py @@ -227,6 +227,7 @@ known = ['item', 'property'] self._check_param_values(self.repo, 'wbsearchentities', 'type', known) + # Missing datatypes won't crash pywikibot but should be noted def test_datatypes(self): """Test that all encountered datatypes are known.""" unsupported = set() -- To view, visit https://gerrit.wikimedia.org/r/364728 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I54d9a830d80f1ba6d91416b7e72b9a51d18d6e31 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Lokal Profil <lokal.profil(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Lokal Profil <lokal.profil(a)gmail.com> Gerrit-Reviewer: Magul <tomasz.magulski(a)gmail.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Multichill <maarten(a)mdammers.nl> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

6 years, 9 months

[Gerrit] pywikibot/core[master]: [L10N] Localize welcome.py for ba language code

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/366246 ) Change subject: [L10N] Localize welcome.py for ba language code ...................................................................... [L10N] Localize welcome.py for ba language code Bug: T170970 Change-Id: If86962894c9b5ecf027ae2d46b95fbf54b196931 --- M scripts/welcome.py 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/welcome.py b/scripts/welcome.py index 08b8204..7297944 100755 --- a/scripts/welcome.py +++ b/scripts/welcome.py @@ -222,6 +222,7 @@ 'wikipedia': { 'am': u'{{subst:Welcome}} %s', 'ar': u'{{subst:ترحيب}} %s', + 'ba': '{{Hello}} %s', 'bn': u'{{subst:স্বাগতম/বট}} %s', 'da': u'{{velkommen|%s}}', 'en': u'{{subst:welcome}} %s', @@ -344,6 +345,7 @@ random_sign = { 'am': u'User:Beria/Signatures', 'ar': u'Project:سجل الترحيب/توقيعات', + 'ba': 'Ҡатнашыусы:Salamat bot/Ярҙам', 'da': u'Wikipedia:Velkommen/Signaturer', 'en': u'Project:Welcome log/Sign', 'fa': u'Project:سیاهه خوشامد/امضاها', -- To view, visit https://gerrit.wikimedia.org/r/366246 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If86962894c9b5ecf027ae2d46b95fbf54b196931 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <Ladsgroup(a)gmail.com> Gerrit-Reviewer: Utarbai <utarbai(a)mail.ru> Gerrit-Reviewer: jenkins-bot <>

6 years, 9 months

[Gerrit] pywikibot/core[master]: Improve and re-enable translateMagicWords

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/342002 ) Change subject: Improve and re-enable translateMagicWords ...................................................................... Improve and re-enable translateMagicWords Bug: T151107 Bug: T159997 Change-Id: I0b59755636deac773054ed344a93077ace622b5e --- M pywikibot/cosmetic_changes.py M tests/cosmetic_changes_tests.py 2 files changed, 60 insertions(+), 17 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/pywikibot/cosmetic_changes.py b/pywikibot/cosmetic_changes.py index e160467..57a9786 100755 --- a/pywikibot/cosmetic_changes.py +++ b/pywikibot/cosmetic_changes.py @@ -50,7 +50,7 @@ """ # # (C) xqt, 2009-2016 -# (C) Pywikibot team, 2006-2016 +# (C) Pywikibot team, 2006-2017 # # Distributed under the terms of the MIT license. # @@ -71,7 +71,7 @@ import pywikibot from pywikibot import config, textlib -from pywikibot.textlib import _MultiTemplateMatchBuilder +from pywikibot.textlib import _MultiTemplateMatchBuilder, FILE_LINK_REGEX from pywikibot.tools import deprecated_args, first_lower, first_upper from pywikibot.tools import MediaWikiVersion @@ -223,8 +223,7 @@ self.cleanUpSectionHeaders, self.putSpacesInLists, self.translateAndCapitalizeNamespaces, - # FIXME: fix bugs and re-enable - # self.translateMagicWords, + self.translateMagicWords, self.replaceDeprecatedTemplates, # FIXME: fix bugs and re-enable # self.resolveHtmlEntities, @@ -408,19 +407,31 @@ """Use localized magic words.""" # not wanted at ru # arz uses english stylish codes - if self.site.code not in ['arz', 'ru']: - exceptions = ['nowiki', 'comment', 'math', 'pre'] - for magicWord in ['img_thumbnail', 'img_left', 'img_center', - 'img_right', 'img_none', 'img_framed', - 'img_frameless', 'img_border', 'img_upright', ]: - aliases = self.site.getmagicwords(magicWord) - if not aliases: - continue - text = textlib.replaceExcept( - text, - r'\[\[(?P<left>.+?:.+?\..+?\|) *(' + '|'.join(aliases) + - r') *(?P<right>(\|.*?)?\]\])', - r'[[\g<left>' + aliases[0] + r'\g<right>', exceptions) + # no need to run on English wikis + if self.site.code not in ['arz', 'en', 'ru']: + def replace_magicword(match): + split = match.group().split('|') + # push ']]' out and re-add below + split[-1] = split[-1][:-2] + for magicword in ['img_thumbnail', 'img_left', 'img_center', + 'img_right', 'img_none', 'img_framed', + 'img_frameless', 'img_border', 'img_upright', + ]: + aliases = list(self.site.getmagicwords(magicword)) + preferred = aliases.pop(0) + if not aliases: + continue + split[1:] = list(map( + lambda x: preferred if x.strip() in aliases else x, + split[1:])) + return '|'.join(split) + ']]' + + exceptions = ['nowiki', 'comment', 'math', 'pre', 'source'] + regex = re.compile( + FILE_LINK_REGEX % '|'.join(self.site.namespaces[6]), + flags=re.X) + text = textlib.replaceExcept(text, regex, replace_magicword, + exceptions) return text def cleanUpLinks(self, text): diff --git a/tests/cosmetic_changes_tests.py b/tests/cosmetic_changes_tests.py index 02cce31..4d21e6c 100644 --- a/tests/cosmetic_changes_tests.py +++ b/tests/cosmetic_changes_tests.py @@ -242,6 +242,38 @@ self.assertEqual( '[[File:Foo.bar|miniatur]]', self.cct.translateMagicWords('[[File:Foo.bar|mini]]')) + # test local namespace + self.assertEqual( + '[[Datei:Foo.bar|miniatur]]', + self.cct.translateMagicWords('[[Datei:Foo.bar|thumb]]')) + # test multiple magic words + self.assertEqual( + '[[File:Foo.bar|links|miniatur]]', + self.cct.translateMagicWords('[[File:Foo.bar|left|thumb]]')) + # test magic words at the end + self.assertEqual( + '[[File:Foo.bar|250px|links]]', + self.cct.translateMagicWords('[[File:Foo.bar|250px|left]]')) + # test touching unstripped parts and stripping magic words + self.assertEqual( + '[[File:Foo.bar|links| 250px]]', + self.cct.translateMagicWords('[[File:Foo.bar| left | 250px]]')) + # test magic word with a caption + self.assertEqual( + '[[File:Foo.bar|250px|zentriert|Bar]]', + self.cct.translateMagicWords('[[File:Foo.bar|250px|center|Bar]]')) + + @unittest.expectedFailure + def test_translateMagicWords_fail(self): + """ + Test translateMagicWords method. + + The current implementation doesn't check whether the magic word is + inside a template. + """ + self.assertEqual( + '[[File:Foo.bar|{{Baz|thumb|foo}}]]', + self.cct.translateMagicWords('[[File:Foo.bar|{{Baz|thumb|foo}}]]')) def test_cleanUpLinks_pipes(self): """Test cleanUpLinks method.""" -- To view, visit https://gerrit.wikimedia.org/r/342002 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0b59755636deac773054ed344a93077ace622b5e 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: Magul <tomasz.magulski(a)gmail.com> Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

6 years, 9 months

[Gerrit] pywikibot/core[master]: [bugfix] keywords must be iterable, not a string

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/365265 ) Change subject: [bugfix] keywords must be iterable, not a string ...................................................................... [bugfix] keywords must be iterable, not a string Change-Id: Ie289e2153e84892c70d6b812e1f9ffdbd5a1e885 --- M setup.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/setup.py b/setup.py index cb74bca..e172af0 100644 --- a/setup.py +++ b/setup.py @@ -209,8 +209,8 @@ version=version, description='Python MediaWiki Bot Framework', long_description=open('README.rst').read(), - keywords=('pywikibot python mediawiki bot wiki framework ' - 'wikimedia wikipedia pwb pywikipedia API'), + keywords=('pywikibot', 'python', 'mediawiki', 'bot', 'wiki', 'framework', + 'wikimedia', 'wikipedia', 'pwb', 'pywikipedia', 'API'), maintainer='The Pywikibot team', maintainer_email='pywikibot(a)lists.wikimedia.org', license='MIT License', -- To view, visit https://gerrit.wikimedia.org/r/365265 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie289e2153e84892c70d6b812e1f9ffdbd5a1e885 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Magul <tomasz.magulski(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot <>

6 years, 9 months

[Gerrit] pywikibot/core[master]: [bugfix] Don't use mixed bytestring and unicode for filename

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/365449 ) Change subject: [bugfix] Don't use mixed bytestring and unicode for filename ...................................................................... [bugfix] Don't use mixed bytestring and unicode for filename Bug: T163349 Change-Id: If030c2db5e41a3786ec7c87fada1906cc03599a6 --- M scripts/makecat.py 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/makecat.py b/scripts/makecat.py index 20b2267..1903fd3 100755 --- a/scripts/makecat.py +++ b/scripts/makecat.py @@ -225,7 +225,9 @@ % (mysite.namespaces.CATEGORY, workingcatname)) filename = pywikibot.config.datafilepath( - 'category', workingcatname.encode('ascii', 'xmlcharrefreplace') + '_exclude.txt') + 'category', + workingcatname.encode('ascii', 'xmlcharrefreplace').decode('ascii') + + '_exclude.txt') try: f = codecs.open(filename, 'r', encoding=mysite.encoding()) for line in f.readlines(): -- To view, visit https://gerrit.wikimedia.org/r/365449 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If030c2db5e41a3786ec7c87fada1906cc03599a6 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot <>

6 years, 9 months

Passed: wikimedia/pywikibot-core#4191 (3.0.20170713 - ed3f47b)

by Travis CI

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #4191 Status: Passed Duration: 2 hours, 23 minutes, and 9 seconds Commit: ed3f47b (3.0.20170713) Author: jenkins-bot Message: Merge "[bugfix] Fix ResourceWarning in wikimedia_sites.py with python3" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/3.0.20170713 View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/253731010?utm_source=… -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

6 years, 9 months

Fixed: wikimedia/pywikibot-core#4189 (master - d025c7c)

by Travis CI

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #4189 Status: Fixed Duration: 2 hours, 24 minutes, and 40 seconds Commit: d025c7c (master) Author: Matěj Suchánek Message: Support url datatype in harvest_template.py Use Pywikibot's native regex for matching external links. Shame this is implemented in 2017. Change-Id: I1645857a5eb8765d9eff1909f51b51035fb2396d View the changeset: https://github.com/wikimedia/pywikibot-core/compare/9cec40529bf2...d025c7cf… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/253729328?utm_source=… -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

6 years, 9 months

Fixed: wikimedia/pywikibot-core#4188 (master - 9cec405)

by Travis CI

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #4188 Status: Fixed Duration: 2 hours, 29 minutes, and 41 seconds Commit: 9cec405 (master) Author: Jayprakash12345 Message: add dinwiki to pywikibot Bug: T170695 Change-Id: I883d649d1661e81ed245dfed313286871ce0a649 View the changeset: https://github.com/wikimedia/pywikibot-core/compare/ed3f47b19a01...9cec4052… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/253709705?utm_source=… -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

6 years, 9 months

[Gerrit] pywikibot/core[master]: [bugfix] convert bytestring to unicode for py3

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/365280 ) Change subject: [bugfix] convert bytestring to unicode for py3 ...................................................................... [bugfix] convert bytestring to unicode for py3 Bug: T170678 Change-Id: I76d6cad5feac7ebe92c95d08549f632804809438 --- M setup.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/setup.py b/setup.py index cb74bca..6ee8cd6 100644 --- a/setup.py +++ b/setup.py @@ -196,7 +196,7 @@ try: import subprocess date = subprocess.check_output(['git', 'log', '-1', '--format=%ci']).strip() - date = date.split(" ")[0].replace("-", "") + date = date.decode().split(' ')[0].replace('-', '') version = version + "." + date except Exception as e: print(e) -- To view, visit https://gerrit.wikimedia.org/r/365280 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I76d6cad5feac7ebe92c95d08549f632804809438 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot <>

6 years, 9 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits July 2017