Pywikibot-commits May 2014

pywikibot-commits@lists.wikimedia.org

1 participants
143 discussions

[Gerrit] new APISite.list_to_text() method - change (pywikibot/core)
by jenkins-bot (Code Review) 29 May '14

29 May '14

jenkins-bot has submitted this change and it was merged. Change subject: new APISite.list_to_text() method ...................................................................... new APISite.list_to_text() method to join two or more strings using localized MediaWiki messages added some testcases accordingly Change-Id: I84f2346f6f445089fd87b15c9c2c6612496bfa2a --- M pywikibot/site.py M tests/site_tests.py 2 files changed, 34 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site.py b/pywikibot/site.py index 9599d4c..6e71404 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -952,6 +952,37 @@ return self._months_names + def list_to_text(self, args): + """Join a list of strings together into a human-readable + list. The MediaWiki message 'and' is used as separator + between the last two arguments. + If present, other arguments are joined using a comma. + + @param args: text to be expanded + @type args: iterable + @return: unicode + + """ + if not args: + return u'' + args = [unicode(e) for e in args] + msgs = { + 'and': ',', + 'comma-separator': ', ', + 'word-separator': ' ' + } + try: + self.mediawiki_messages(list(msgs.keys())) + except KeyError: + pass + for msg in msgs: + try: + msgs[msg] = self.mediawiki_message(msg) + except KeyError: + pass + concat = msgs['and'] + msgs['word-separator'] + return msgs['comma-separator'].join(args[:-2] + [concat.join(args[-2:])]) + def expand_text(self, text, title=None, includecomments=None): """ Parses the given text for preprocessing and rendering e.g expand templates and strip comments if includecomments diff --git a/tests/site_tests.py b/tests/site_tests.py index b9e8d34..644b782 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -180,6 +180,9 @@ self.assertType(ver[2], basestring) self.assertType(mysite.months_names, list) self.assertEqual(mysite.months_names[4], (u'May', u'May')) + self.assertEqual(mysite.list_to_text(('pywikibot',)), 'pywikibot') + self.assertEqual(mysite.list_to_text(('Pride', 'Prejudice')), 'Pride and Prejudice') + self.assertEqual(mysite.list_to_text(('This', 'that', 'the other')), 'This, that and the other') def testPageMethods(self): """Test ApiSite methods for getting page-specific info""" -- To view, visit https://gerrit.wikimedia.org/r/135187 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I84f2346f6f445089fd87b15c9c2c6612496bfa2a Gerrit-PatchSet: 8 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ricordisamoa <ricordisamoa(a)openmailbox.org> Gerrit-Reviewer: Ricordisamoa <ricordisamoa(a)openmailbox.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] small changes and typo fixes - change (pywikibot/core)
by jenkins-bot (Code Review) 29 May '14

29 May '14

jenkins-bot has submitted this change and it was merged. Change subject: small changes and typo fixes ...................................................................... small changes and typo fixes asynchroneous → asynchronous remove → removed etc. Change-Id: I44ad4b7a61d0c3dbf4c2b4f90987e479a5c26fdb --- M pywikibot/config2.py M pywikibot/page.py M pywikibot/site.py 3 files changed, 7 insertions(+), 7 deletions(-) Approvals: John Vandenberg: Looks good to me, but someone else must approve Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/config2.py b/pywikibot/config2.py index 4424e89..18b9ca6 100644 --- a/pywikibot/config2.py +++ b/pywikibot/config2.py @@ -609,7 +609,7 @@ # Set simulate to True or use -simulate option to block all actions given above. simulate = False -# How many pages should be put to a queue in asynchroneous mode. +# How many pages should be put to a queue in asynchronous mode. # If maxsize is <= 0, the queue size is infinite. # Increasing this value will increase memory space but could speed up # processing. As higher this value this effect will decrease. diff --git a/pywikibot/page.py b/pywikibot/page.py index b40ec42..01efdf2 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -2750,7 +2750,7 @@ @type claims: list """ - # this check allows single claims to be remove by pushing them into a + # this check allows single claims to be removed by pushing them into a # list of length one. if isinstance(claims, pywikibot.Claim): claims = [claims] diff --git a/pywikibot/site.py b/pywikibot/site.py index a22d8e7..212b029 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -3539,7 +3539,7 @@ return lrgen -class DataSite (APISite): +class DataSite(APISite): def __getattr__(self, attr): """Calls to methods get_info, get_sitelinks, get_aliases, get_labels, @@ -3568,7 +3568,7 @@ @deprecated("pywikibot.PropertyPage") def _get_propertyitem(self, props, source, **params): - """generic method to get the data for multiple Wikibase items""" + """Generic method to get the data for multiple Wikibase items""" wbdata = self.get_item(source, props=props, **params) assert props in wbdata, \ "API wbgetentities response lacks %s key" % props @@ -3576,7 +3576,7 @@ @deprecated("pywikibot.WikibasePage") def get_item(self, source, **params): - """get the data for multiple Wikibase items""" + """Get the data for multiple Wikibase items""" if isinstance(source, int) or \ isinstance(source, basestring) and source.isdigit(): ids = 'q' + str(source) @@ -3585,11 +3585,11 @@ wbdata = wbrequest.submit() assert 'success' in wbdata, \ "API wbgetentities response lacks 'success' key" - assert wbdata['success'] == 1, "API 'success' key ist not 1" + assert wbdata['success'] == 1, "API 'success' key is not 1" assert 'entities' in wbdata, \ "API wbgetentities response lacks 'entities' key" assert ids in wbdata['entities'], \ - "API wbgetentities response lacks %s key" % ids + "API wbgetentities response lacks %s key" % ids return wbdata['entities'][ids] else: # not implemented yet -- To view, visit https://gerrit.wikimedia.org/r/135999 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I44ad4b7a61d0c3dbf4c2b4f90987e479a5c26fdb 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: jenkins-bot <>

