Pywikibot-commits August 2014

pywikibot-commits@lists.wikimedia.org

1 participants
196 discussions

[Gerrit] new CoordImportRobot.has_coord_qualifier() method - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: new CoordImportRobot.has_coord_qualifier() method ...................................................................... new CoordImportRobot.has_coord_qualifier() method to check if the 'coordinates' property is already used as qualifier for another claim and, in that case, avoid adding that property again. also done some minor cleanup bug: 65430 Change-Id: I0759cca01de15a6884708341e79cd3403b4af74e --- M scripts/coordinate_import.py 1 file changed, 39 insertions(+), 15 deletions(-) Approvals: John Vandenberg: Looks good to me, approved Multichill: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/scripts/coordinate_import.py b/scripts/coordinate_import.py index 160686a..75cfe06 100644 --- a/scripts/coordinate_import.py +++ b/scripts/coordinate_import.py @@ -42,11 +42,26 @@ self.generator = pagegenerators.PreloadingGenerator(generator) self.repo = pywikibot.Site().data_repository() self.cacheSources() + self.prop = 'P625' + + def has_coord_qualifier(self, claims): + """ + Check if self.prop is used as property for a qualifier. + + @param claims: the Wikibase claims to check in + @type claims: dict + @return: the first property for which self.prop + is used as qualifier, or None if any + @returntype: unicode or None + + """ + for prop in claims: + for claim in claims[prop]: + if self.prop in claim.qualifiers: + return prop def run(self): - """ - Starts the robot. - """ + """Start the robot.""" for page in self.generator: pywikibot.output(u'Working on %s' % page.title()) item = pywikibot.ItemPage.fromPage(page) @@ -57,20 +72,29 @@ if coordinate: claims = item.get().get('claims') - if u'P625' in claims: - pywikibot.output(u'Item %s already contains coordinates (P625)' % item.title()) + if self.prop in claims: + pywikibot.output(u'Item %s already contains coordinates (%s)' + % (item.title(), self.prop)) else: - newclaim = pywikibot.Claim(self.repo, u'P625') - newclaim.setTarget(coordinate) - pywikibot.output(u'Adding %s, %s to %s' % (coordinate.lat, coordinate.lon, item.title())) - try: - item.addClaim(newclaim) + prop = self.has_coord_qualifier(claims) + if prop: + pywikibot.output(u'Item %s already contains coordinates' + u' (%s) as qualifier for %s' + % (item.title(), self.prop, prop)) + else: + newclaim = pywikibot.Claim(self.repo, self.prop) + newclaim.setTarget(coordinate) + pywikibot.output(u'Adding %s, %s to %s' % (coordinate.lat, + coordinate.lon, + item.title())) + try: + item.addClaim(newclaim) - source = self.getSource(page.site) - if source: - newclaim.addSource(source, bot=True) - except CoordinateGlobeUnknownException as e: - pywikibot.output(u'Skipping unsupported globe: %s' % e.args) + source = self.getSource(page.site) + if source: + newclaim.addSource(source, bot=True) + except CoordinateGlobeUnknownException as e: + pywikibot.output(u'Skipping unsupported globe: %s' % e.args) def main(): -- To view, visit https://gerrit.wikimedia.org/r/148686 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0759cca01de15a6884708341e79cd3403b4af74e Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ricordisamoa <ricordisamoa(a)openmailbox.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Multichill <maarten(a)mdammers.nl> Gerrit-Reviewer: Ricordisamoa <ricordisamoa(a)openmailbox.org> Gerrit-Reviewer: jenkins-bot <>

9 years, 8 months

