Pywikibot-commits July 2017

pywikibot-commits@lists.wikimedia.org

2 participants
54 discussions

[Gerrit] pywikibot/core[master]: [IMPR] Prevent deprecation warning in test when using PatchM...

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/363366 ) Change subject: [IMPR] Prevent deprecation warning in test when using PatchManager ...................................................................... [IMPR] Prevent deprecation warning in test when using PatchManager Bug: T169768 Change-Id: Icf8f94bfd2311986ab778da34caa5b2ed5ff7155 --- M pywikibot/diff.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Mpaa: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/diff.py b/pywikibot/diff.py index 12fe490..c5b95f4 100644 --- a/pywikibot/diff.py +++ b/pywikibot/diff.py @@ -573,7 +573,7 @@ """ FORMAT = '{2}{lightpurple}{0:{1}^50}{default}{2}' - patch = PatchManager(oldtext, newtext, n=n, by_letter=by_letter) + patch = PatchManager(oldtext, newtext, context=n, by_letter=by_letter) pywikibot.output(color_format(FORMAT, ' ALL CHANGES ', '*', '\n')) for hunk in patch.hunks: -- To view, visit https://gerrit.wikimedia.org/r/363366 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icf8f94bfd2311986ab778da34caa5b2ed5ff7155 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Magul <tomasz.magulski(a)gmail.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

6 years, 9 months

[Gerrit] pywikibot/core[master]: Update archivebot.py documentation

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/363329 ) Change subject: Update archivebot.py documentation ...................................................................... Update archivebot.py documentation Noting that %(monthname)s does support local language and not only English as stated before. Bug: T169719 Change-Id: I7a0dd192c7b632c36a673cb7050d095d0dc8ca54 --- M scripts/archivebot.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/scripts/archivebot.py b/scripts/archivebot.py index e6c0ca4..6fd88c6 100755 --- a/scripts/archivebot.py +++ b/scripts/archivebot.py @@ -61,7 +61,7 @@ %(isoweek)d ISO week number of the thread being archived %(quarter)d quarter of the year of the thread being archived %(month)d month (as a number 1-12) of the thread being archived -%(monthname)s English name of the month above +%(monthname)s localized name of the month above %(monthnameshort)s first three letters of the name above %(week)d week number of the thread being archived -- To view, visit https://gerrit.wikimedia.org/r/363329 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7a0dd192c7b632c36a673cb7050d095d0dc8ca54 Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: MarcoAurelio <maurelio(a)tools.wmflabs.org> Gerrit-Reviewer: MarcoAurelio <maurelio(a)tools.wmflabs.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

6 years, 9 months

[Gerrit] pywikibot/core[master]: [DOC] Add some documetations to page() methods

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/361419 ) Change subject: [DOC] Add some documetations to page() methods ...................................................................... [DOC] Add some documetations to page() methods Change-Id: Id61d6632ac1512c429ec3f3d7be7d221fddbfdf2 --- M pywikibot/logentries.py 1 file changed, 10 insertions(+), 4 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/logentries.py b/pywikibot/logentries.py index 80cf38c..26dd3cf 100644 --- a/pywikibot/logentries.py +++ b/pywikibot/logentries.py @@ -97,8 +97,11 @@ """ Page on which action was performed. - Note: title may be missing in data dict e.g. by oversight action to - hide the title. In that case a KeyError exception will raise + @note: title may be missing in data dict e.g. by oversight action to + hide the title. In that case a KeyError exception will raise + + @rtype: pywikibot.Page + @raise: KeyError: title was missing from log entry """ if not hasattr(self, '_page'): self._page = pywikibot.Page(self.site, self.data['title']) @@ -138,6 +141,9 @@ This returns a User object instead of the Page object returned by the superclass method. + + @return: target user + @rtype: pywikibot.User """ if not hasattr(self, '_page'): self._page = pywikibot.User(super(UserTargetLogEntry, self).page()) @@ -172,7 +178,7 @@ @return: the Page object of username or IP if this block action targets a username or IP, or the blockid if this log reflects the removal of an autoblock - @rtype: Page or int + @rtype: pywikibot.Page or int """ # TODO what for IP ranges ? if self.isAutoblockRemoval: @@ -277,7 +283,7 @@ Note: title may be missing in data dict e.g. by oversight action to hide the title. In that case a KeyError exception will raise - @rtype: FilePage + @rtype: pywikibot.FilePage @raise: KeyError: title was missing from log entry """ if not hasattr(self, '_page'): -- To view, visit https://gerrit.wikimedia.org/r/361419 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id61d6632ac1512c429ec3f3d7be7d221fddbfdf2 Gerrit-PatchSet: 4 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: 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]: Fix some of the invalid escape sequences

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/362976 ) Change subject: Fix some of the invalid escape sequences ...................................................................... Fix some of the invalid escape sequences Bug: T164575 Change-Id: Idf8a01717db55309a1cb18a3c82fce783a5b4976 --- M pywikibot/config2.py M scripts/imagecopy.py M scripts/imagecopy_self.py M scripts/table2wiki.py 4 files changed, 14 insertions(+), 13 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/pywikibot/config2.py b/pywikibot/config2.py index 0d82f2d..35f248d 100644 --- a/pywikibot/config2.py +++ b/pywikibot/config2.py @@ -936,7 +936,7 @@ key1 = winreg.OpenKey(winreg.HKEY_CURRENT_USER, key_name) _progID = winreg.EnumValue(key1, 0)[0] _key2 = _winreg.OpenKey(_winreg.HKEY_CLASSES_ROOT, - '%s\shell\open\command' % _progID) + r'%s\shell\open\command' % _progID) _cmd = _winreg.QueryValueEx(_key2, None)[0] # See T102465 for issues relating to using this value. cmd = _cmd diff --git a/scripts/imagecopy.py b/scripts/imagecopy.py index 80e53eb..7d836a3 100644 --- a/scripts/imagecopy.py +++ b/scripts/imagecopy.py @@ -352,11 +352,11 @@ def fixAuthor(self, pageText): """Fix the author field in the information template.""" informationRegex = re.compile( - '\|Author\=Original uploader was ' - '(?P<author>\[\[:\w+:\w+:\w+\|\w+\]\] at \[.+\])') + r'\|Author=Original uploader was ' + r'(?P<author>\[\[:\w+:\w+:\w+\|\w+\]\] at \[.+\])') selfRegex = re.compile( - '\{\{self\|author\=' - '(?P<author>\[\[:\w+:\w+:\w+\|\w+\]\] at \[.+\])\|') + r'{{self\|author=' + r'(?P<author>\[\[:\w+:\w+:\w+\|\w+\]\] at \[.+\])\|') # Find the |Author=Original uploader was .... informationMatch = informationRegex.search(pageText) @@ -485,8 +485,8 @@ saltos = getautoskip() # print saltos for salto in saltos: - rex = u'\{\{\s*[' + salto[0].upper() + salto[0].lower() + ']' + \ - salto[1:] + '(\}\}|\|)' + rex = r'\{\{\s*[' + salto[0].upper() + salto[0].lower() + r']' + \ + salto[1:] + r'(\}\}|\|)' # print rex if re.search(rex, pagetext): return True diff --git a/scripts/imagecopy_self.py b/scripts/imagecopy_self.py index aa7d1f2..c45fe22 100644 --- a/scripts/imagecopy_self.py +++ b/scripts/imagecopy_self.py @@ -580,8 +580,8 @@ lang = sourceSite.code family = sourceSite.family.name conversions = [ - (u'\[\[([^\[\]\|]+)\|([^\[\]\|]+)\]\]', u'[[:%(lang)s:\\1|\\2]]'), - (u'\[\[([^\[\]\|]+)\]\]', u'[[:%(lang)s:\\1|\\1]]'), + (r'\[\[([^\[\]\|]+)\|([^\[\]\|]+)\]\]', r'[[:%(lang)s:\1|\2]]'), + (r'\[\[([^\[\]\|]+)\]\]', r'[[:%(lang)s:\1|\1]]'), ] for (regex, replacement) in conversions: text = re.sub(regex, replacement % {u'lang': lang, @@ -992,8 +992,8 @@ if imagepage.site.lang in moveToCommonsTemplate: for moveTemplate in moveToCommonsTemplate[ imagepage.site.lang]: - imtxt = re.sub(u'(?i)\{\{' + moveTemplate + - u'[^\}]*\}\}', u'', imtxt) + imtxt = re.sub(r'(?i){{' + moveTemplate + + r'[^}]*}}', r'', imtxt) # add {{NowCommons}} if imagepage.site.lang in nowCommonsTemplate: diff --git a/scripts/table2wiki.py b/scripts/table2wiki.py index 82dba5b..3d41b20 100644 --- a/scripts/table2wiki.py +++ b/scripts/table2wiki.py @@ -226,8 +226,9 @@ # warnings += n # what is this for? - newTable, n = re.subn("[\r\n]+<(td|TD)([^>]+?)>([^\r\n]*?)<\/(td|TD)>", - r"\r\n|\2 | \3\r\n", newTable) + newTable, n = re.subn( + r'[\r\n]+<(td|TD)([^>]+?)>([^\r\n]*?)</(td|TD)>', + r'\r\n|\2 | \3\r\n', newTable) if n > 0: warning_messages.append( u"WARNING: (sorry, bot code unreadable (1). I don't know why " -- To view, visit https://gerrit.wikimedia.org/r/362976 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idf8a01717db55309a1cb18a3c82fce783a5b4976 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(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]: Manual:Pywikibot is not old

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/361427 ) Change subject: Manual:Pywikibot is not old ...................................................................... Manual:Pywikibot is not old Change-Id: Ibbaa13a26e785834a8885a4b5d279907fc73d393 --- M docs/index.rst M docs/installation.rst M docs/library_usage.rst 3 files changed, 3 insertions(+), 3 deletions(-) Approvals: Framawiki: Looks good to me, but someone else must approve Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/index.rst b/docs/index.rst index c9e3763..55fff71 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -6,7 +6,7 @@ **This documentation is incomplete**, and needs quite some work. If you are not familiar with pywikibot, please start at the - old documentation: + documentation: `Manual:Pywikibot on mediawiki.org <https://www.mediawiki.org/wiki/Manual:Pywikibot>`_ diff --git a/docs/installation.rst b/docs/installation.rst index 2221e95..9e24268 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -4,4 +4,4 @@ .. _installation: .. note:: - Please see the old documentation at `Manual:Pywikibot/Installation <https://www.mediawiki.org/wiki/Manual:Pywikibot/Installation>`_ + Please see the documentation at `Manual:Pywikibot/Installation <https://www.mediawiki.org/wiki/Manual:Pywikibot/Installation>`_ diff --git a/docs/library_usage.rst b/docs/library_usage.rst index 759b795..232143d 100644 --- a/docs/library_usage.rst +++ b/docs/library_usage.rst @@ -2,4 +2,4 @@ ------------ .. note:: - Please see the old documentation at `Manual:Pywikibot/Create your own script <https://www.mediawiki.org/wiki/Manual:Pywikibot/Create_your_own_script>`_ + Please see the documentation at `Manual:Pywikibot/Create your own script <https://www.mediawiki.org/wiki/Manual:Pywikibot/Create_your_own_script>`_ -- To view, visit https://gerrit.wikimedia.org/r/361427 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibbaa13a26e785834a8885a4b5d279907fc73d393 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: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