1 0

[Gerrit] allow saving a page with empty text - change (pywikibot/core)
by jenkins-bot (Code Review) 28 May '14

28 May '14

jenkins-bot has submitted this change and it was merged. Change subject: allow saving a page with empty text ...................................................................... allow saving a page with empty text by checking "if text is None" instead of "if not text" http://lists.wikimedia.org/pipermail/pywikipedia-l/2014-May/008740.html Change-Id: I26426394ae4844a029c5867446d481d53faae68d --- M pywikibot/site.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site.py b/pywikibot/site.py index c178191..a22d8e7 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -2692,7 +2692,7 @@ """ text = page.text - if not text: + if text is None: raise Error("editpage: no text to be saved") try: lastrev = page.latestRevision() -- To view, visit https://gerrit.wikimedia.org/r/135747 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I26426394ae4844a029c5867446d481d53faae68d Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ricordisamoa <ricordisamoa(a)live.it> 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: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] remove obsolete md5 import. - change (pywikibot/core)
by jenkins-bot (Code Review) 27 May '14

27 May '14

jenkins-bot has submitted this change and it was merged. Change subject: remove obsolete md5 import. ...................................................................... remove obsolete md5 import. md5 is deprecated since 2.5 and we need py version 2.6.5 or higher for core. On the other hand md5 isn't use at site.py. I removed it and opened bug 65760 to fix if needed. Change-Id: Ifdc0e07f90c842f33139fb45875d1a07ce8240cf --- M pywikibot/site.py 1 file changed, 0 insertions(+), 8 deletions(-) Approvals: John Vandenberg: Looks good to me, but someone else must approve Legoktm: Looks good to me, but someone else must approve Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site.py b/pywikibot/site.py index 9599d4c..e62e08c 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -11,10 +11,6 @@ __version__ = '$Id$' # -try: - from hashlib import md5 -except ImportError: - from md5 import md5 import datetime import imp import itertools @@ -2740,10 +2736,6 @@ pywikibot.warning( u"editpage: Invalid watch value '%(watch)s' ignored." % locals()) -# FIXME: API gives 'badmd5' error -# md5hash = md5() -# md5hash.update(urllib.quote_plus(text.encode(self.encoding()))) -# params['md5'] = md5hash.digest() req = api.Request(site=self, **params) while True: try: -- To view, visit https://gerrit.wikimedia.org/r/135307 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifdc0e07f90c842f33139fb45875d1a07ce8240cf Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Ricordisamoa <ricordisamoa(a)live.it> Gerrit-Reviewer: Russell Blau <russblau(a)imapmail.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] Bug 55124: link harvesting bugs - change (pywikibot/core)
by jenkins-bot (Code Review) 27 May '14

27 May '14

