Pywikibot-commits April 2017

pywikibot-commits@lists.wikimedia.org

2 participants
100 discussions

Fixed: wikimedia/pywikibot-core#4002 (master - a460596)

by Travis CI

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #4002 Status: Fixed Duration: 2 hours, 30 minutes, and 16 seconds Commit: a460596 (master) Author: jenkins-bot Message: Merge "config2.py: Increase the default socket_timeout to 75 seconds" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/84cd7b03065e...a460596f… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/224908107 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

6 years, 12 months

[Gerrit] pywikibot/core[master]: Replace deprecated 'nocapitalize' in interwiki.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/234421 ) Change subject: Replace deprecated 'nocapitalize' in interwiki.py ...................................................................... Replace deprecated 'nocapitalize' in interwiki.py While processing pages in Wiktionaries, when langlinks differed from page title only in capitalization, a DeprecationWarning was issued regarding the use of obsolete property BaseSite.nocapitalize. Change-Id: I0e2e3822601257cb3b741d92971e071d73ba635c --- M scripts/interwiki.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/scripts/interwiki.py b/scripts/interwiki.py index 7b4f5bc..bc4af48 100755 --- a/scripts/interwiki.py +++ b/scripts/interwiki.py @@ -1125,8 +1125,8 @@ % (page, self.originPage)) return True elif (page.title() != self.originPage.title() and - self.originPage.site.nocapitalize and - page.site.nocapitalize): + self.originPage.namespace().case == 'case-sensitive' and + page.namespace().case == 'case-sensitive'): pywikibot.output( u"NOTE: Ignoring %s for %s in wiktionary mode because both " u"languages are uncapitalized." -- To view, visit https://gerrit.wikimedia.org/r/234421 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0e2e3822601257cb3b741d92971e071d73ba635c Gerrit-PatchSet: 5 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Gerrit Patch Uploader <gerritpatchuploader(a)gmail.com> Gerrit-Reviewer: Gerrit Patch Uploader <gerritpatchuploader(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <Ladsgroup(a)gmail.com> Gerrit-Reviewer: Malafaya <malafaya(a)clix.pt> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

6 years, 12 months

[Gerrit] pywikibot/core[master]: config2.py: Increase the default socket_timeout to 75 seconds

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/349790 ) Change subject: config2.py: Increase the default socket_timeout to 75 seconds ...................................................................... config2.py: Increase the default socket_timeout to 75 seconds Bug: T163635 Change-Id: Ie0c24aa7831cdd1679afef3ee4f43a681a932538 --- M pywikibot/config2.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/pywikibot/config2.py b/pywikibot/config2.py index e0bac1e..fd5a2df 100644 --- a/pywikibot/config2.py +++ b/pywikibot/config2.py @@ -783,7 +783,7 @@ # DO NOT set to None to disable timeouts. Otherwise this may freeze your script. # You may assign either a tuple of two int or float values for connection and # read timeout, or a single value for both in a tuple (since requests 2.4.0). -socket_timeout = 30 +socket_timeout = 75 # ############# COSMETIC CHANGES SETTINGS ############## -- To view, visit https://gerrit.wikimedia.org/r/349790 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie0c24aa7831cdd1679afef3ee4f43a681a932538 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

6 years, 12 months

[Gerrit] pywikibot/core[master]: Avoid KeyError in PropertyPage.get

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/348451 ) Change subject: Avoid KeyError in PropertyPage.get ...................................................................... Avoid KeyError in PropertyPage.get Change-Id: I3dcdd748191fc653544524255a6f72518e3a7627 --- M pywikibot/page.py 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/pywikibot/page.py b/pywikibot/page.py index 7e9a1ee..7707567 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -4443,8 +4443,9 @@ 'PropertyPage.get only implements "force".') data = WikibasePage.get(self, force) - self._type = self._content['datatype'] - data['datatype'] = self._content['datatype'] + if 'datatype' in self._content: + self._type = self._content['datatype'] + data['datatype'] = self._type return data def newClaim(self, *args, **kwargs): -- To view, visit https://gerrit.wikimedia.org/r/348451 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3dcdd748191fc653544524255a6f72518e3a7627 Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Magul <tomasz.magulski(a)gmail.com> Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

6 years, 12 months