6 years, 9 months

[Gerrit] pywikibot/core[master]: [DOC] Fix missleading comment for UserBlocked

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/362184 ) Change subject: [DOC] Fix missleading comment for UserBlocked ...................................................................... [DOC] Fix missleading comment for UserBlocked Change-Id: Iefea1ad27bf2eb691d3e1636a3323548833e5491 --- M pywikibot/exceptions.py 1 file changed, 4 insertions(+), 5 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/exceptions.py b/pywikibot/exceptions.py index 921ce86..aa249c7 100644 --- a/pywikibot/exceptions.py +++ b/pywikibot/exceptions.py @@ -77,7 +77,7 @@ - FamilyMaintenanceWarning: missing information in family definition """ # -# (C) Pywikibot team, 2008-2015 +# (C) Pywikibot team, 2008-2017 # # Distributed under the terms of the MIT license. # @@ -480,13 +480,12 @@ """Server responded with BadTitle.""" -# UserBlocked exceptions should in general not be caught. If the bot has -# been blocked, the bot operator should address the reason for the block -# before continuing. - pass +# UserBlocked exceptions should in general not be caught. If the bot has +# been blocked, the bot operator should address the reason for the block +# before continuing. class UserBlocked(Error): # noqa """Your username or IP has been blocked""" -- To view, visit https://gerrit.wikimedia.org/r/362184 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iefea1ad27bf2eb691d3e1636a3323548833e5491 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: Magul <tomasz.magulski(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

6 years, 9 months

[Gerrit] pywikibot/core[master]: [bugfix] Don't fail TestProofreadPageValidSite.test_url_image

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/363006 ) Change subject: [bugfix] Don't fail TestProofreadPageValidSite.test_url_image ...................................................................... [bugfix] Don't fail TestProofreadPageValidSite.test_url_image TestProofreadPageValidSite.test_url_image requires bs4 package. Don't fail tests with TypeError but skip tests when BeautifulSoup is missing Bug: T169542 Change-Id: I45e08d5dd080b3089c050af87a85826e655dd58d --- M tests/proofreadpage_tests.py 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/proofreadpage_tests.py b/tests/proofreadpage_tests.py index 0e17ae1..77117ad 100644 --- a/tests/proofreadpage_tests.py +++ b/tests/proofreadpage_tests.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Tests for the proofreadpage module.""" # -# (C) Pywikibot team, 2015-2016 +# (C) Pywikibot team, 2015-2017 # # Distributed under the terms of the MIT license. # @@ -283,6 +283,7 @@ page_text = page._page_to_json() self.assertEqual(json.loads(page_text), json.loads(loaded_text)) + @require_modules('bs4') def test_url_image(self): """Test fetching of url image of the scan of ProofreadPage.""" page = ProofreadPage(self.site, self.valid['title']) -- To view, visit https://gerrit.wikimedia.org/r/363006 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I45e08d5dd080b3089c050af87a85826e655dd58d Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Magul <tomasz.magulski(a)gmail.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