jenkins-bot has submitted this change and it was merged. Change subject: Bug 55124: link harvesting bugs ...................................................................... Bug 55124: link harvesting bugs - move link handling to a helper function - dont add claim for value which didnt match wikilink regexp - fix NoPage/exists check - add check to prevent linking an item to itself Change-Id: I049c13d2ca1c54e304d31cf00ae608a07e2235f1 --- M scripts/harvest_template.py 1 file changed, 36 insertions(+), 12 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/harvest_template.py b/scripts/harvest_template.py index 65ec3b3..c70c9f2 100755 --- a/scripts/harvest_template.py +++ b/scripts/harvest_template.py @@ -85,6 +85,31 @@ titles.append(temp.title(withNamespace=False)) return titles + def _template_link_target(self, item, link_text): + linked_page = None + + link = pywikibot.Link(link_text) + linked_page = pywikibot.Page(link) + + if not linked_page.exists(): + pywikibot.output(u'%s doesn\'t exist so it can\'t be linked. Skipping' % (linked_page)) + return + + if linked_page.isRedirectPage(): + linked_page = linked_page.getRedirectTarget() + + linked_item = pywikibot.ItemPage.fromPage(linked_page) + + if not linked_item.exists(): + pywikibot.output(u'%s doesn\'t have a wikidata item to link with. Skipping' % (linked_page)) + return + + if linked_item.title() == item.title(): + pywikibot.output(u'%s links to itself. Skipping' % (linked_page)) + return + + return linked_item + def processPage(self, page): """ Process a single page @@ -96,7 +121,7 @@ #TODO FIXME: We should provide an option to create the page item.get() if set(self.fields.values()) <= set(item.claims.keys()): - pywikibot.output('%s item %s has claims for all properties. Skipping' % (page, item.title())) + pywikibot.output(u'%s item %s has claims for all properties. Skipping' % (page, item.title())) else: pagetext = page.get() templates = pywikibot.extract_templates_and_params(pagetext) @@ -131,17 +156,16 @@ if claim.getType() == 'wikibase-item': # Try to extract a valid page match = re.search(pywikibot.link_regex, value) - if match: - try: - link = pywikibot.Link(match.group(1)) - linkedPage = pywikibot.Page(link) - if linkedPage.isRedirectPage(): - linkedPage = linkedPage.getRedirectTarget() - linkedItem = pywikibot.ItemPage.fromPage(linkedPage) - claim.setTarget(linkedItem) - except pywikibot.exceptions.NoPage: - pywikibot.output('[[%s]] doesn\'t exist so I can\'t link to it' % (linkedItem.title(),)) - continue + if not match: + pywikibot.output(u'%s field %s value %s isnt a wikilink. Skipping' % (claim.getID(), field, value)) + continue + + link_text = match.group(1) + linked_item = self._template_link_target(item, link_text) + if not linked_item: + continue + + claim.setTarget(linked_item) elif claim.getType() == 'string': claim.setTarget(value.strip()) elif claim.getType() == 'commonsMedia': -- To view, visit https://gerrit.wikimedia.org/r/135313 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I049c13d2ca1c54e304d31cf00ae608a07e2235f1 Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] archivebot: print exception itself - change (pywikibot/core)
by jenkins-bot (Code Review) 27 May '14

27 May '14

jenkins-bot has submitted this change and it was merged. Change subject: archivebot: print exception itself ...................................................................... archivebot: print exception itself Change-Id: I3f38cddcbaf7b4a73c91001e0dee280b572e2211 --- M scripts/archivebot.py 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/archivebot.py b/scripts/archivebot.py index 407bd91..3e02ea9 100644 --- a/scripts/archivebot.py +++ b/scripts/archivebot.py @@ -546,9 +546,9 @@ Archiver = PageArchiver(pg, a, salt, force) Archiver.run() time.sleep(10) - except: - pywikibot.output(u'Error occured while processing page %s' % pg) - traceback.print_exc() + except Exception as e: + pywikibot.output(u'Error occured while processing page %s: %s' % (pg, e)) + pywikibot.output(traceback.format_exc()) if __name__ == '__main__': main() -- To view, visit https://gerrit.wikimedia.org/r/135302 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3f38cddcbaf7b4a73c91001e0dee280b572e2211 Gerrit-PatchSet: 4 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Whym <whym(a)whym.org> 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: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] archivebot.py: follow PWB's naming conventions - change (pywikibot/core)
by jenkins-bot (Code Review) 27 May '14

27 May '14

jenkins-bot has submitted this change and it was merged. Change subject: archivebot.py: follow PWB's naming conventions ...................................................................... archivebot.py: follow PWB's naming conventions variables in snake_case Change-Id: I218d583ae39fbffc359a5f9d65e32c3d3058df1f --- M scripts/archivebot.py 1 file changed, 96 insertions(+), 96 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/archivebot.py b/scripts/archivebot.py index 407bd91..255f576 100644 --- a/scripts/archivebot.py +++ b/scripts/archivebot.py @@ -85,7 +85,7 @@ ZERO = datetime.timedelta(0) -Site = pywikibot.Site() +site = pywikibot.Site() try: # Get a constructor for the MD5 hash object import hashlib @@ -94,10 +94,10 @@ import md5 new_hash = md5.md5 -language = Site.language() +language = site.language() -def message(key, lang=Site.language()): +def message(key, lang=site.language()): return i18n.twtranslate(lang, key) @@ -151,13 +151,13 @@ return (int(str[:-1]) * 1024, 'B') -def generateTransclusions(Site, template, namespaces=[]): +def generate_transclusions(site, template, namespaces=[]): pywikibot.output(u'Fetching template transclusions...') - transclusionPage = pywikibot.Page(Site, template, ns=10) - gen = pagegenerators.ReferringPageGenerator(transclusionPage, + transclusion_page = pywikibot.Page(site, template, ns=10) + gen = pagegenerators.ReferringPageGenerator(transclusion_page, onlyTemplateInclusion=True) if namespaces: - gen = pagegenerators.NamespaceFilterPageGenerator(gen, namespaces, Site) + gen = pagegenerators.NamespaceFilterPageGenerator(gen, namespaces, site) for page in gen: yield page @@ -193,14 +193,14 @@ self.title = title self.now = now self.content = "" - self.ts = TimeStripper(site=Site) + self.ts = TimeStripper(site=site) self.timestamp = None def __repr__(self): return '%s("%s",%d bytes)' \ % (self.__class__.__name__, self.title, len(self.content)) - def feedLine(self, line): + def feed_line(self, line): if not self.content and not line: return @@ -217,20 +217,20 @@ def size(self): return len(self.title.encode('utf-8')) + len(self.content.encode('utf-8')) + 12 - def toText(self): + def to_text(self): return "== " + self.title + ' ==\n\n' + self.content - def shouldBeArchived(self, Archiver): - algo = Archiver.get('algo') - reT = re.search(r'^old$(.*)$$', algo) - if reT: + def should_be_archived(self, archiver): + algo = archiver.get('algo') + re_t = re.search(r'^old$(.*)$$', algo) + if re_t: if not self.timestamp: return '' #TODO: handle this: #return 'unsigned' - maxage = str2time(reT.group(1)) + maxage = str2time(re_t.group(1)) if self.now - self.timestamp > maxage: - return message('archivebot-older-than') + ' ' + reT.group(1) + return message('archivebot-older-than') + ' ' + re_t.group(1) return '' @@ -239,7 +239,7 @@ page. Feed threads to it and run an update() afterwards.""" def __init__(self, title, archiver, vars=None): - pywikibot.Page.__init__(self, Site, title) + pywikibot.Page.__init__(self, site, title) self.threads = [] self.full = False self.archiver = archiver @@ -247,59 +247,59 @@ self.now = datetime.datetime.utcnow().replace(tzinfo=tzoneUTC()) try: - self.loadPage() + self.load_page() except pywikibot.NoPage: self.header = archiver.get('archiveheader', message('archivebot-archiveheader')) if self.vars: self.header = self.header % self.vars - def loadPage(self): + def load_page(self): """Loads the page to be archived and breaks it up into threads.""" self.header = '' self.threads = [] self.archives = {} - self.archivedThreads = 0 + self.archived_threads = 0 lines = self.get().split('\n') found = False # Reading header - curThread = None + cur_thread = None for line in lines: - threadHeader = re.search('^== *([^=].*?) *== *$', line) - if threadHeader: + thread_header = re.search('^== *([^=].*?) *== *$', line) + if thread_header: found = True # Reading threads now - if curThread: - self.threads.append(curThread) - curThread = DiscussionThread(threadHeader.group(1), self.now) + if cur_thread: + self.threads.append(cur_thread) + cur_thread = DiscussionThread(thread_header.group(1), self.now) else: if found: - curThread.feedLine(line) + cur_thread.feed_line(line) else: self.header += line + '\n' - if curThread: - self.threads.append(curThread) + if cur_thread: + self.threads.append(cur_thread) pywikibot.output(u'%d Threads found on %s' % (len(self.threads), self)) - def feedThread(self, thread, maxArchiveSize=(250 * 1024, 'B')): + def feed_thread(self, thread, max_archive_size=(250 * 1024, 'B')): self.threads.append(thread) - self.archivedThreads += 1 - if maxArchiveSize[1] == 'B': - if self.size() >= maxArchiveSize[0]: + self.archived_threads += 1 + if max_archive_size[1] == 'B': + if self.size() >= max_archive_size[0]: self.full = True - elif maxArchiveSize[1] == 'T': - if len(self.threads) >= maxArchiveSize[0]: + elif max_archive_size[1] == 'T': + if len(self.threads) >= max_archive_size[0]: self.full = True return self.full def size(self): return len(self.header.encode('utf-8')) + sum(t.size() for t in self.threads) - def update(self, summary, sortThreads=False): - if sortThreads: + def update(self, summary, sort_threads=False): + if sort_threads: pywikibot.output(u'Sorting threads...') self.threads.sort(key=lambda t: t.timestamp) newtext = re.sub('\n*$', '\n\n', self.header) # Fix trailing newlines for t in self.threads: - newtext += t.toText() + newtext += t.to_text() if self.full: summary += ' ' + message('archivebot-archive-full') self.put(newtext, comment=summary) @@ -312,7 +312,7 @@ algo = 'none' - def __init__(self, Page, tpl, salt, force=False): + def __init__(self, page, tpl, salt, force=False): self.attributes = { 'algo': ['old(24h)', False], 'archive': ['', False], @@ -323,16 +323,16 @@ self.tpl = tpl self.salt = salt self.force = force - self.Page = DiscussionPage(Page.title(), self) - self.loadConfig() - self.commentParams = { - 'from': self.Page.title(), + self.page = DiscussionPage(page.title(), self) + self.load_config() + self.comment_params = { + 'from': self.page.title(), } self.archives = {} - self.archivedThreads = 0 - self.monthNum2origNames = {} - for n, (_long, _short) in enumerate(Site.months_names): - self.monthNum2origNames[n + 1] = {"long": _long, "short": _short} + self.archived_threads = 0 + self.month_num2orig_names = {} + for n, (_long, _short) in enumerate(site.months_names): + self.month_num2orig_names[n + 1] = {"long": _long, "short": _short} def get(self, attr, default=''): return self.attributes.get(attr, [default])[0] @@ -355,13 +355,13 @@ def key_ok(self): s = new_hash() s.update(self.salt + '\n') - s.update(self.Page.title().encode('utf8') + '\n') + s.update(self.page.title().encode('utf8') + '\n') return self.get('key') == s.hexdigest() - def loadConfig(self): - pywikibot.output(u'Looking for: {{%s}} in %s' % (self.tpl, self.Page)) - for tpl in self.Page.templatesWithParams(): - if tpl[0] == pywikibot.Page(Site, self.tpl, ns=10): + def load_config(self): + pywikibot.output(u'Looking for: {{%s}} in %s' % (self.tpl, self.page)) + for tpl in self.page.templatesWithParams(): + if tpl[0] == pywikibot.Page(site, self.tpl, ns=10): for param in tpl[1]: item, value = param.split('=', 1) self.set(item.strip(), value.strip()) @@ -371,7 +371,7 @@ if not self.get('algo', ''): raise MissingConfigError(u'Missing algo') - def feedArchive(self, archive, thread, maxArchiveSize, vars=None): + def feed_archive(self, archive, thread, max_archive_size, vars=None): """Feed the thread to one of the archives. If it doesn't exist yet, create it. If archive name is an empty string (or None), @@ -380,86 +380,86 @@ if not archive: return if not self.force \ - and not self.Page.title() + '/' == archive[:len(self.Page.title()) + 1] \ + and not self.page.title() + '/' == archive[:len(self.page.title()) + 1] \ and not self.key_ok(): - raise ArchiveSecurityError("Archive page %r does not start with page title (%s)!" % (archive, self.Page.title())) + raise ArchiveSecurityError("Archive page %r does not start with page title (%s)!" % (archive, self.page.title())) if archive not in self.archives: self.archives[archive] = DiscussionPage(archive, self, vars) - return self.archives[archive].feedThread(thread, maxArchiveSize) + return self.archives[archive].feed_thread(thread, max_archive_size) - def analyzePage(self): - maxArchSize = str2size(self.get('maxarchivesize')) - archCounter = int(self.get('counter', '1')) - oldthreads = self.Page.threads - self.Page.threads = [] + def analyze_page(self): + max_arch_size = str2size(self.get('maxarchivesize')) + arch_counter = int(self.get('counter', '1')) + oldthreads = self.page.threads + self.page.threads = [] whys = [] pywikibot.output(u'Processing %d threads' % len(oldthreads)) for t in oldthreads: - if len(oldthreads) - self.archivedThreads \ + if len(oldthreads) - self.archived_threads \ <= int(self.get('minthreadsleft', 5)): - self.Page.threads.append(t) + self.page.threads.append(t) continue # Because there's too little threads left. # TODO: Make an option so that unstamped (unsigned) posts get # archived. - why = t.shouldBeArchived(self) + why = t.should_be_archived(self) if why: archive = self.get('archive') vars = { - 'counter': archCounter, + 'counter': arch_counter, 'year': t.timestamp.year, 'month': t.timestamp.month, - 'monthname': self.monthNum2origNames[t.timestamp.month]['long'], - 'monthnameshort': self.monthNum2origNames[t.timestamp.month]['short'], + 'monthname': self.month_num2orig_names[t.timestamp.month]['long'], + 'monthnameshort': self.month_num2orig_names[t.timestamp.month]['short'], 'week': int(time.strftime('%W', t.timestamp.timetuple())), } - archive = pywikibot.Page(Site, archive % vars).title() - if self.feedArchive(archive, t, maxArchSize, vars): - archCounter += 1 - self.set('counter', str(archCounter)) + archive = pywikibot.Page(site, archive % vars).title() + if self.feed_archive(archive, t, max_arch_size, vars): + arch_counter += 1 + self.set('counter', str(arch_counter)) whys.append(why) - self.archivedThreads += 1 + self.archived_threads += 1 else: - self.Page.threads.append(t) + self.page.threads.append(t) return set(whys) def run(self): - if not self.Page.botMayEdit(): + if not self.page.botMayEdit(): return - whys = self.analyzePage() + whys = self.analyze_page() mintoarchive = int(self.get('minthreadstoarchive', 2)) - if self.archivedThreads < mintoarchive: + if self.archived_threads < mintoarchive: # We might not want to archive a measly few threads # (lowers edit frequency) pywikibot.output(u'Only %d (< %d) threads are old enough. Skipping' - % (self.archivedThreads, mintoarchive)) + % (self.archived_threads, mintoarchive)) return if whys: - pywikibot.output(u'Archiving %d thread(s).' % self.archivedThreads) + pywikibot.output(u'Archiving %d thread(s).' % self.archived_threads) # Save the archives first (so that bugs don't cause a loss of data) for a in sorted(self.archives.keys()): - self.commentParams['count'] = self.archives[a].archivedThreads + self.comment_params['count'] = self.archives[a].archived_threads comment = i18n.twntranslate(language, 'archivebot-archive-summary', - self.commentParams) + self.comment_params) self.archives[a].update(comment) # Save the page itself rx = re.compile('{{' + self.tpl + '\n.*?\n}}', re.DOTALL) - self.Page.header = rx.sub(self.attr2text(), self.Page.header) - self.commentParams['count'] = self.archivedThreads - self.commentParams['archives'] \ + self.page.header = rx.sub(self.attr2text(), self.page.header) + self.comment_params['count'] = self.archived_threads + self.comment_params['archives'] \ = ', '.join(['[[' + a.title() + ']]' for a in self.archives.values()]) - if not self.commentParams['archives']: - self.commentParams['archives'] = '/dev/null' - self.commentParams['why'] = ', '.join(whys) + if not self.comment_params['archives']: + self.comment_params['archives'] = '/dev/null' + self.comment_params['why'] = ', '.join(whys) comment = i18n.twntranslate(language, 'archivebot-page-summary', - self.commentParams) - self.Page.update(comment) + self.comment_params) + self.page.update(comment) def main(): - global Site, language + global site, language import sys @@ -513,8 +513,8 @@ if not salt: salt = '' - Site = pywikibot.Site() - language = Site.language() + site = pywikibot.Site() + language = site.language() if not args or len(args) <= 1: pywikibot.output(u'NOTE: you must specify a template to run the bot') @@ -529,13 +529,13 @@ ns = [str(namespace)] else: ns = [] - for pg in generateTransclusions(Site, a, ns): + for pg in generate_transclusions(site, a, ns): pagelist.append(pg) if filename: for pg in file(filename, 'r').readlines(): - pagelist.append(pywikibot.Page(Site, pg, ns=10)) + pagelist.append(pywikibot.Page(site, pg, ns=10)) if pagename: - pagelist.append(pywikibot.Page(Site, pagename, + pagelist.append(pywikibot.Page(site, pagename, ns=3)) pagelist = sorted(pagelist) for pg in iter(pagelist): @@ -543,8 +543,8 @@ # Catching exceptions, so that errors in one page do not bail out # the entire process try: - Archiver = PageArchiver(pg, a, salt, force) - Archiver.run() + archiver = PageArchiver(pg, a, salt, force) + archiver.run() time.sleep(10) except: pywikibot.output(u'Error occured while processing page %s' % pg) -- To view, visit https://gerrit.wikimedia.org/r/135377 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I218d583ae39fbffc359a5f9d65e32c3d3058df1f Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ricordisamoa <ricordisamoa(a)live.it> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] (bugfix) archivebot.py: use pywikibot.error - change (pywikibot/core)
by jenkins-bot (Code Review) 26 May '14