[Gerrit] pywikibot/core[master]: [IMPR] use OptionHandler class for PageFromFileReader

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/272317 ) Change subject: [IMPR] use OptionHandler class for PageFromFileReader ...................................................................... [IMPR] use OptionHandler class for PageFromFileReader - derive PageFromFileReader from OptionHandler class - simplify arg parsing in handle_args method Change-Id: I42ea2ff0d368217c2e30f9249cec2a8f7cb3381d --- M scripts/pagefromfile.py 1 file changed, 52 insertions(+), 62 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/pagefromfile.py b/scripts/pagefromfile.py index 577dcfb..e064ff4 100755 --- a/scripts/pagefromfile.py +++ b/scripts/pagefromfile.py @@ -18,7 +18,6 @@ Specific arguments: -begin:xxx Specify the text that marks the beginning of a page --start:xxx (deprecated) -end:xxx Specify the text that marks the end of a page -file:xxx Give the filename we are getting our material from (default: dict.txt) @@ -57,7 +56,7 @@ """ # # (C) Andre Engels, 2004 -# (C) Pywikibot team, 2005-2016 +# (C) Pywikibot team, 2005-2017 # # Distributed under the terms of the MIT license. # @@ -76,6 +75,7 @@ from pywikibot import config, i18n from pywikibot.bot import SingleSiteBot, CurrentPageBot +from pywikibot.bot import OptionHandler from pywikibot.exceptions import ArgumentDeprecationWarning @@ -187,25 +187,39 @@ show_diff=self.getOption('showdiff')) -class PageFromFileReader(object): +class PageFromFileReader(OptionHandler): """Generator class, responsible for reading the file.""" - def __init__(self, filename, pageStartMarker, pageEndMarker, - titleStartMarker, titleEndMarker, include, notitle): + # Adapt these to the file you are using. 'begin' and + # 'end' are the beginning and end of each entry. Take text that + # should be included and does not occur elsewhere in the text. + + # TODO: make config variables for these. + availableOptions = { + 'begin': '{{-start-}}', + 'end': '{{-stop-}}', + 'titlestart': "'''", + 'titleend': "'''", + 'include': False, + 'notitle': False, + } + + def __init__(self, filename, **kwargs): """Constructor. Check if self.file name exists. If not, ask for a new filename. User can quit. """ + super(PageFromFileReader, self).__init__(**kwargs) self.filename = filename - self.pageStartMarker = pageStartMarker - self.pageEndMarker = pageEndMarker - self.titleStartMarker = titleStartMarker - self.titleEndMarker = titleEndMarker - self.include = include - self.notitle = notitle + self.pageStartMarker = self.getOption('begin') + self.pageEndMarker = self.getOption('end') + self.titleStartMarker = self.getOption('titlestart') + self.titleEndMarker = self.getOption('titleend') + self.include = self.getOption('include') + self.notitle = self.getOption('notitle') def __iter__(self): """Read file and yield a tuple of page title and content.""" @@ -270,61 +284,39 @@ @param args: command line arguments @type args: list of unicode """ - # Adapt these to the file you are using. 'pageStartMarker' and - # 'pageEndMarker' are the beginning and end of each entry. Take text that - # should be included and does not occur elsewhere in the text. - - # TODO: make config variables for these. filename = "dict.txt" - pageStartMarker = "{{-start-}}" - pageEndMarker = "{{-stop-}}" - titleStartMarker = u"'''" - titleEndMarker = u"'''" options = {} - include = False - notitle = False + r_options = {} for arg in pywikibot.handle_args(args): - if arg.startswith('-start:'): - pageStartMarker = arg[7:] - warn('-start param (text that marks the beginning) of a page has been ' - 'deprecated in favor of begin; make sure to use the updated param.', - ArgumentDeprecationWarning) - elif arg.startswith('-begin:'): - pageStartMarker = arg[len('-begin:'):] - elif arg.startswith("-end:"): - pageEndMarker = arg[5:] - elif arg.startswith("-file:"): - filename = arg[6:] - elif arg == "-include": - include = True - elif arg.startswith('-appendbottom'): - options['append'] = ('bottom', arg[len('-appendbottom:'):]) - elif arg.startswith('-appendtop'): - options['append'] = ('top', arg[len('-appendtop:'):]) - elif arg == "-force": - options['force'] = True - elif arg == "-safe": + arg, sep, value = arg.partition(':') + option = arg.partition('-')[2] + # reader options + if option == 'start': + r_options['begin'] = value + warn('-start param (text that marks the beginning) of a page has ' + 'been deprecated in favor of begin; make sure to use the ' + 'updated param.', ArgumentDeprecationWarning) + elif option in ('begin', 'end', 'titlestart', 'titleend'): + r_options[option] = value + elif option == 'file': + filename = value + elif option in ('include', 'notitle'): + r_options[option] = True + # bot options + elif option == 'appendbottom': + options['append'] = ('bottom', value) + elif option == 'appendtop': + options['append'] = ('top', value) + elif option in ('force', 'minor', 'autosummary', 'showdiff'): + options[option] = True + elif option == 'safe': options['force'] = False options['append'] = None - elif arg == "-noredirect": + elif option == 'noredirect': options['redirect'] = False - elif arg == '-notitle': - notitle = True - elif arg == '-minor': - options['minor'] = True - elif arg.startswith('-nocontent:'): - options['nocontent'] = arg[11:] - elif arg.startswith("-titlestart:"): - titleStartMarker = arg[12:] - elif arg.startswith("-titleend:"): - titleEndMarker = arg[10:] - elif arg.startswith("-summary:"): - options['summary'] = arg[9:] - elif arg == '-autosummary': - options['autosummary'] = True - elif arg == '-showdiff': - options['showdiff'] = True + elif option in ('nocontent', 'summary'): + options[option] = value else: pywikibot.output(u"Disregarding unknown argument %s." % arg) @@ -345,9 +337,7 @@ pywikibot.bot.suggest_help(missing_parameters=['-file']) return False else: - reader = PageFromFileReader(filename, pageStartMarker, pageEndMarker, - titleStartMarker, titleEndMarker, include, - notitle) + reader = PageFromFileReader(filename, **r_options) bot = PageFromFileRobot(generator=reader, **options) bot.run() -- To view, visit https://gerrit.wikimedia.org/r/272317 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I42ea2ff0d368217c2e30f9249cec2a8f7cb3381d Gerrit-PatchSet: 11 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, 12 months