[Gerrit] Port watchlist.py to core - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Port watchlist.py to core ...................................................................... Port watchlist.py to core Major changes from compat: - Added Wikidata support (see lines 99-102) - Removed _refreshOld() method for fetching data without using API bug: 57995 Change-Id: Ie8f35ed77a22ad950fd5429ca4e823fa2a0aed75 --- A scripts/watchlist.py 1 file changed, 166 insertions(+), 0 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/watchlist.py b/scripts/watchlist.py new file mode 100755 index 0000000..2509088 --- /dev/null +++ b/scripts/watchlist.py @@ -0,0 +1,166 @@ +# -*- coding: utf-8 -*- +""" +Allows access to the bot account's watchlist. + +The function refresh() downloads the current watchlist and saves it to disk. It +is run automatically when a bot first tries to save a page retrieved. The +watchlist can be updated manually by running this script. The list will also +be reloaded automatically once a month. + +Syntax: python watchlist [-all] + +Command line options: + -all - Reloads watchlists for all wikis where a watchlist is already + present + -new - Load watchlists for all wikis where accounts is setting in + user-config.py +""" +# +# (C) Daniel Herding, 2005 +# (C) Pywikibot team, 2005-2014 +# +# Distributed under the terms of the MIT license. +# +__version__ = '$Id$' +# + +import pywikibot +from pywikibot import config +import re +import sys +import pickle +import os.path +import time + +cache = {} + + +def get(site=None): + if site is None: + site = pywikibot.Site() + if site in cache: + # Use cached copy if it exists. + watchlist = cache[site] + else: + fn = config.datafilepath('watchlists', + 'watchlist-%s-%s.dat' + % (site.family.name, site.lang)) + try: + # find out how old our saved dump is (in seconds) + file_age = time.time() - os.path.getmtime(fn) + # if it's older than 1 month, reload it + if file_age > 30 * 24 * 60 * 60: + pywikibot.output( + u'Copy of watchlist is one month old, reloading') + refresh(site) + except OSError: + # no saved watchlist exists yet, retrieve one + refresh(site) + f = open(fn, 'r') + watchlist = pickle.load(f) + f.close() + # create cached copy + cache[site] = watchlist + return watchlist + + +def isWatched(pageName, site=None): + watchlist = get(site) + return pageName in watchlist + + +def refresh(site, sysop=False): + # get watchlist special page's URL + if not site.logged_in(sysop=sysop): + site.forceLogin(sysop=sysop) + + params = { + 'action': 'query', + 'list': 'watchlistraw', + 'site': site, + 'wrlimit': config.special_page_limit, + } + + pywikibot.output(u'Retrieving watchlist for %s via API.' % str(site)) + # pywikibot.put_throttle() # It actually is a get, but a heavy one. + watchlist = [] + while True: + req = pywikibot.data.api.Request(**params) + data = req.submit() + if 'error' in data: + raise RuntimeError('ERROR: %s' % data) + watchlist.extend([w['title'] for w in data['watchlistraw']]) + + if 'query-continue' in data: + params.update(data['query-continue']['watchlistraw']) + else: + break + + if site.family.name == 'wikidata': + lang = 'wikidata' + else: + lang = site.lang + + # Save the watchlist to disk + # The file is stored in the watchlists subdir. Create if necessary. + f = open(config.datafilepath('watchlists', + 'watchlist-%s-%s%s.dat' + % (site.family.name, lang, '-sysop' if sysop else '')), + 'w') + pickle.dump(watchlist, f) + f.close() + + +def refresh_all(new=False, sysop=False): + if new: + pywikibot.output( + 'Downloading All watchlists for your accounts in user-config.py') + for family in config.usernames: + for lang in config.usernames[family]: + refresh(pywikibot.Site(lang, family), sysop=sysop) + for family in config.sysopnames: + for lang in config.sysopnames[family]: + refresh(pywikibot.Site(lang, family), sysop=sysop) + + else: + import dircache + filenames = dircache.listdir( + config.datafilepath('watchlists')) + watchlist_filenameR = re.compile('watchlist-([a-z\-:]+).dat') + for filename in filenames: + match = watchlist_filenameR.match(filename) + if match: + arr = match.group(1).split('-') + family = arr[0] + lang = '-'.join(arr[1:]) + refresh(pywikibot.Site(lang, family)) + + +def main(): + all = False + new = False + sysop = False + for arg in pywikibot.handleArgs(): + if arg in ('-all', '-update'): + all = True + elif arg == '-new': + new = True + elif arg == '-sysop': + sysop = True + if all: + refresh_all(sysop=sysop) + elif new: + refresh_all(new, sysop=sysop) + else: + refresh(pywikibot.Site(), sysop=sysop) + + watchlist = get(pywikibot.Site()) + pywikibot.output(u'%i pages in the watchlist.' % len(watchlist)) + for pageName in watchlist: + pywikibot.output(pageName, toStdout=True) + +if __name__ == "__main__": + try: + main() + finally: + pywikibot.stopme() -- To view, visit https://gerrit.wikimedia.org/r/100363 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie8f35ed77a22ad950fd5429ca4e823fa2a0aed75 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: Guoguo12 <Guoguo12(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(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: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