26 May '14

jenkins-bot has submitted this change and it was merged. Change subject: (bugfix) archivebot.py: use pywikibot.error ...................................................................... (bugfix) archivebot.py: use pywikibot.error The initial port of archivebot to 'core' left in one call to parser.error which is used for command line parsing in 'compat'. Change-Id: Ib1e2841e7cd901a0d298852c29ef5b4025b8852e --- M scripts/archivebot.py 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified Objections: Ricordisamoa: There's a problem with this change, please improve diff --git a/scripts/archivebot.py b/scripts/archivebot.py index 407bd91..6fe513c 100644 --- a/scripts/archivebot.py +++ b/scripts/archivebot.py @@ -503,7 +503,9 @@ if calc: if not salt: - parser.error('Note: you must specify a salt to calculate a key') + pywikibot.error('Note: you must specify a salt to calculate a key') + return + s = new_hash() s.update(salt + '\n') s.update(calc + '\n') -- To view, visit https://gerrit.wikimedia.org/r/135292 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib1e2841e7cd901a0d298852c29ef5b4025b8852e Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Ricordisamoa <ricordisamoa(a)live.it> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] use isinstance(obj, typ) instead of type(obj) == typ - change (pywikibot/core)
by jenkins-bot (Code Review) 26 May '14