[Gerrit] pywikibot/core[master]: site_tests.py: Use datetime.utcnow() instead of datetime.now()

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/349736 ) Change subject: site_tests.py: Use datetime.utcnow() instead of datetime.now() ...................................................................... site_tests.py: Use datetime.utcnow() instead of datetime.now() Also: - Move the test to an uncached class. Due to the time-dependant nature of the test, the cached response could cause the test to fail in some cases. - Increase the time buffer to 30 minutes, this is to make sure the item has not been connected recently. - Print the related `item` in the error message which will be helpful in debugging. Bug: T163619 Change-Id: I4f6e2684173bd465a423c75c5442595df019d73e --- M tests/site_tests.py 1 file changed, 33 insertions(+), 28 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/tests/site_tests.py b/tests/site_tests.py index ba943c1..07c1b1a 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -966,34 +966,6 @@ self.assertNotIn(page.protection()['edit'][0], invalid_levels) self.assertLessEqual(len(pages), 10) - def test_unconnected(self): - """Test that the ItemPage returned raises NoPage.""" - if not self.site.data_repository(): - raise unittest.SkipTest('Site is not using a Wikibase repository') - if self.site.hostname() == 'test.wikipedia.org': - raise unittest.SkipTest('test.wikipedia is misconfigured; T85358') - cnt = 0 - start_time = datetime.now() - timedelta(minutes=5) - # Pages which have been connected recently may still be reported as - # unconnected. So try on an version that is a few minutes older if the - # tested site appears as a sitelink. - for page in self.site.unconnected_pages(total=5): - try: - item = pywikibot.ItemPage.fromPage(page) - except pywikibot.NoPage: - pass - else: - revisions = list(item.revisions(total=1, starttime=start_time, - content=True)) - if revisions: - sitelinks = json.loads(revisions[0].text)['sitelinks'] - self.assertNotIn( - self.site.dbName(), sitelinks, - 'Page "{0}" is connected to a Wikibase ' - 'repository'.format(page.title())) - cnt += 1 - self.assertLessEqual(cnt, 5) - def test_pages_with_property(self): """Test pages_with_property method.""" if MediaWikiVersion(self.site.version()) < MediaWikiVersion('1.21'): @@ -1015,6 +987,39 @@ 'NotImplementedError not raised for {0}'.format(item)) +class TestSiteGeneratorsUncached(DefaultSiteTestCase): + + """Test cases for Site methods.""" + + def test_unconnected(self): + """Test that the ItemPage returned raises NoPage.""" + if not self.site.data_repository(): + raise unittest.SkipTest('Site is not using a Wikibase repository') + if self.site.hostname() == 'test.wikipedia.org': + raise unittest.SkipTest('test.wikipedia is misconfigured; T85358') + cnt = 0 + # Pages which have been connected recently may still be reported as + # unconnected. So try on a version that is a few minutes older if the + # tested site appears as a sitelink. + start_time = datetime.utcnow() - timedelta(minutes=30) + for page in self.site.unconnected_pages(total=3): + try: + item = pywikibot.ItemPage.fromPage(page) + except pywikibot.NoPage: + pass + else: + revisions = list(item.revisions(total=1, starttime=start_time, + content=True)) + if revisions: + sitelinks = json.loads(revisions[0].text)['sitelinks'] + self.assertNotIn( + self.site.dbName(), sitelinks, + 'Page "{0}" is connected to {1} on Wikibase ' + 'repository'.format(page.title(), item)) + cnt += 1 + self.assertLessEqual(cnt, 3) + + class TestImageUsage(DefaultSiteTestCase): """Test cases for Site.imageusage method.""" -- To view, visit https://gerrit.wikimedia.org/r/349736 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4f6e2684173bd465a423c75c5442595df019d73e Gerrit-PatchSet: 3 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, 12 months