6 years, 9 months

[Gerrit] pywikibot/core[master]: proofreadpage.py: Fallback to "html.parser" if "lxml" is not...

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/362967 ) Change subject: proofreadpage.py: Fallback to "html.parser" if "lxml" is not available ...................................................................... proofreadpage.py: Fallback to "html.parser" if "lxml" is not available Bug: T169515 Change-Id: I8c6a3741b54b9a09dcdd263cbf59fad91fa9923a --- M pywikibot/proofreadpage.py 1 file changed, 13 insertions(+), 6 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/pywikibot/proofreadpage.py b/pywikibot/proofreadpage.py index 13dbce3..a49e657 100644 --- a/pywikibot/proofreadpage.py +++ b/pywikibot/proofreadpage.py @@ -26,16 +26,23 @@ __version__ = '$Id$' +from functools import partial import json import re try: - from bs4 import BeautifulSoup + from bs4 import BeautifulSoup, FeatureNotFound except ImportError as e: BeautifulSoup = e +else: + try: + BeautifulSoup('', 'lxml') + except FeatureNotFound: + Soup = partial(BeautifulSoup, features='html.parser') + else: + Soup = partial(BeautifulSoup, features='lxml') import pywikibot - from pywikibot.comms import http from pywikibot.data.api import Request @@ -522,7 +529,7 @@ pywikibot.error('Error fetching HTML for %s.' % self) raise - soup = BeautifulSoup(response.content, 'lxml') + soup = Soup(response.content) try: # None if nothing is found by .find() @@ -577,7 +584,7 @@ """Do hocr using //tools.wmflabs.org/phetools/hocr_cgi.py?cmd=hocr.""" def parse_hocr_text(txt): """Parse hocr text.""" - soup = BeautifulSoup(txt, 'lxml') + soup = Soup(txt) res = [] for ocr_page in soup.find_all(class_='ocr_page'): @@ -743,7 +750,7 @@ del self._parsed_text self._parsed_text = self._get_parsed_page() - self._soup = BeautifulSoup(self._parsed_text, 'html.parser') + self._soup = Soup(self._parsed_text) # Do not search for "new" here, to avoid to skip purging if links # to non-existing pages are present. attrs = {'class': re.compile('prp-pagequality')} @@ -765,7 +772,7 @@ self.purge() del self._parsed_text self._parsed_text = self._get_parsed_page() - self._soup = BeautifulSoup(self._parsed_text, 'html.parser') + self._soup = Soup(self._parsed_text) if not self._soup.find_all('a', attrs=attrs): raise ValueError( 'Missing class="qualityN prp-pagequality-N" or ' -- To view, visit https://gerrit.wikimedia.org/r/362967 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8c6a3741b54b9a09dcdd263cbf59fad91fa9923a Gerrit-PatchSet: 6 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(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]: [bugfix] re-enable tests for TestInterwikidataBot.test_witho...

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/362930 ) Change subject: [bugfix] re-enable tests for TestInterwikidataBot.test_without_repo ...................................................................... [bugfix] re-enable tests for TestInterwikidataBot.test_without_repo Phase 1 of Wiktionary has launched in wikidata since 20th June. Now Wiktionary pages can be linked with every item for all the Wiktionaries namespaces (except main, citations, user and talk) Use wikitech for the tests instead. Bug: T169480 Change-Id: Idc7b2b6b9ff8a3c181550c6d580c4d4bdd3f2a3f --- M tests/interwikidata_tests.py 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/interwikidata_tests.py b/tests/interwikidata_tests.py index d5618db..f7e0932 100644 --- a/tests/interwikidata_tests.py +++ b/tests/interwikidata_tests.py @@ -47,7 +47,7 @@ 'code': 'fa', }, 'wt': { - 'family': 'wiktionary', + 'family': 'wikitech', 'code': 'en', }, } @@ -89,16 +89,16 @@ def test_without_repo(self): """Test throwing error when site does not have a data repo.""" wt_page = pywikibot.Page(self.wt, 'User:Ladsgroup') - self.assertRaises(ValueError, DummyBot, generator=[wt_page], site=self.wt) + self.assertRaises(ValueError, DummyBot, generator=[wt_page], + site=self.wt) - fa_wiktionary = pywikibot.Site('fa', 'wiktionary') self.assertRaisesRegex( ValueError, - r'wiktionary:fa does not have a data repository, ' + r'wikitech:en does not have a data repository, ' r'use interwiki\.py instead.', interwikidata.IWBot, - generator=[pywikibot.Page(fa_wiktionary, 'User:Dalba')], - site=fa_wiktionary, + generator=[pywikibot.Page(self.wt, 'User:Dalba')], + site=self.wt, ) -- To view, visit https://gerrit.wikimedia.org/r/362930 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idc7b2b6b9ff8a3c181550c6d580c4d4bdd3f2a3f Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Ladsgroup <Ladsgroup(a)gmail.com> Gerrit-Reviewer: Magul <tomasz.magulski(a)gmail.com> Gerrit-Reviewer: Multichill <maarten(a)mdammers.nl> Gerrit-Reviewer: jenkins-bot <>