26 May '14

jenkins-bot has submitted this change and it was merged. Change subject: use isinstance(obj, typ) instead of type(obj) == typ ...................................................................... use isinstance(obj, typ) instead of type(obj) == typ it supports inheritance Change-Id: I935c78736e9bfa995a62a88cc4c9a0c581ba0f60 --- M pywikibot/bot.py M pywikibot/data/api.py M pywikibot/i18n.py M pywikibot/site.py M scripts/checkimages.py M scripts/commonscat.py M scripts/featured.py M scripts/interwiki.py 8 files changed, 16 insertions(+), 16 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/bot.py b/pywikibot/bot.py index e8487e2..2e7e859 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -626,7 +626,7 @@ try: _arg, _val = arg[1:].split(':') # explicitly check for int (so bool doesn't match) - if type(getattr(config, _arg)) is not int: + if not isinstance(getattr(config, _arg), int): raise TypeError setattr(config, _arg, int(_val)) except (ValueError, TypeError, AttributeError): diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py index 5ef6cee..a0f5aeb 100644 --- a/pywikibot/data/api.py +++ b/pywikibot/data/api.py @@ -350,7 +350,7 @@ continue if not result: result = {} - if type(result) is not dict: + if not isinstance(result, dict): raise APIError("Unknown", "Unable to process query response of type %s." % type(result), diff --git a/pywikibot/i18n.py b/pywikibot/i18n.py index 3ec974b..a7dd59b 100644 --- a/pywikibot/i18n.py +++ b/pywikibot/i18n.py @@ -242,7 +242,7 @@ "occurences.") i = 0 for selector, variants in plural_items: - if type(parameters) == dict: + if isinstance(parameters, dict): num = int(parameters[selector]) elif isinstance(parameters, basestring): num = int(parameters) @@ -299,7 +299,7 @@ code = code.code # Check whether xdict has multiple projects - if type(xdict) == dict: + if isinstance(xdict, dict): if family in xdict: xdict = xdict[family] elif 'wikipedia' in xdict: @@ -307,7 +307,7 @@ # Get the translated string trans = None - if type(xdict) != dict: + if not isinstance(xdict, dict): trans = xdict elif code in xdict: trans = xdict[code] @@ -355,7 +355,7 @@ if hasattr(code, 'code'): lang = code.code # check whether we need the language code back - elif type(code) == list: + elif isinstance(code, list): lang = code.pop() code_needed = True else: @@ -455,7 +455,7 @@ # check for PLURAL variants trans = _extract_plural(lang, trans, parameters) # we always have a dict for replacement of translatewiki messages - if parameters and type(parameters) == dict: + if parameters and isinstance(parameters, dict): try: return trans % parameters except KeyError: diff --git a/pywikibot/site.py b/pywikibot/site.py index 9599d4c..e6743b2 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -416,16 +416,16 @@ else: ns2, name2 = 0, title2 for space in self.namespaces(): # iterate over all valid namespaces - if type(ns1) is not int and valid_namespace(ns1, space): + if not isinstance(ns1, int) and valid_namespace(ns1, space): ns1 = space - if type(ns2) is not int and valid_namespace(ns2, space): + if not isinstance(ns2, int) and valid_namespace(ns2, space): ns2 = space - if type(ns1) is not int: + if not isinstance(ns1, int): # no valid namespace prefix found, so the string followed by ":" # must be part of the title name1 = ns1 + ":" + name1 ns1 = 0 - if type(ns2) is not int: + if not isinstance(ns2, int): name2 = ns2 + ":" + name2 ns2 = 0 if ns1 != ns2: @@ -3585,7 +3585,7 @@ @deprecated("pywikibot.WikibasePage") def get_item(self, source, **params): """get the data for multiple Wikibase items""" - if type(source) == int or \ + if isinstance(source, int) or \ isinstance(source, basestring) and source.isdigit(): ids = 'q' + str(source) wbrequest = api.Request(site=self, action="wbgetentities", ids=ids, diff --git a/scripts/checkimages.py b/scripts/checkimages.py index 64a90d5..d781a7e 100644 --- a/scripts/checkimages.py +++ b/scripts/checkimages.py @@ -930,7 +930,7 @@ def countEdits(self, pagename, userlist): """Function to count the edit of a user or a list of users in a page.""" # self.botolist - if type(userlist) == str: + if isinstance(userlist, basestring): userlist = [userlist] page = pywikibot.Page(self.site, pagename) history = page.getVersionHistory() diff --git a/scripts/commonscat.py b/scripts/commonscat.py index 27e98a2..04569f1 100755 --- a/scripts/commonscat.py +++ b/scripts/commonscat.py @@ -336,7 +336,7 @@ templatesInThePage = page.templates() templatesWithParams = page.templatesWithParams() for template in ignoreTemplates[page.site.language()]: - if type(template) != tuple: + if not isinstance(template, tuple): for pageTemplate in templatesInThePage: if pageTemplate.title(withNamespace=False) == template: return True diff --git a/scripts/featured.py b/scripts/featured.py index f56e63c..a056a40 100644 --- a/scripts/featured.py +++ b/scripts/featured.py @@ -92,7 +92,7 @@ except pywikibot.PageNotFound: return cat = pywikibot.Category(site, title) - if type(hide) == dict: + if isinstance(hide, dict): hide = hide.get(site.code) for article in cat.articles(endsort=hide): yield article diff --git a/scripts/interwiki.py b/scripts/interwiki.py index 3c2dfe4..df70c62 100755 --- a/scripts/interwiki.py +++ b/scripts/interwiki.py @@ -2390,7 +2390,7 @@ tmpl, loc = moved_links[page.site.lang] except KeyError: pass - if type(tmpl) != list: + if not isinstance(tmpl, list): tmpl = [tmpl] try: tmpl += ignoreTemplates[page.site.lang] -- To view, visit https://gerrit.wikimedia.org/r/135400 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I935c78736e9bfa995a62a88cc4c9a0c581ba0f60 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ricordisamoa <ricordisamoa(a)live.it> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Siebrand <siebrand(a)kitano.nl> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] small Wikibase-related code improvements - change (pywikibot/core)
by jenkins-bot (Code Review) 26 May '14