[Gerrit] pywikibot/core[master]: [IMPR] Introduce user_add_claim and allow asynchronous ItemP...

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/348479 ) Change subject: [IMPR] Introduce user_add_claim and allow asynchronous ItemPage.addClaim ...................................................................... [IMPR] Introduce user_add_claim and allow asynchronous ItemPage.addClaim Bug: T87493 Change-Id: I05f02939f8797dff1914fc141bd2b4ca289a60c1 --- M pywikibot/bot.py M pywikibot/page.py M scripts/claimit.py M scripts/harvest_template.py M scripts/illustrate_wikidata.py 5 files changed, 63 insertions(+), 22 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/pywikibot/bot.py b/pywikibot/bot.py index 4cef28a..eea0052 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -1916,6 +1916,54 @@ # (bug T86083) return self._save_page(item, item.editEntity, data, **kwargs) + def _add_source_callback(self, claim, source, **kwargs): + """ + Make a callback for user_add_claim. + + @return: callback to be executed after saving the claim + @rtype: callable or None + """ + callback = None + sourceclaim = self.getSource(source) + if sourceclaim: + def callback(item, err): + if err is None and claim.on_item is not None: + claim.addSource(sourceclaim, **kwargs) + + return callback + + def user_add_claim(self, item, claim, source=None, bot=True, **kwargs): + """ + Add a claim to an item, with user confirmation as required. + + @param item: page to be edited + @type item: pywikibot.ItemPage + @param claim: claim to be saved + @type claim: pywikibot.Claim + @param source: site where the claim comes from + @type source: pywikibot.site.APISite + @param bot: whether to flag as bot (if possible) + @type bot: bool + @kwarg ignore_server_errors: if True, server errors will be reported + and ignored (default: False) + @type ignore_server_errors: bool + @kwarg ignore_save_related_errors: if True, errors related to + page save will be reported and ignored (default: False) + @type ignore_save_related_errors: bool + @return: whether the item was saved successfully + @rtype: bool + """ + self.current_page = item + + callback = None + if source: + callback = self._add_source_callback(claim, source, bot=bot) + + pywikibot.output('Adding %s --> %s' % (claim.getID(), + claim.getTarget())) + return self._save_page(item, item.addClaim, claim, bot=bot, + callback=callback, **kwargs) + def getSource(self, site): """ Create a Claim usable as a source for Wikibase statements. diff --git a/pywikibot/page.py b/pywikibot/page.py index b57317e..0a5ecd3 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -4263,6 +4263,7 @@ data = {'sitelinks': data} self.editEntity(data, **kwargs) + @allow_asynchronous def addClaim(self, claim, bot=True, **kwargs): """ Add a claim to the item. @@ -4271,6 +4272,15 @@ @type claim: Claim @param bot: Whether to flag as bot (if possible) @type bot: bool + @keyword asynchronous: if True, launch a separate thread to add claim + asynchronously + @type asynchronous: bool + @keyword callback: a callable object that will be called after the + claim has been added. It must take two arguments: (1) an ItemPage + object, and (2) an exception instance, which will be None if the + item was saved successfully. This is intended for use by bots that + need to keep track of which saves were successful. + @type callback: callable """ self.repo.addClaim(self, claim, bot=bot, **kwargs) claim.on_item = self diff --git a/scripts/claimit.py b/scripts/claimit.py index cd2993c..19142df 100755 --- a/scripts/claimit.py +++ b/scripts/claimit.py @@ -83,6 +83,7 @@ * exists_arg - String specifying how to handle duplicate claims """ + self.availableOptions['always'] = True super(ClaimRobot, self).__init__(use_from_page=None) self.generator = generator self.claims = claims @@ -142,15 +143,8 @@ break skip = False if not skip: - pywikibot.output('Adding %s --> %s' - % (claim.getID(), claim.getTarget())) - item.addClaim(claim) # A generator might yield pages from multiple languages - source = self.getSource(page.site) - if source: - claim.addSource(source, bot=True) - # TODO FIXME: We need to check that we aren't adding a - # duplicate + self.user_add_claim(item, claim, page.site) def listsEqual(list1, list2): diff --git a/scripts/harvest_template.py b/scripts/harvest_template.py index 62d24c6..309705e 100755 --- a/scripts/harvest_template.py +++ b/scripts/harvest_template.py @@ -71,6 +71,7 @@ * fields - A dictionary of fields that are of use to us """ + self.availableOptions['always'] = True super(HarvestRobot, self).__init__() self.generator = pg.PreloadingGenerator(generator) self.templateTitle = templateTitle.replace(u'_', u' ') @@ -211,14 +212,8 @@ % claim.type) continue - pywikibot.output( - 'Adding %s --> %s' - % (claim.getID(), claim.getTarget())) - item.addClaim(claim) # A generator might yield pages from multiple sites - source = self.getSource(page.site) - if source: - claim.addSource(source, bot=True) + self.user_add_claim(item, claim, page.site) def main(*args): diff --git a/scripts/illustrate_wikidata.py b/scripts/illustrate_wikidata.py index 6e0f91a..243be1c 100755 --- a/scripts/illustrate_wikidata.py +++ b/scripts/illustrate_wikidata.py @@ -84,14 +84,8 @@ return newclaim.setTarget(image) - pywikibot.output('Adding %s --> %s' - % (newclaim.getID(), newclaim.getTarget())) - item.addClaim(newclaim) - # A generator might yield pages from multiple sites - source = self.getSource(page.site) - if source: - newclaim.addSource(source, bot=True) + self.user_add_claim(item, newclaim, page.site) def main(*args): -- To view, visit https://gerrit.wikimedia.org/r/348479 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I05f02939f8797dff1914fc141bd2b4ca289a60c1 Gerrit-PatchSet: 6 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Matěj Suchánek <matejsuchanek97(a)gmail.com> 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: Matěj Suchánek <matejsuchanek97(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, 12 months