9 years, 8 months

[Gerrit] fix textlib.getCategoryLinks() for adjacent categories - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: fix textlib.getCategoryLinks() for adjacent categories ...................................................................... fix textlib.getCategoryLinks() for adjacent categories the regex has been fixed (take #3): - characters in the sortKey are now matched in non-greedy mode - spaces at the end of the sortKey are not ignored anymore test_adjoining_links() has been added to TestCategoryRearrangement to make sure that the regular expression always works well. Change-Id: Ia7dbe5007c34af8a457e8952ef727928e02f8d4d --- M pywikibot/textlib.py M tests/textlib_tests.py 2 files changed, 15 insertions(+), 5 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index f9a06b0..585ba77 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -663,7 +663,7 @@ text = removeDisabledParts(text) catNamespace = '|'.join(site.category_namespaces()) R = re.compile(r'\[\[\s*(?P<namespace>%s)\s*:\s*(?P<catName>.+?)' - r'(?:\|(?P<sortKey>.*))?\s*\]\]' + r'(?:\|(?P<sortKey>.*?))?\]\]' % catNamespace, re.I) for match in R.finditer(text): cat = pywikibot.Category(pywikibot.Link( diff --git a/tests/textlib_tests.py b/tests/textlib_tests.py index 72958c7..edcead9 100644 --- a/tests/textlib_tests.py +++ b/tests/textlib_tests.py @@ -134,7 +134,8 @@ """ Tests to ensure that sorting keys are not being lost when - using .getCategoryLinks() and .replaceCategoryLinks(). + using .getCategoryLinks() and .replaceCategoryLinks(), + with both a newline and an empty string as separators. """ @classmethod @@ -143,12 +144,21 @@ cls.old = ('[[Category:Cat1]]%(LS)s[[Category:Cat2|]]%(LS)s' '[[Category:Cat1| ]]%(LS)s[[Category:Cat2|key]]' % {'LS': config.LS}) + cls.cats = textlib.getCategoryLinks(cls.old, site=cls.site) - def test_replace_category_links(self): - cats = textlib.getCategoryLinks(self.old, site=self.site) - new = textlib.replaceCategoryLinks(self.old, cats, site=self.site) + def test_standard_links(self): + new = textlib.replaceCategoryLinks(self.old, self.cats, site=self.site) self.assertEqual(self.old, new) + def test_adjoining_links(self): + old = self.old.replace(config.LS, '') + cats = textlib.getCategoryLinks(old, site=self.site) + self.assertEqual(self.cats, cats) + sep = config.LS + config.line_separator = '' # use an empty separator temporarily + new = textlib.replaceCategoryLinks(old, cats, site=self.site) + self.assertEqual(old, new) + config.line_separator = sep # restore the default separator if __name__ == '__main__': try: -- To view, visit https://gerrit.wikimedia.org/r/148553 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia7dbe5007c34af8a457e8952ef727928e02f8d4d Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ricordisamoa <ricordisamoa(a)openmailbox.org> 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: Russell Blau <russblau(a)imapmail.org> Gerrit-Reviewer: jenkins-bot <>

9 years, 8 months

[Gerrit] Code improvements, split code into parts - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Code improvements, split code into parts ...................................................................... Code improvements, split code into parts - findTranslated() becomes a generator - Split featuredWithInterwiki() into main loop and - add_template() to place/change the template Change-Id: I40693c603423ee7aabba53a4226df20c1e81b88b --- M scripts/featured.py 1 file changed, 115 insertions(+), 111 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/featured.py b/scripts/featured.py index 5bdc367..cc374ae 100644 --- a/scripts/featured.py +++ b/scripts/featured.py @@ -229,7 +229,9 @@ self.filename = None self.site = pywikibot.Site() self.repo = self.site.data_repository() - if self.getOption('fromlang') is True: # must be a list + + # if no source site is given, give up + if self.getOption('fromlang') is True: self.options['fromlang'] = False # setup tasks running @@ -406,56 +408,49 @@ if not quiet: pywikibot.output(u"%s -> no corresponding page in %s" % (page.title(), oursite)) - return - - if ourpage.section(): + elif ourpage.section(): pywikibot.output(u"%s -> our page is a section link: %s" % (page.title(), ourpage.title())) - return - - if not ourpage.exists(): + elif not ourpage.exists(): pywikibot.output(u"%s -> our page doesn't exist: %s" % (page.title(), ourpage.title())) - return + else: + if ourpage.isRedirectPage(): + ourpage = ourpage.getRedirectTarget() - if ourpage.isRedirectPage(): - ourpage = ourpage.getRedirectTarget() - pywikibot.output(u"%s -> corresponding page is %s" - % (page.title(), ourpage.title())) - if ourpage.namespace() != 0: - pywikibot.output(u"%s -> not in the main namespace, skipping" - % page.title()) - return - - if ourpage.isRedirectPage(): - pywikibot.output(u"%s -> double redirect, skipping" % page.title()) - return - - if not ourpage.exists(): - pywikibot.output(u"%s -> page doesn't exist, skipping" - % ourpage.title()) - return - - backpage = None - for link in ourpage.iterlanglinks(): - if link.site == page.site: - backpage = pywikibot.Page(link) - break - - if not backpage: - pywikibot.output(u"%s -> no back interwiki ref" % page.title()) - return - - if backpage == page: - # everything is ok - return ourpage - if backpage.isRedirectPage(): - backpage = backpage.getRedirectTarget() - if backpage == page: - # everything is ok - return ourpage - pywikibot.output(u"%s -> back interwiki ref target is %s" - % (page.title(), backpage.title())) + pywikibot.output(u"%s -> corresponding page is %s" + % (page.title(), ourpage.title())) + if ourpage.namespace() != 0: + pywikibot.output(u"%s -> not in the main namespace, skipping" + % page.title()) + elif ourpage.isRedirectPage(): + pywikibot.output(u"%s -> double redirect, skipping" % page.title()) + elif not ourpage.exists(): + pywikibot.output(u"%s -> page doesn't exist, skipping" + % ourpage.title()) + else: + backpage = None + for link in ourpage.iterlanglinks(): + if link.site == page.site: + backpage = pywikibot.Page(link) + break + if not backpage: + pywikibot.output(u"%s -> no back interwiki ref" % page.title()) + elif backpage == page: + # everything is ok + yield ourpage + elif backpage.isRedirectPage(): + backpage = backpage.getRedirectTarget() + if backpage == page: + # everything is ok + yield ourpage + else: + pywikibot.output( + u"%s -> back interwiki ref target is redirect to %s" + % (page.title(), backpage.title())) + else: + pywikibot.output(u"%s -> back interwiki ref target is %s" + % (page.title(), backpage.title())) def getTemplateList(self, code, task): add_templates = [] @@ -497,14 +492,12 @@ return add_templates, remove_templates def featuredWithInterwiki(self, fromsite, task): - """Place or remove the Link_GA/FA template on/from a page""" + """ Read featured articles and find the corresponding pages. - def compile_link(site, templates): - """compile one link template list""" - findtemplate = '(%s)' % '|'.join(templates) - return re.compile(r"\{\{%s\|%s\}\}" - % (findtemplate.replace(u' ', u'[ _]'), - site.code), re.IGNORECASE) + Find corresponding pages on other sites, place the template and + remember the page in the cache dict. + + """ tosite = self.site if fromsite.code not in self.cache: @@ -522,73 +515,84 @@ return # count only, we are ready here gen = PreloadingGenerator(gen) - add_tl, remove_tl = self.getTemplateList(tosite.code, task) - re_Link_add = compile_link(fromsite, add_tl) - re_Link_remove = compile_link(fromsite, remove_tl) - interactive = self.getOption('interactive') for source in gen: if source.isRedirectPage(): source = source.getRedirectTarget() if not source.exists(): pywikibot.output(u"source page doesn't exist: %s" - % source.title()) + % source) continue - atrans = self.findTranslated(source, tosite) - if not atrans: - continue + for dest in self.findTranslated(source, tosite): + self.add_template(source, dest, task, fromsite) + cc[source.title()] = dest.title() - text = atrans.text - m1 = add_tl and re_Link_add.search(text) - m2 = remove_tl and re_Link_remove.search(text) - changed = False - if add_tl: - if m1: - pywikibot.output(u"(already added)") - else: - # insert just before interwiki - if (not interactive or - pywikibot.input( - u'Connecting %s -> %s. Proceed? [Y/N]' - % (source.title(), atrans.title())) in ['Y', 'y']): - if self.getOption('side'): - # Placing {{Link FA|xx}} right next to - # corresponding interwiki - text = (text[:m1.end()] + - u" {{%s|%s}}" % (add_tl[0], fromsite.code) + - text[m1.end():]) - else: - # Moving {{Link FA|xx}} to top of interwikis - iw = pywikibot.getLanguageLinks(text, self.site) - text = pywikibot.removeLanguageLinks(text, self.site) - text += u"%s{{%s|%s}}%s" % (LS, add_tl[0], - fromsite.code, LS) - text = pywikibot.replaceLanguageLinks(text, - iw, self.site) - changed = True - if remove_tl: - if m2: - if (changed or # Don't force the user to say "Y" twice - not interactive or - pywikibot.input( - u'Connecting %s -> %s. Proceed? [Y/N]' - % (source.title(), atrans.title())) in ['Y', 'y']): - text = re.sub(re_Link_remove, '', text) - changed = True - elif task == 'former': - pywikibot.output(u"(already removed)") - cc[source.title()] = atrans.title() - if changed: - comment = i18n.twtranslate(self.site, 'featured-' + task, - {'page': unicode(source)}) - try: - atrans.put(text, comment) - except pywikibot.LockedPage: - pywikibot.output(u'Page %s is locked!' - % atrans.title()) - except pywikibot.PageNotSaved: - pywikibot.output(u"Page not saved") + def add_template(self, source, dest, task, fromsite): + """Place or remove the Link_GA/FA template on/from a page.""" + + def compile_link(site, templates): + """compile one link template list.""" + findtemplate = '(%s)' % '|'.join(templates) + return re.compile(r"\{\{%s\|%s\}\}" + % (findtemplate.replace(u' ', u'[ _]'), + site.code), re.IGNORECASE) + + tosite = dest.site + add_tl, remove_tl = self.getTemplateList(tosite.code, task) + re_Link_add = compile_link(fromsite, add_tl) + re_Link_remove = compile_link(fromsite, remove_tl) + + text = dest.text + m1 = add_tl and re_Link_add.search(text) + m2 = remove_tl and re_Link_remove.search(text) + changed = False + interactive = self.getOption('interactive') + if add_tl: + if m1: + pywikibot.output(u"(already added)") + else: + # insert just before interwiki + if (not interactive or + pywikibot.input( + u'Connecting %s -> %s. Proceed? [Y/N]' + % (source.title(), dest.title())) in ['Y', 'y']): + if self.getOption('side'): + # Placing {{Link FA|xx}} right next to + # corresponding interwiki + text = (text[:m1.end()] + + u" {{%s|%s}}" % (add_tl[0], fromsite.code) + + text[m1.end():]) + else: + # Moving {{Link FA|xx}} to top of interwikis + iw = pywikibot.getLanguageLinks(text, tosite) + text = pywikibot.removeLanguageLinks(text, tosite) + text += u"%s{{%s|%s}}%s" % (LS, add_tl[0], + fromsite.code, LS) + text = pywikibot.replaceLanguageLinks(text, + iw, tosite) + changed = True + if remove_tl: + if m2: + if (changed or # Don't force the user to say "Y" twice + not interactive or + pywikibot.input( + u'Connecting %s -> %s. Proceed? [Y/N]' + % (source.title(), dest.title())) in ['Y', 'y']): + text = re.sub(re_Link_remove, '', text) + changed = True + elif task == 'former': + pywikibot.output(u"(already removed)") + if changed: + comment = i18n.twtranslate(tosite, 'featured-' + task, + {'page': unicode(source)}) + try: + dest.put(text, comment) + except pywikibot.LockedPage: + pywikibot.output(u'Page %s is locked!' + % dest.title()) + except pywikibot.PageNotSaved: + pywikibot.output(u"Page not saved") def main(*args): -- To view, visit https://gerrit.wikimedia.org/r/131475 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I40693c603423ee7aabba53a4226df20c1e81b88b Gerrit-PatchSet: 12 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Alex S.H. Lin <alexsh(a)mail2000.com.tw> Gerrit-Reviewer: Huji <huji.huji(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Nullzero <nullzero.free(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

9 years, 8 months

[Gerrit] Add whitespaces per PEP 8 - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Add whitespaces per PEP 8 ...................................................................... Add whitespaces per PEP 8 Change-Id: Ia1a80643cbb83827f9587dc4bdac4ddc34dbc35d --- M scripts/interwiki.py 1 file changed, 14 insertions(+), 14 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/interwiki.py b/scripts/interwiki.py index 38b1c43..d05a7d4 100755 --- a/scripts/interwiki.py +++ b/scripts/interwiki.py @@ -1429,7 +1429,7 @@ # FIXME: What errors are we catching here? # except: should be avoided!! except: - #raise + # raise pywikibot.output(u'File autonomous_problems.dat open or corrupted! Try again with -restore.') sys.exit() iw = () @@ -1505,7 +1505,7 @@ if page.exists() and not page.isRedirectPage() and not page.isCategoryRedirect(): site = page.site if site.family.interwiki_forward: - #TODO: allow these cases to be propagated! + # TODO: allow these cases to be propagated! continue # inhibit the forwarding families pages to be updated. if site == self.originPage.site: if page != self.originPage: @@ -1552,7 +1552,7 @@ % (i, page2)) self.whereReport(page2, indent=8) while True: - #TODO: allow answer to repeat previous or go back after a mistake + # TODO: allow answer to repeat previous or go back after a mistake answer = pywikibot.input(u"Which variant should be used? (<number>, [n]one, [g]ive up) ").lower() if answer: if answer == 'g': @@ -1583,7 +1583,7 @@ if acceptall: answer = 'a' else: - #TODO: allow answer to repeat previous or go back after a mistake + # TODO: allow answer to repeat previous or go back after a mistake answer = pywikibot.inputChoice(u'What should be done?', ['accept', 'reject', 'give up', 'accept all'], ['a', 'r', 'g', 'l'], 'a') if answer == 'l': # accept all acceptall = True @@ -1639,11 +1639,11 @@ # TODO: should be move to assemble() # replaceLinks will skip the site it's working on. if self.originPage.site not in new: - #TODO: make this possible as well. + # TODO: make this possible as well. if not self.originPage.site.family.interwiki_forward: new[self.originPage.site] = self.originPage - #self.replaceLinks(self.originPage, new, True) + # self.replaceLinks(self.originPage, new, True) updatedSites = [] notUpdatedSites = [] @@ -1727,7 +1727,7 @@ continue mods, mcomment, adding, removing, modifying \ = compareLanguages(old, new, insite=site) - #cannot create pywikibot.User with IP + # cannot create pywikibot.User with IP smallWikiAllowed = ( page.isIpEdit() or len(removing) > 0 or @@ -1771,7 +1771,7 @@ break # disabled graph drawing for minor problems: it just takes too long - #if notUpdatedSites != [] and config.interwiki_graph: + # if notUpdatedSites != [] and config.interwiki_graph: # # at least one site was not updated, save a conflict graph # self.createGraph() @@ -1890,7 +1890,7 @@ if rmsite == page.site: continue rmPage = old[rmsite] - #put it to new means don't delete it + # put it to new means don't delete it if ( not globalvar.cleanup or unicode(rmPage) not in globalvar.remove or @@ -2164,8 +2164,8 @@ if page.isTalkPage(): pywikibot.output(u'Skipping: %s is a talk page' % page) continue - #doesn't work: page must be preloaded for this test - #if page.isEmpty(): + # doesn't work: page must be preloaded for this test + # if page.isEmpty(): # pywikibot.output(u'Skipping: %s is a empty page' % page.title()) # continue if page.namespace() == 10: @@ -2368,8 +2368,8 @@ # Version info marks bots without unicode error # This also prevents abuse filter blocking on de-wiki - #if not pywikibot.unicode_error: - # mcomment += u'r%s) (' % sys.version.split()[0] + # if not pywikibot.unicode_error: + # mcomment += u'r%s) (' % sys.version.split()[0] mcomment += globalvar.summary @@ -2595,7 +2595,7 @@ except WindowsError: pass -#=========== +# =========== globalvar = Global() if __name__ == "__main__": -- To view, visit https://gerrit.wikimedia.org/r/139576 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia1a80643cbb83827f9587dc4bdac4ddc34dbc35d Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Whym <whym(a)whym.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot <>

9 years, 8 months

[Gerrit] fix textlib.getCategoryLinks() and textlib.replaceCategoryLi... - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: fix textlib.getCategoryLinks() and textlib.replaceCategoryLinks() ...................................................................... fix textlib.getCategoryLinks() and textlib.replaceCategoryLinks() by adding the 'site' argument loosely related to bug 58084 Change-Id: I563bb24edb7b1db987b78a2d2ef4d6cb7597289f --- M pywikibot/page.py M scripts/catall.py M scripts/category.py M scripts/commons_link.py M scripts/makecat.py M scripts/replace.py 6 files changed, 13 insertions(+), 8 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index 3396ed1..55d4c71 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -1630,7 +1630,8 @@ # get list of Category objects the article is in and remove possible # duplicates cats = [] - for cat in pywikibot.textlib.getCategoryLinks(self.text): + for cat in pywikibot.textlib.getCategoryLinks(self.text, + site=self.site): if cat not in cats: cats.append(cat) @@ -1655,11 +1656,13 @@ if inPlace or self.namespace() == 10: oldtext = self.get(get_redirect=True) - newtext = pywikibot.replaceCategoryInPlace(oldtext, oldCat, newCat) + newtext = pywikibot.replaceCategoryInPlace(oldtext, oldCat, newCat, + site=self.site) else: if newCat: cats[cats.index(oldCat)] = Category(site, newCat.title(), - sortKey=sortKey) + sortKey=sortKey, + site=self.site) else: cats.pop(cats.index(oldCat)) oldtext = self.get(get_redirect=True) diff --git a/scripts/catall.py b/scripts/catall.py index 15dc8cd..e908bd0 100755 --- a/scripts/catall.py +++ b/scripts/catall.py @@ -64,7 +64,8 @@ for p in list: cattitle = "%s:%s" % (site.category_namespace(), p) pllist.append(pywikibot.Page(site, cattitle)) - page.put_async(pywikibot.replaceCategoryLinks(page.get(), pllist), + page.put_async(pywikibot.replaceCategoryLinks(page.get(), pllist, + site=page.site), comment=i18n.twtranslate(site.code, 'catall-changing')) diff --git a/scripts/category.py b/scripts/category.py index 3923ca0..2d5d754 100755 --- a/scripts/category.py +++ b/scripts/category.py @@ -386,7 +386,7 @@ catpl = self.sorted_by_last_name(catpl, page) pywikibot.output(u'Adding %s' % catpl.title(asLink=True)) cats.append(catpl) - text = pywikibot.replaceCategoryLinks(text, cats) + text = pywikibot.replaceCategoryLinks(text, cats, site=page.site) if not self.save(text, page, newcatTitle): pywikibot.output(u'Page %s not saved.' % page.title(asLink=True)) diff --git a/scripts/commons_link.py b/scripts/commons_link.py index fdc0950..34a7721 100644 --- a/scripts/commons_link.py +++ b/scripts/commons_link.py @@ -83,7 +83,7 @@ text = textlib.replaceCategoryLinks( u'%s{{commons%s|%s}}' % (text, ('', 'cat')[catmode], pagetitle), - cats) + cats, site=page.site) comment = i18n.twtranslate(page.site, 'commons_link%s-template-added' % ('', '-cat')[catmode]) diff --git a/scripts/makecat.py b/scripts/makecat.py index f997906..3db5ecf 100644 --- a/scripts/makecat.py +++ b/scripts/makecat.py @@ -94,7 +94,7 @@ break else: pl.put(pywikibot.replaceCategoryLinks( - text, cats + [actualworkingcat])) + text, cats + [actualworkingcat], site=pl.site)) if cl: if checkforward: for page2 in pl.linkedPages(): diff --git a/scripts/replace.py b/scripts/replace.py index 75b0ccf..ca969dc 100755 --- a/scripts/replace.py +++ b/scripts/replace.py @@ -364,7 +364,8 @@ if self.addedCat not in cats: cats.append(self.addedCat) new_text = pywikibot.replaceCategoryLinks(new_text, - cats) + cats, + site=page.site) # Show the title of the page we're working on. # Highlight the title in purple. pywikibot.output(u"\n\n>>> \03{lightpurple}%s\03{default} <<<" -- To view, visit https://gerrit.wikimedia.org/r/147860 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I563bb24edb7b1db987b78a2d2ef4d6cb7597289f Gerrit-PatchSet: 4 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ricordisamoa <ricordisamoa(a)openmailbox.org> 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: Ricordisamoa <ricordisamoa(a)openmailbox.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

9 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits August 2014