26 May '14

jenkins-bot has submitted this change and it was merged. Change subject: small Wikibase-related code improvements ...................................................................... small Wikibase-related code improvements - avoid repetition of "data['mainsnak']['datavalue']['value']" - avoid repetition of "value = self.getTarget().toWikibase()" - enforce type compliance for quantity datatype split from Ibe77c51fc5cf3dae8ece533cc5787bf960f0ebed Change-Id: I79941ae8711b3e9e6e8f0915dd6b911fc28ca440 --- M pywikibot/page.py 1 file changed, 10 insertions(+), 18 deletions(-) Approvals: John Vandenberg: Looks good to me, but someone else must approve Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index 935331b..b40ec42 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -2863,25 +2863,20 @@ claim.isQualifier = True claim.snaktype = data['mainsnak']['snaktype'] if claim.getSnakType() == 'value': + value = data['mainsnak']['datavalue']['value'] if claim.getType() == 'wikibase-item': - claim.target = ItemPage(site, 'Q' + - str(data['mainsnak']['datavalue'] - ['value']['numeric-id'])) + claim.target = ItemPage(site, 'Q' + str(value['numeric-id'])) elif claim.getType() == 'commonsMedia': - claim.target = ImagePage(site.image_repository(), 'File:' + - data['mainsnak']['datavalue']['value']) + claim.target = ImagePage(site.image_repository(), value) elif claim.getType() == 'globecoordinate': - claim.target = pywikibot.Coordinate.fromWikibase( - data['mainsnak']['datavalue']['value'], site) + claim.target = pywikibot.Coordinate.fromWikibase(value, site) elif claim.getType() == 'time': - claim.target = pywikibot.WbTime.fromWikibase( - data['mainsnak']['datavalue']['value']) + claim.target = pywikibot.WbTime.fromWikibase(value) elif claim.getType() == 'quantity': - claim.target = pywikibot.WbQuantity.fromWikibase( - data['mainsnak']['datavalue']['value']) + claim.target = pywikibot.WbQuantity.fromWikibase(value) else: # This covers string, url types - claim.target = data['mainsnak']['datavalue']['value'] + claim.target = value if 'rank' in data: # References/Qualifiers don't have ranks claim.rank = data['rank'] if 'references' in data: @@ -2930,6 +2925,7 @@ 'globecoordinate': pywikibot.Coordinate, 'url': basestring, 'time': pywikibot.WbTime, + 'quantity': pywikibot.WbQuantity, } if self.getType() in types: if not isinstance(value, types[self.getType()]): @@ -3054,15 +3050,11 @@ if self.getType() == 'wikibase-item': value = {'entity-type': 'item', 'numeric-id': self.getTarget().getID(numeric=True)} - elif self.getType() in ['string', 'url']: + elif self.getType() in ('string', 'url'): value = self.getTarget() elif self.getType() == 'commonsMedia': value = self.getTarget().title(withNamespace=False) - elif self.getType() == 'globecoordinate': - value = self.getTarget().toWikibase() - elif self.getType() == 'time': - value = self.getTarget().toWikibase() - elif self.getType() == 'quantity': + elif self.getType() in ('globecoordinate', 'time', 'quantity'): value = self.getTarget().toWikibase() else: raise NotImplementedError('%s datatype is not supported yet.' -- To view, visit https://gerrit.wikimedia.org/r/135321 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I79941ae8711b3e9e6e8f0915dd6b911fc28ca440 Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ricordisamoa <ricordisamoa(a)live.it> 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: Ricordisamoa <ricordisamoa(a)live.it> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits May 2014