[Gerrit] pywikibot/core[master]: Improve argument handling in allow_asynchronous decorator

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/349470 ) Change subject: Improve argument handling in allow_asynchronous decorator ...................................................................... Improve argument handling in allow_asynchronous decorator The previous signature didn't play well with positional arguments. Change-Id: Ia24130f3b39e816556cbf5f2a6620e09663649fc --- M pywikibot/page.py 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/pywikibot/page.py b/pywikibot/page.py index 6295b21..b57317e 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -113,7 +113,9 @@ a callable that gets the page as the first and a possible exception that occurred during saving in the second thread or None as the second argument. """ - def handle(func, self, do_async=False, callback=None, *args, **kwargs): + def handle(func, self, *args, **kwargs): + do_async = kwargs.pop('asynchronous', False) + callback = kwargs.pop('callback', None) err = None try: func(self, *args, **kwargs) @@ -131,10 +133,8 @@ callback(self, err) def wrapper(self, *args, **kwargs): - do_async = kwargs.pop('asynchronous', False) - if do_async: - pywikibot.async_request(handle, func, self, do_async=True, - *args, **kwargs) + if kwargs.get('asynchronous'): + pywikibot.async_request(handle, func, self, *args, **kwargs) else: handle(func, self, *args, **kwargs) -- To view, visit https://gerrit.wikimedia.org/r/349470 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia24130f3b39e816556cbf5f2a6620e09663649fc Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Magul <tomasz.magulski(a)gmail.com> Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

6 years, 12 months

Broken: wikimedia/pywikibot-core#3996 (master - e72afad)

by Travis CI

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3996 Status: Broken Duration: 2 hours, 44 minutes, and 0 seconds Commit: e72afad (master) Author: jenkins-bot Message: Merge "site_detect.py: Check the response in _parse_post_117 for server errors" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/04f9c0574c18...e72afad7… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/223916988 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

6 years, 12 months

Broken: wikimedia/pywikibot-core#3995 (master - 04f9c05)

by Travis CI

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3995 Status: Broken Duration: 2 hours, 21 minutes, and 43 seconds Commit: 04f9c05 (master) Author: jenkins-bot Message: Merge "Fix invalid escape sequences" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/913bda20e55d...04f9c057… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/223915281 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

6 years, 12 months

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits April 2017