6 years, 9 months

[Gerrit] pywikibot/core[master]: [bugfix] Fix TestLazyLoginNotExistUsername test for Stewardwiki

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/362927 ) Change subject: [bugfix] Fix TestLazyLoginNotExistUsername test for Stewardwiki ...................................................................... [bugfix] Fix TestLazyLoginNotExistUsername test for Stewardwiki login with not existing username is denied with login result "Failed" and the reason "The supplied credentials could not be authenticated". Use this result to raise a NoUsername exception as expected. Bug: T169458 Change-Id: I81f62ecaf6ee57b12d0878e7da2cab9a5a63d996 --- M pywikibot/data/api.py M pywikibot/login.py 2 files changed, 7 insertions(+), 2 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py index 4c28951..acb0d19 100644 --- a/pywikibot/data/api.py +++ b/pywikibot/data/api.py @@ -3076,7 +3076,8 @@ break else: break - raise APIError(code=login_result["login"]["result"], info="") + info = login_result['login'].get('reason', '') + raise APIError(code=login_result['login']['result'], info=info) def storecookiedata(self, data): """Ignore data; cookies are set by threadedhttp module.""" diff --git a/pywikibot/login.py b/pywikibot/login.py index 01ebf6b..fefbda7 100644 --- a/pywikibot/login.py +++ b/pywikibot/login.py @@ -3,7 +3,7 @@ """Library to log the bot in to a wiki account.""" # # (C) Rob W.W. Hooft, 2003 -# (C) Pywikibot team, 2003-2016 +# (C) Pywikibot team, 2003-2017 # # Distributed under the terms of the MIT license. # @@ -320,6 +320,10 @@ raise NoUsername( 'Username "{0}" does not have read permissions on ' '{1}'.format(self.login_name, self.site)) + elif e.code == 'Failed': + raise NoUsername( + 'Username "{0}" does not have read permissions on ' + '{1}\n.{2}'.format(self.login_name, self.site, e.info)) # TODO: investigate other unhandled API codes (bug T75539) if retry: self.password = None -- To view, visit https://gerrit.wikimedia.org/r/362927 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I81f62ecaf6ee57b12d0878e7da2cab9a5a63d996 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Magul <tomasz.magulski(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Multichill <maarten(a)mdammers.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