Pywikibot-commits

pywikibot-commits@lists.wikimedia.org

1 participants
13424 discussions

[Gerrit] [PEP8] pep8 changes - change (pywikibot/compat)
by jenkins-bot (Code Review) 13 Nov '13

13 Nov '13

jenkins-bot has submitted this change and it was merged. Change subject: [PEP8] pep8 changes ...................................................................... [PEP8] pep8 changes Change-Id: If3c462e84fee96f35e613ee08ae6499dc7d111a0 --- M articlenos.py 1 file changed, 8 insertions(+), 4 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/articlenos.py b/articlenos.py index 2f3bda6..e0707ca 100644 --- a/articlenos.py +++ b/articlenos.py @@ -23,14 +23,16 @@ from irclib import nm_to_n, nm_to_h, irc_lower, ip_numstr_to_quad from irclib import ip_quad_to_numstr + class ArtNoDisp(SingleServerIRCBot): + def __init__(self, site, channel, nickname, server, port=6667): SingleServerIRCBot.__init__(self, [(server, port)], nickname, nickname) self.channel = channel self.site = site ns = [] for n in site.namespaces(): - if type(n) == type(()): + if isinstance(n, tuple): # I am wondering that this may occur! ns += n[0] else: ns += [n] @@ -40,7 +42,8 @@ self.api_url += 'action=query&meta=siteinfo&siprop=statistics&format=xml' self.api_found = re.compile(r'articles="(.*?)"') self.re_edit = re.compile( - r'^C14\[\[^C07(?P<page>.+?)^C14\]\]^C4 (?P<flags>.*?)^C10 ^C02(?P<url>.+?)^C ^C5\*^C ^C03(?P<user>.+?)^C ^C5\*^C $?^B?(?P<bytes>[+-]?\d+?)^B?$ ^C10(?P<summary>.*)^C'.replace('^B', '\002').replace('^C', '\003').replace('^U', '\037')) + r'^C14\[\[^C07(?P<page>.+?)^C14\]\]^C4 (?P<flags>.*?)^C10 ^C02(?P<url>.+?)^C ^C5\*^C ^C03(?P<user>.+?)^C ^C5\*^C $?^B?(?P<bytes>[+-]?\d+?)^B?$ ^C10(?P<summary>.*)^C'.replace( + '^B', '\002').replace('^C', '\003').replace('^U', '\037')) def on_nicknameinuse(self, c, e): c.nick(c.get_nickname() + "_") @@ -58,12 +61,12 @@ if not ('N' in match.group('flags')): return try: - msg = unicode(e.arguments()[0],'utf-8') + msg = unicode(e.arguments()[0], 'utf-8') except UnicodeDecodeError: return if self.other_ns.match(msg): return - name = msg[8:msg.find(u'14',9)] + name = msg[8:msg.find(u'14', 9)] text = self.site.getUrl(self.api_url) entry = self.api_found.findall(text) page = pywikibot.Page(self.site, name) @@ -87,6 +90,7 @@ def on_quit(self, e, cmd): pass + def main(): site = pywikibot.getSite() site.forceLogin() -- To view, visit https://gerrit.wikimedia.org/r/95155 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If3c462e84fee96f35e613ee08ae6499dc7d111a0 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] [PEP8] pep8 changes - change (pywikibot/compat)
by jenkins-bot (Code Review) 13 Nov '13

13 Nov '13

1 0

[Gerrit] [PEP8] pep8 changes - change (pywikibot/compat)
by Xqt (Code Review) 13 Nov '13

13 Nov '13

Xqt has submitted this change and it was merged. Change subject: [PEP8] pep8 changes ...................................................................... [PEP8] pep8 changes Change-Id: I22c87805e30f8e634c786a25e28f7b7ac145ffca --- M apispec.py 1 file changed, 40 insertions(+), 34 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/apispec.py b/apispec.py index 5f00d02..bdc2324 100644 --- a/apispec.py +++ b/apispec.py @@ -23,17 +23,19 @@ """ # # (C) Bináris, 2012 -# (C) Pywikipedia bot team, 2012 +# (C) Pywikipedia bot team, 2013 # # Distributed under the terms of the MIT license. # __version__ = '$Id$' -import datetime, re +import datetime +imporet re import wikipedia as pywikibot import query site = pywikibot.getSite() + #Some functions for datetime conversion def iso(t): @@ -41,9 +43,11 @@ s = t.isoformat() return s[:s.find('.')] + 'Z' + def uniso(timestamp): """Removes T and Z from an ISO 8601-formatted text for readability.""" return timestamp.replace('T', ' ').replace('Z', '') + def dt(timestamp): """Converts a MediaWiki timestamp to a Python-compatible datetime object""" @@ -51,14 +55,15 @@ #Be sure to exclude "infity" before calling this! l = timestamp.split('T') try: - d = l[0].split('-') #The date - t = l[1][:-1].split(':') #The time + d = l[0].split('-') # The date + t = l[1][:-1].split(':') # The time d = [int(x) for x in d] t = [int(x) for x in t] return datetime.datetime(d[0], d[1], d[2], t[0], t[1], t[2]) except IndexError: print 'Erroneous timestamp:', timestamp - return datetime.datetime(1,1,1,1,1,1) #This may be handled as error + return datetime.datetime(1, 1, 1, 1, 1, 1) # May be handled as error + def duration(x): """ @@ -67,9 +72,9 @@ """ return (dt(x['expiry']) - dt(x['timestamp'])).days -#API may change. This is a general dictionary with all possible keys that -#may be returned in case of KeyError. If you get this as result, please -#report a bug with all possible circumstances. +# API may change. This is a general dictionary with all possible keys that +# may be returned in case of KeyError. If you get this as result, please +# report a bug with all possible circumstances. errordic = { 'id': -1, 'userid': -1, @@ -82,6 +87,7 @@ 'timestamp': '0000-00-00T00:00:00Z', 'expiry': '0000-00-00T00:00:00Z', } + class Blocks(object): """ @@ -212,12 +218,12 @@ ################################################# def __init__(self, site=site, top='new', limit=5000): self.site = site - self.bkdir = ['older', 'newer'][top=='old'] #a bit strange + self.bkdir = ['older', 'newer'][top == 'old'] # a bit strange # bkdir: Direction to list in. - #older: List newest blocks first (default). - #Note: bkstart has to be later than bkend. - #newer: List oldest blocks first. Note: bkstart has to be before bkend. - self.bklimit = limit #Allowed maximum for bots=5000 + # older: List newest blocks first (default). + # Note: bkstart has to be later than bkend. + # newer: List oldest blocks first. Note: bkstart has to be before bkend. + self.bklimit = limit # Allowed maximum for bots=5000 self.empty() def empty(self): @@ -230,7 +236,7 @@ 'bklimit': self.bklimit, 'bkdir': self.bkdir, 'bkprop': - 'id|user|userid|by|byid|timestamp|expiry|reason|range|flags', + 'id|user|userid|by|byid|timestamp|expiry|reason|range|flags', } def query(self): @@ -255,7 +261,7 @@ IP string, either standalone or range. """ l1 = IP.split('/') - l2 = l1[0].split('.') #IP part without range + l2 = l1[0].split('.') # IP part without range newlist = [('0' + s)[-3:] for s in l2] s = '.'.join(newlist) if len(l1) > 1: @@ -276,8 +282,8 @@ self.params['bkend'] = \ iso(datetime.datetime.utcnow() - datetime.timedelta(1)) return filter(lambda x: 'user' not in x, self.query()) - #Autoblocks back to previous day 00:00:00 UTC appear in the list even - #if they are no more in effect, but we don't query them. + # Autoblocks back to previous day 00:00:00 UTC appear in the list even + # if they are no more in effect, but we don't query them. def notautoblocks(self): """Returns direct (not automatic) blocks. Required by other methods.""" @@ -294,7 +300,7 @@ self.empty() try: return filter(lambda x: x['rangestart'] == x['rangeend'], - self.anonblocks()) + self.anonblocks()) except KeyError: return [errordic] @@ -303,7 +309,7 @@ self.empty() try: return filter(lambda x: x['rangestart'] != x['rangeend'], - self.anonblocks()) + self.anonblocks()) except KeyError: return [errordic] @@ -315,7 +321,7 @@ def byadmin(self, admin): """Returns blocks raised by given admin""" self.empty() - return filter(lambda x: x['by']==admin, self.query()) + return filter(lambda x: x['by'] == admin, self.query()) def user(self, user): """Returns blocks of the given user or single IP""" @@ -331,8 +337,8 @@ def userregex(self, regex): """Returns blocks of the given user or single IP (regex)""" self.empty() - return filter( - lambda x: re.search(regex, x['user']), self.notautoblocks()) + return filter(lambda x: re.search(regex, x['user']), + self.notautoblocks()) def IP(self, IP): """Returns blocks of the given single IP or range (max. /16)""" @@ -353,13 +359,12 @@ def reasonregex(self, regex): """Returns blocks raised with the given reason (regex)""" self.empty() - return filter( - lambda x: re.search(regex, x['reason']), self.allblocks()) + return filter(lambda x: re.search(regex, x['reason']), self.allblocks()) ################################################# # Lists of blocked users/IPs # ################################################# - #These methods return ordered list of Unicode strings + # These methods return ordered list of Unicode strings def blockedusernames_chrono(self): return [b['user'] for b in self.reguserblocks()] @@ -413,13 +418,13 @@ """Returns finite blocks shorter than day""" return sorted( filter(lambda x: duration(x) < days, self.finiteblocks()), - key = duration) + key=duration) def longerthan(self, days): """Returns finite blocks longer than or equal to day""" return sorted( filter(lambda x: duration(x) >= days, self.finiteblocks()), - key = duration) + key=duration) def between(self, days1, days2): """ @@ -427,8 +432,9 @@ [day1,day2] """ return sorted( - filter(lambda x: days1 <= duration(x) <= days2, self.finiteblocks()), - key = duration) + filter(lambda x: days1 <= duration(x) <= days2, + self.finiteblocks()), + key=duration) ################################################# # Auxiliary methods # @@ -438,7 +444,7 @@ Simple displayer for a block dictionary. Use with pywikibot.output or e-mail it or insert into a wikipage with <pre>. """ - w = 21 #width for justification + w = 21 # width for justification flags = ['automatic', 'anononly', 'nocreate', 'autoblock', 'noemail', 'allowusertalk', 'hidden'] s = 'Data for block #%s' % block['id'] @@ -452,10 +458,10 @@ if 'rangestart' in block and 'rangeend' in block and \ block['rangestart'] != block['rangeend']: s += '\nRange block:'.ljust(w) + u'%s–%s' % \ - (block['rangestart'],block['rangeend']) + (block['rangestart'], block['rangeend']) s += '\nAdmin:'.ljust(w) + '%s (#%s)' % (block['by'], block['byid']) s += '\nBeginning in UTC:'.ljust(w) + uniso(block['timestamp']) - s += ('\nExpiry%s:' \ + s += ('\nExpiry%s:' % ['', ' in UTC'][block['expiry'][0].isdigit()]).ljust(w) s += uniso(block['expiry']) s += '\nFlags:'.ljust(w) @@ -471,7 +477,7 @@ return '\n'.join([self.display(b) for b in blocklist]) if __name__ == '__main__': - pywikibot.handleArgs() #for help + pywikibot.handleArgs() # for help pywikibot.output( - 'This is a library for querying special pages through API.') + 'This is a library for querying special pages through API.') pywikibot.output('Use this module through import or with -help.') -- To view, visit https://gerrit.wikimedia.org/r/95151 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I22c87805e30f8e634c786a25e28f7b7ac145ffca Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] [Bug 56873] Fix access to the fallback category redirect list. - change (pywikibot/core)
by jenkins-bot (Code Review) 12 Nov '13

12 Nov '13

jenkins-bot has submitted this change and it was merged. Change subject: [Bug 56873] Fix access to the fallback category redirect list. ...................................................................... [Bug 56873] Fix access to the fallback category redirect list. Change-Id: Idbf7cf6a262512c354720f5065c81d0ed871c758 --- M pywikibot/family.py 1 file changed, 15 insertions(+), 12 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/family.py b/pywikibot/family.py index 4c54c66..82f7377 100644 --- a/pywikibot/family.py +++ b/pywikibot/family.py @@ -873,19 +873,22 @@ if not hasattr(self, "_catredirtemplates"): self._catredirtemplates = {} if code in self.category_redirect_templates: - cr_template = self.category_redirect_templates[code][0] + cr_template_list = self.category_redirect_templates[code] + cr_list = list(self.category_redirect_templates[code]) else: - cr_template = self.category_redirect_templates[fallback][0] - # start with list of category redirect templates from family file - cr_page = pywikibot.Page(pywikibot.Site(code, self), - "Template:" + cr_template) - cr_list = list(self.category_redirect_templates[code]) - # retrieve all redirects to primary template from API, - # add any that are not already on the list - for t in cr_page.backlinks(filterRedirects=True, namespaces=10): - newtitle = t.title(withNamespace=False) - if newtitle not in cr_list: - cr_list.append(newtitle) + cr_template_list = self.category_redirect_templates[fallback] + cr_list = [] + if cr_template_list: + cr_template = cr_template_list[0] + # start with list of category redirect templates from family file + cr_page = pywikibot.Page(pywikibot.Site(code, self), + "Template:" + cr_template) + # retrieve all redirects to primary template from API, + # add any that are not already on the list + for t in cr_page.backlinks(filterRedirects=True, namespaces=10): + newtitle = t.title(withNamespace=False) + if newtitle not in cr_list: + cr_list.append(newtitle) self._catredirtemplates[code] = cr_list def disambig(self, code, fallback='_default'): -- To view, visit https://gerrit.wikimedia.org/r/94621 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idbf7cf6a262512c354720f5065c81d0ed871c758 Gerrit-PatchSet: 4 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: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Pyfisch <pyfisch(a)googlemail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] adding Hewiki translate for reflinks - change (pywikibot/compat)
by Yurik (Code Review) 12 Nov '13

12 Nov '13

Yurik has submitted this change and it was merged. Change subject: adding Hewiki translate for reflinks ...................................................................... adding Hewiki translate for reflinks Change-Id: Idb9b8ebae6e27fcaa51f5990a796bddd2b549aa9 --- M reflinks.py 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Yurik: Looks good to me, approved jenkins-bot: Verified diff --git a/reflinks.py b/reflinks.py index 0198f86..750e2c5 100644 --- a/reflinks.py +++ b/reflinks.py @@ -57,6 +57,7 @@ 'fa':u'کاربر:Amirobot/EditThisPageToStopMe', 'it':u'Utente:Marco27Bot/EditThisPageToStopMe', 'ko':u'사용자:GrassnBreadRefBot/EditThisPageToStopMe1', + 'he':u'User:Matanyabot/EditThisPageToStopMe', 'hu':'User:Damibot/EditThisPageToStopMe', 'en':u'User:DumZiBoT/EditThisPageToStopMe', 'pl':u'Wikipedysta:MastiBot/EditThisPageToStopMe', @@ -68,6 +69,7 @@ 'da':u'Bot: Tilføjer beskrivelse til eksterne links, se [[:en:User:DumZiBoT/refLinks|FAQ]]', 'de':u'Bot: Korrektes Referenzformat (siehe [[:en:User:DumZiBoT/refLinks]])', 'fa':u'ربات:تصحیح پيوند به بيرون يا عنوان پيوند. [[:en:User:DumZiBoT/refLinks|اطلاعات بیشتر]]', + 'he':u'בוט:מלביש קישורים חיצוניים. (FAQ : [[:en:User:DumZiBoT/refLinks]])', 'hu':u'Robot: Forráshivatkozások kibővítése a hivatkozott oldal címével', 'ko':u'봇: url만 있는 주석을 보강, (영문)[[:en:User:DumZiBoT/refLinks]] 참조', 'es':u'Formateando las referencias que no tuvieran títulos (FAQ : [[:en:User:DumZiBoT/refLinks]] )', @@ -81,6 +83,7 @@ 'da':u'[%s] {{dødt link}}', 'de':u'', 'fa':u'[%s] {{پیوند مرده}}', + 'he':u'{{קישור שבור}}', 'hu':u'[%s] {{halott link}}', 'ko':u'[%s] {{죽은 바깥 고리}}', 'es':u'{{enlace roto2|%s}}', -- To view, visit https://gerrit.wikimedia.org/r/94968 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idb9b8ebae6e27fcaa51f5990a796bddd2b549aa9 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Matanya <matanya(a)foss.co.il> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Yurik <yurik(a)wikimedia.org> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] [PEP8]ify fixes.py - change (pywikibot/compat)
by jenkins-bot (Code Review) 12 Nov '13

12 Nov '13

jenkins-bot has submitted this change and it was merged. Change subject: [PEP8]ify fixes.py ...................................................................... [PEP8]ify fixes.py Change-Id: I6ef4a5fa5671f462a5042fd766887f90b2b7075d --- M fixes.py 1 file changed, 121 insertions(+), 117 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/fixes.py b/fixes.py index 58cbcfa..1bbf6ac 100644 --- a/fixes.py +++ b/fixes.py @@ -49,28 +49,28 @@ 'HTML': { 'regex': True, 'msg': { - 'ar':u'روبوت: تحويل/تصليح HTML', - 'be':u'Бот: карэкцыя HTML', - 'be-x-old':u'Бот: карэкцыя HTML', - 'cs':u'převod/oprava HTML', - 'en':u'Robot: Converting/fixing HTML', - 'eo':u'Bot: koredtado de HTMLa teksto', - 'fa':u'ربات:تبدیل/تصحیح کدهای اچ‌تی‌ام‌ال', - 'de':u'Bot: konvertiere/korrigiere HTML', - 'fr':u'Robot: convertit/fixe HTML', - 'he':u'בוט: ממיר/מתקן HTML', - 'ja':u'ロボットによる: HTML転換', - 'ksh':u'Bot: vun HTML en Wikikood wandelle', - 'ia':u'Robot: conversion/reparation de HTML', - 'lt':u'robotas: konvertuojamas/taisomas HTML', - 'nl':u'Bot: conversie/reparatie HTML', - 'pl':u'Robot konwertuje/naprawia HTML', - 'pt':u'Bot: Corrigindo HTML', - 'ru':u'Бот: коррекция HTML', - 'sr':u'Бот: Поправка HTML-а', - 'sv':u'Bot: Konverterar/korrigerar HTML', - 'uk':u'Бот: корекцiя HTML', - 'zh':u'機器人: 轉換HTML', + 'ar': u'روبوت: تحويل/تصليح HTML', + 'be': u'Бот: карэкцыя HTML', + 'be-x-old': u'Бот: карэкцыя HTML', + 'cs': u'převod/oprava HTML', + 'en': u'Robot: Converting/fixing HTML', + 'eo': u'Bot: koredtado de HTMLa teksto', + 'fa': u'ربات:تبدیل/تصحیح کدهای اچ‌تی‌ام‌ال', + 'de': u'Bot: konvertiere/korrigiere HTML', + 'fr': u'Robot: convertit/fixe HTML', + 'he': u'בוט: ממיר/מתקן HTML', + 'ja': u'ロボットによる: HTML転換', + 'ksh': u'Bot: vun HTML en Wikikood wandelle', + 'ia': u'Robot: conversion/reparation de HTML', + 'lt': u'robotas: konvertuojamas/taisomas HTML', + 'nl': u'Bot: conversie/reparatie HTML', + 'pl': u'Robot konwertuje/naprawia HTML', + 'pt': u'Bot: Corrigindo HTML', + 'ru': u'Бот: коррекция HTML', + 'sr': u'Бот: Поправка HTML-а', + 'sv': u'Bot: Konverterar/korrigerar HTML', + 'uk': u'Бот: корекцiя HTML', + 'zh': u'機器人: 轉換HTML', }, 'replacements': [ # Everything case-insensitive (?i) @@ -92,12 +92,12 @@ # so we only make it XHTML compliant (r'(?i)<hr ([^>/]+?)>', r'<hr \1 />'), # a header where only spaces are in the same line - (r'(?i)([\r\n]) *<h1> *([^<]+?) *</h1> *([\r\n])', r"\1= \2 =\3"), - (r'(?i)([\r\n]) *<h2> *([^<]+?) *</h2> *([\r\n])', r"\1== \2 ==\3"), - (r'(?i)([\r\n]) *<h3> *([^<]+?) *</h3> *([\r\n])', r"\1=== \2 ===\3"), - (r'(?i)([\r\n]) *<h4> *([^<]+?) *</h4> *([\r\n])', r"\1==== \2 ====\3"), - (r'(?i)([\r\n]) *<h5> *([^<]+?) *</h5> *([\r\n])', r"\1===== \2 =====\3"), - (r'(?i)([\r\n]) *<h6> *([^<]+?) *</h6> *([\r\n])', r"\1====== \2 ======\3"), + (r'(?i)([\r\n]) *<h1> *([^<]+?) *</h1> *([\r\n])', r"\1= \2 =\3"), + (r'(?i)([\r\n]) *<h2> *([^<]+?) *</h2> *([\r\n])', r"\1== \2 ==\3"), + (r'(?i)([\r\n]) *<h3> *([^<]+?) *</h3> *([\r\n])', r"\1=== \2 ===\3"), + (r'(?i)([\r\n]) *<h4> *([^<]+?) *</h4> *([\r\n])', r"\1==== \2 ====\3"), + (r'(?i)([\r\n]) *<h5> *([^<]+?) *</h5> *([\r\n])', r"\1===== \2 =====\3"), + (r'(?i)([\r\n]) *<h6> *([^<]+?) *</h6> *([\r\n])', r"\1====== \2 ======\3"), # TODO: maybe we can make the bot replace <p> tags with \r\n's. ], 'exceptions': { @@ -115,7 +115,7 @@ 'grammar-de': { 'regex': True, 'msg': { - 'de':u'Bot: korrigiere Grammatik', + 'de': u'Bot: korrigiere Grammatik', }, 'replacements': [ #(u'([Ss]owohl) ([^,\.]+?), als auch', r'\1 \2 als auch'), @@ -157,26 +157,28 @@ r'20min.ch', # Schweizer News-Seite ], 'inside': [ - r'<code>.*</code>', # because of code examples + r'<code>.*</code>', # because of code examples r'{{[Zz]itat\|.*?}}', - ur'{{§\|.*?}}', # Gesetzesparagraph + ur'{{§\|.*?}}', # Gesetzesparagraph ur'§ ?\d+[a-z]', # Gesetzesparagraph - r'Ju 52/1m', # Flugzeugbezeichnung - r'Ju 52/3m', # Flugzeugbezeichnung - r'AH-1W', # Hubschrauberbezeichnung - r'ZPG-3W', # Luftschiffbezeichnung - r'8mm', # Filmtitel - r'802.11g', # WLAN-Standard - r'DOS/4GW', # Software - r'ntfs-3g', # Dateisystem-Treiber - r'/\w(,\w)*/', # Laut-Aufzählung in der Linguistik - r'[xyz](,[xyz])+', # Variablen in der Mathematik (unklar, ob Leerzeichen hier Pflicht sind) - r'(?m)^;(.*?)$', # Definitionslisten, dort gibt es oft absichtlich Leerzeichen vor Doppelpunkten - r'\d+h( | )\d+m', # Schreibweise für Zeiten, vor allem in Film-Infoboxen. Nicht korrekt, aber dafür schön kurz. - r'(?i)\[\[(Bild|Image|Media):.+?\|', # Dateinamen auslassen - r'{{bgc\|.*?}}', # Hintergrundfarbe - r'<sup>\d+m</sup>', # bei chemischen Formeln - r'$[A-Z][A-Za-z]*(,[A-Z][A-Za-z]*(<sup>.*?</sup>|<sub>.*?</sub>|))+$' # chemische Formel, z. B. AuPb(Pb,Sb,Bi)Te. Hier sollen keine Leerzeichen hinter die Kommata. + r'Ju 52/1m', # Flugzeugbezeichnung + r'Ju 52/3m', # Flugzeugbezeichnung + r'AH-1W', # Hubschrauberbezeichnung + r'ZPG-3W', # Luftschiffbezeichnung + r'8mm', # Filmtitel + r'802.11g', # WLAN-Standard + r'DOS/4GW', # Software + r'ntfs-3g', # Dateisystem-Treiber + r'/\w(,\w)*/', # Laut-Aufzählung in der Linguistik + r'[xyz](,[xyz])+', # Variablen in der Mathematik (unklar, ob Leerzeichen hier Pflicht sind) + r'(?m)^;(.*?)$', # Definitionslisten, dort gibt es oft absichtlich Leerzeichen vor Doppelpunkten + r'\d+h( | )\d+m', # Schreibweise für Zeiten, vor allem in Film-Infoboxen. Nicht korrekt, aber dafür schön kurz. + r'(?i)\[\[(Bild|Image|Media):.+?\|', # Dateinamen auslassen + r'{{bgc\|.*?}}', # Hintergrundfarbe + r'<sup>\d+m</sup>', # bei chemischen Formeln + # chemische Formel, z. B. AuPb(Pb,Sb,Bi)Te. Hier sollen keine + # Leerzeichen hinter die Kommata. + r'$[A-Z][A-Za-z]*(,[A-Z][A-Za-z]*(<sup>.*?</sup>|<sub>.*?</sub>|))+$' ], 'title': [ r'Arsen', # chemische Formel @@ -191,26 +193,26 @@ 'syntax': { 'regex': True, 'msg': { - 'ar':u'بوت: تصليح تهيئة الويكي', - 'be':u'Бот: Карэкцыя вiкi-сiнтаксiсу', - 'be-x-old':u'Бот выпраўляе вiкi-сынтаксiс', - 'cs':u'Oprava wikisyntaxe', - 'de':u'Bot: Korrigiere Wiki-Syntax', - 'en':u'Robot: Fixing wiki syntax', - 'eo':u'Bot: Korektado de vikia sintakso', - 'fa':u'ربات:تصحیح قالب ویکی‌نویسی', - 'fr':u'Bot: Corrige wiki-syntaxe', - 'he':u'בוט: מתקן תחביר ויקי', - 'ia':u'Robot: Reparation de syntaxe wiki', - 'ja':u'ロボットによる: wiki構文修正', - 'lt':u'robotas: Taisoma wiki sintaksė', - 'nl':u'Bot: reparatie wikisyntaxis', - 'pl':u'Robot poprawia wiki-składnię', - 'pt':u'Bot: Corrigindo sintaxe wiki', - 'ru':u'Бот: Коррекция вики синтаксиса', - 'sr':u'Бот: Поправка вики синтаксе', - 'uk':u'Бот: Корекцiя вiкi-синтаксису', - 'zh':u'機器人: 修正wiki語法', + 'ar': u'بوت: تصليح تهيئة الويكي', + 'be': u'Бот: Карэкцыя вiкi-сiнтаксiсу', + 'be-x-old': u'Бот выпраўляе вiкi-сынтаксiс', + 'cs': u'Oprava wikisyntaxe', + 'de': u'Bot: Korrigiere Wiki-Syntax', + 'en': u'Robot: Fixing wiki syntax', + 'eo': u'Bot: Korektado de vikia sintakso', + 'fa': u'ربات:تصحیح قالب ویکی‌نویسی', + 'fr': u'Bot: Corrige wiki-syntaxe', + 'he': u'בוט: מתקן תחביר ויקי', + 'ia': u'Robot: Reparation de syntaxe wiki', + 'ja': u'ロボットによる: wiki構文修正', + 'lt': u'robotas: Taisoma wiki sintaksė', + 'nl': u'Bot: reparatie wikisyntaxis', + 'pl': u'Robot poprawia wiki-składnię', + 'pt': u'Bot: Corrigindo sintaxe wiki', + 'ru': u'Бот: Коррекция вики синтаксиса', + 'sr': u'Бот: Поправка вики синтаксе', + 'uk': u'Бот: Корекцiя вiкi-синтаксису', + 'zh': u'機器人: 修正wiki語法', }, 'replacements': [ # external link in double brackets @@ -251,14 +253,14 @@ 'startspace', # because of code examples ], 'text-contains': [ - r'http://.*?object=tx\|', # regular dash in URL - r'http://.*?allmusic\.com', # regular dash in URL - r'http://.*?allmovie\.com', # regular dash in URL - r'http://physics.nist.gov/', # regular dash in URL - r'http://www.forum-seniorenarbeit.de/', # regular dash in URL - r'http://kuenstlerdatenbank.ifa.de/', # regular dash in URL - r'&object=med', # regular dash in URL - r'\[CDATA\[' # lots of brackets + r'http://.*?object=tx\|', # regular dash in URL + r'http://.*?allmusic\.com', # regular dash in URL + r'http://.*?allmovie\.com', # regular dash in URL + r'http://physics.nist.gov/', # regular dash in URL + r'http://www.forum-seniorenarbeit.de/', # regular dash in URL + r'http://kuenstlerdatenbank.ifa.de/', # regular dash in URL + r'&object=med', # regular dash in URL + r'\[CDATA\[' # lots of brackets ], } }, @@ -268,26 +270,26 @@ 'syntax-safe': { 'regex': True, 'msg': { - 'ar':u'بوت: تصليح تهيئة الويكي', - 'be':u'Бот: Карэкцыя вiкi-сiнтаксiсу', - 'be-x-old':u'Бот выпраўляе вiкi-сынтаксiс', - 'cs':u'Oprava wikisyntaxe', - 'de':u'Bot: Korrigiere Wiki-Syntax', - 'en':u'Robot: Fixing wiki syntax', - 'eo':u'Bot: Korektado de vikia sintakso', - 'fa':u'ربات:تصحیح قالب ویکی‌نویسی', - 'fr':u'Bot: Corrige wiki-syntaxe', - 'he':u'בוט: מתקן תחביר ויקי', - 'ia':u'Robot: Reparation de syntaxe wiki', - 'ja':u'ロボットによる: wiki構文修正', - 'lt':u'robotas: Taisoma wiki sintaksė', - 'nl':u'Bot: reparatie wikisyntaxis', - 'pl':u'Robot poprawia wiki-składnię', - 'pt':u'Bot: Corrigindo sintaxe wiki', - 'ru':u'Бот: Коррекция вики синтаксиса', - 'sr':u'Бот: Поправка вики синтаксе', - 'uk':u'Бот: Корекцiя вiкi-синтаксису', - 'zh':u'機器人: 修正wiki語法', + 'ar': u'بوت: تصليح تهيئة الويكي', + 'be': u'Бот: Карэкцыя вiкi-сiнтаксiсу', + 'be-x-old': u'Бот выпраўляе вiкi-сынтаксiс', + 'cs': u'Oprava wikisyntaxe', + 'de': u'Bot: Korrigiere Wiki-Syntax', + 'en': u'Robot: Fixing wiki syntax', + 'eo': u'Bot: Korektado de vikia sintakso', + 'fa': u'ربات:تصحیح قالب ویکی‌نویسی', + 'fr': u'Bot: Corrige wiki-syntaxe', + 'he': u'בוט: מתקן תחביר ויקי', + 'ia': u'Robot: Reparation de syntaxe wiki', + 'ja': u'ロボットによる: wiki構文修正', + 'lt': u'robotas: Taisoma wiki sintaksė', + 'nl': u'Bot: reparatie wikisyntaxis', + 'pl': u'Robot poprawia wiki-składnię', + 'pt': u'Bot: Corrigindo sintaxe wiki', + 'ru': u'Бот: Коррекция вики синтаксиса', + 'sr': u'Бот: Поправка вики синтаксе', + 'uk': u'Бот: Корекцiя вiкi-синтаксису', + 'zh': u'機器人: 修正wiki語法', }, 'replacements': [ # external link in double brackets @@ -317,17 +319,17 @@ } }, - 'case-de': { # German upper / lower case issues + 'case-de': { # German upper / lower case issues 'regex': True, 'msg': { - 'de':u'Bot: Korrigiere Groß-/Kleinschreibung', + 'de': u'Bot: Korrigiere Groß-/Kleinschreibung', }, 'replacements': [ (r'\batlantische(r|n|) Ozean', r'Atlantische\1 Ozean'), (r'\bdeutsche(r|n|) Bundestag\b', r'Deutsche\1 Bundestag'), - (r'\bdeutschen Bundestags\b', r'Deutschen Bundestags'), # Aufpassen, z. B. 'deutsche Bundestagswahl' + (r'\bdeutschen Bundestags\b', r'Deutschen Bundestags'), # Aufpassen, z. B. 'deutsche Bundestagswahl' (r'\bdeutsche(r|n|) Reich\b', r'Deutsche\1 Reich'), - (r'\bdeutschen Reichs\b', r'Deutschen Reichs'), # Aufpassen, z. B. 'deutsche Reichsgrenzen' + (r'\bdeutschen Reichs\b', r'Deutschen Reichs'), # Aufpassen, z. B. 'deutsche Reichsgrenzen' (r'\bdritte(n|) Welt(?!krieg)', r'Dritte\1 Welt'), (r'\bdreißigjährige(r|n|) Krieg', r'Dreißigjährige\1 Krieg'), (r'\beuropäische(n|) Gemeinschaft', r'Europäische\1 Gemeinschaft'), @@ -356,7 +358,7 @@ 'vonbis': { 'regex': True, 'msg': { - 'de':u'Bot: Ersetze Binde-/Gedankenstrich durch "bis"', + 'de': u'Bot: Ersetze Binde-/Gedankenstrich durch "bis"', }, 'replacements': [ # Bindestrich, Gedankenstrich, Geviertstrich @@ -369,7 +371,7 @@ 'music-de': { 'regex': False, 'msg': { - 'de':u'Bot: korrigiere Links auf Begriffsklärungen', + 'de': u'Bot: korrigiere Links auf Begriffsklärungen', }, 'replacements': [ (u'[[CD]]', u'[[Audio-CD|CD]]'), @@ -413,10 +415,10 @@ ], 'exceptions': { 'inside': [ - r'\[\[20. Juli 1944\]\]', # Hitler-Attentat - r'\[\[17. Juni 1953\]\]', # Ost-Berliner Volksaufstand - r'\[\[1. April 2000\]\]', # Film - r'\[\[11. September 2001\]\]', # Anschläge in den USA + r'\[\[20. Juli 1944\]\]', # Hitler-Attentat + r'\[\[17. Juni 1953\]\]', # Ost-Berliner Volksaufstand + r'\[\[1. April 2000\]\]', # Film + r'\[\[11. September 2001\]\]', # Anschläge in den USA r'\[\[7. Juli 2005\]\]', # Terroranschläge in Spanien ], } @@ -424,7 +426,7 @@ 'isbn': { 'regex': True, - 'msg': 'isbn-formatting', # use i18n translations + 'msg': 'isbn-formatting', # use i18n translations 'replacements': [ # colon (r'ISBN: (\d+)', r'ISBN \1'), @@ -434,8 +436,10 @@ # hyphen-minus as separator, or spaces between digits and separators. # Note that these regular expressions also match valid ISBNs, but # these won't be changed. - (ur'ISBN (978|979) *[\- −\.‐-―] *(\d+) *[\- −\.‐-―] *(\d+) *[\- −\.‐-―] *(\d+) *[\- −\.‐-―] *(\d)(?!\d)', r'ISBN \1-\2-\3-\4-\5'), # ISBN-13 - (ur'ISBN (\d+) *[\- −\.‐-―] *(\d+) *[\- −\.‐-―] *(\d+) *[\- −\.‐-―] *(\d|X|x)(?!\d)', r'ISBN \1-\2-\3-\4'), # ISBN-10 + # ISBN-13 + (ur'ISBN (978|979) *[\- −\.‐-―] *(\d+) *[\- −\.‐-―] *(\d+) *[\- −\.‐-―] *(\d+) *[\- −\.‐-―] *(\d)(?!\d)', r'ISBN \1-\2-\3-\4-\5'), + # ISBN-10 + (ur'ISBN (\d+) *[\- −\.‐-―] *(\d+) *[\- −\.‐-―] *(\d+) *[\- −\.‐-―] *(\d|X|x)(?!\d)', r'ISBN \1-\2-\3-\4'), # missing space before ISBN-10 or before ISBN-13, # or non-breaking space. (r'ISBN(| | )((\d(-?)){12}\d|(\d(-?)){9}[\dXx])', r'ISBN \2'), @@ -447,7 +451,7 @@ ], 'inside': [ r'ISBN (\d(-?)){12}\d', # matches valid ISBN-13s - r'ISBN (\d(-?)){9}[\dXx]', # matches valid ISBN-10s + r'ISBN (\d(-?)){9}[\dXx]', # matches valid ISBN-10s ], } }, @@ -458,7 +462,7 @@ 'correct-ar': { 'regex': True, 'msg': { - 'ar':u'تدقيق إملائي', + 'ar': u'تدقيق إملائي', }, 'replacements': [ #(u' ,', u' ،'), #FIXME: Do not replace comma in non-Arabic text, interwiki, image links or <math> syntax. @@ -565,7 +569,7 @@ 'regex': False, 'msg': { 'en': u'Robot: Fixing special page capitalisation', - 'fa':u'ربات: تصحیح بزرگی و کوچکی حروف صفحه‌های ویژه', + 'fa': u'ربات: تصحیح بزرگی و کوچکی حروف صفحه‌های ویژه', }, 'replacements': [ (u'Special:Allpages', u'Special:AllPages'), @@ -600,8 +604,8 @@ 'fa': u'ربات: جایگزینی پیوندها به دامنه‌ها با پسوند yu', 'fr': u'Robot: Correction des liens pointant vers le domaine .yu, qui expire en 2009', 'ksh': u'Bot: de ahle .yu-Domains loufe us, dröm ußjetuusch', - }, - 'replacements': [ + }, + 'replacements': [ (u'www.budva.cg.yu', u'www.budva.rs'), (u'spc.org.yu', u'spc.rs'), (u'www.oks.org.yu', u'www.oks.org.rs'), @@ -653,12 +657,12 @@ 'msg': { 'en': u'Robot: Fixing rich-editor html', 'fa': u'ربات: تصحیح اچ‌تی‌ام‌ال ویرایشگر پیشرفته', - }, - 'replacements': [ + }, + 'replacements': [ # replace <br> with a new line - (r'(?i)<br>', r'\n'), + (r'(?i)<br>', r'\n'), # replace   with a space - (r'(?i) ', r' '), + (r'(?i) ', r' '), ], }, } -- To view, visit https://gerrit.wikimedia.org/r/94869 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6ef4a5fa5671f462a5042fd766887f90b2b7075d Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] [PEP8] pep8ify welcome.py - change (pywikibot/compat)
by jenkins-bot (Code Review) 12 Nov '13

12 Nov '13

jenkins-bot has submitted this change and it was merged. Change subject: [PEP8] pep8ify welcome.py ...................................................................... [PEP8] pep8ify welcome.py Change-Id: Ie276842e02658562f896eae34084ffbcd25cd8cd --- M welcome.py 1 file changed, 213 insertions(+), 131 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/welcome.py b/welcome.py index 8beb8fc..8ac323b 100644 --- a/welcome.py +++ b/welcome.py @@ -181,14 +181,19 @@ __version__ = '$Id$' # -import time, re, urllib, locale +import time +import re +import urllib +import locale import codecs from datetime import timedelta from random import choice from string import capitalize import wikipedia as pywikibot from pywikibot import i18n -import config, query, userlib +import config +import query +import userlib locale.setlocale(locale.LC_ALL, '') @@ -227,7 +232,7 @@ # that is your signature (the bot has a random parameter to add different # sign, so in this way it will change according to your parameters). netext = { - 'commons': {'_default': u'{{subst:welcome}} %s', } , + 'commons': {'_default': u'{{subst:welcome}} %s', }, 'wikipedia': { 'am': u'{{subst:Welcome}} %s', 'ar': u'{{subst:ترحيب}} %s', @@ -246,7 +251,7 @@ 'nap': u'{{Bemmenuto}}%s', 'nl': u'{{hola|bot|%s}}', 'no': u'{{subst:bruker:jhs/vk}} %s', - 'pdc':u'{{subst:Wilkum}}%s', + 'pdc': u'{{subst:Wilkum}}%s', 'pt': u'{{subst:bem vindo}} %s', 'roa-tara': u'{{Bovègne}} %s', 'ru': u'{{Hello}} %s', @@ -257,17 +262,17 @@ 'zh': u'{{subst:welcome|sign=%s}}', 'zh-yue': u'{{歡迎}}--%s', }, - 'wikinews':{ + 'wikinews': { 'fa': u'{{خوشامد۲|%s}}', 'it': u'{{subst:benvenuto}}', 'zh': u'{{subst:welcome}} %s', }, - 'wiktionary':{ + 'wiktionary': { 'bn': u'{{subst:User:Wikitanvir/welcome|firma=%s}}', 'fa': u'{{جا:خوشامد|%s}}', 'it': u'{{subst:Utente:Filnik/Benve|firma=%s}}', }, - 'wikiversity':{ + 'wikiversity': { 'de': u'{{subst:Willkommen|%s}}', 'el': u'{{subst:καλωσόρισμα}} %s', 'en': u'{{subst:Welcome}}\n\n{{subst:Talktome}} %s', @@ -291,7 +296,7 @@ 'ja': u'利用者:Alexbot/report', 'nl': u'Project:Verzoekpagina voor moderatoren/RegBlok/Te controleren gebruikersnamen', 'no': u'Bruker:JhsBot II/Rapport', - 'pdc':u'Benutzer:Xqt/Report', + 'pdc': u'Benutzer:Xqt/Report', 'ru': u'Участник:LatitudeBot/Рапорт', 'sq': u'User:EagleBot/Report', 'sr': u'User:SashatoBot/Записи', @@ -303,7 +308,7 @@ # (this parameter is optional). bad_pag = { 'commons': {'_default': u'Project:Welcome log/Bad_names', }, - 'wikipedia':{ + 'wikipedia': { 'am': u'User:Beria/Bad_names', 'ar': u'Project:سجل الترحيب/أسماء سيئة', 'en': u'Project:Welcome log/Bad_names', @@ -320,12 +325,13 @@ } } -timeselected = u' ~~~~~' # Defining the time used after the signature +timeselected = u' ~~~~~' # Defining the time used after the signature -# The text for reporting a possibly bad username (e.g. *[[Talk_page:Username|Username]]). +# The text for reporting a possibly bad username +# e.g. *[[Talk_page:Username|Username]]). report_text = { - 'commons': {'_default': u"\n*{{user3|%s}}" + timeselected,}, - 'wikipedia':{ + 'commons': {'_default': u"\n*{{user3|%s}}" + timeselected, }, + 'wikipedia': { 'am': u"\n*[[User talk:%s]]" + timeselected, 'ar': u"\n*{{user13|%s}}" + timeselected, 'da': u'\n*[[Bruger Diskussion:%s]] ' + timeselected, @@ -338,7 +344,7 @@ 'ja': u"\n*{{User2|%s}}" + timeselected, 'nl': u'\n*{{linkgebruiker%s}} ' + timeselected, 'no': u'\n*{{bruker|%s}} ' + timeselected, - 'pdc':u'\n*[[Benutzer Diskussion:%s]] ' + timeselected, + 'pdc': u'\n*[[Benutzer Diskussion:%s]] ' + timeselected, 'sq': u'\n*[[User:%s]] ' + timeselected, 'zh': u"\n*{{User|%s}}" + timeselected } @@ -353,37 +359,40 @@ 'fa': u'Project:سیاهه خوشامد/امضاها', 'fr': u'Projet:Service de Parrainage Actif/Signatures', 'it': u'Project:Benvenuto_Bot/Firme', - 'ja': None, #jawiki comminuty discussion oppose , [[ja:Wikipedia:Bot作業依頼/ウェルカムメッセージ貼り付け依頼]] + + # jawiki comminuty discussion oppose, + # [[ja:Wikipedia:Bot作業依頼/ウェルカムメッセージ貼り付け依頼]] + 'ja': None, 'nap': u'User:Cellistbot/Firme', 'roa-tara': u'Wikipedia:Bovègne Bot/Firme', 'ru': u'Участник:LatitudeBot/Sign', 'vec': u'Utente:FriBot/Firme', 'zh': u'User:Welcomebot/欢迎日志/用户', - } +} # The page where the bot reads the real-time whitelist page. # (this parameter is optional). whitelist_pg = { '_default': None, - 'ar':u'Project:سجل الترحيب/قائمة بيضاء', - 'en':u'User:Filnik/whitelist', - 'ga':u'Project:Log fáilte/Bánliosta', - 'it':u'Project:Benvenuto_Bot/Lista_Whitewords', - 'ru':u'Участник:LatitudeBot/Белый_список', - } + 'ar': u'Project:سجل الترحيب/قائمة بيضاء', + 'en': u'User:Filnik/whitelist', + 'ga': u'Project:Log fáilte/Bánliosta', + 'it': u'Project:Benvenuto_Bot/Lista_Whitewords', + 'ru': u'Участник:LatitudeBot/Белый_список', +} # Text after the {{welcome}} template, if you want to add something # Default (en): nothing. final_new_text_additions = { - 'it':u'\n', - 'zh':'<small>(via ~~~)</small>', - } + 'it': u'\n', + 'zh': '<small>(via ~~~)</small>', +} # # logpage_header = { - '_default' :u'{|border="2" cellpadding="4" cellspacing="0" style="margin: 0.5em 0.5em 0.5em 1em; padding: 0.5em; background: #bfcda5; border: 1px #b6fd2c solid; border-collapse: collapse; font-size: 95%;"', - 'no':u'[[Kategori:Velkomstlogg|{{PAGENAME}}]]\n{| class="wikitable"', - 'it':u'[[Categoria:Benvenuto log|{{subst:PAGENAME}}]]\n{|border="2" cellpadding="4" cellspacing="0" style="margin: 0.5em 0.5em 0.5em 1em; padding: 0.5em; background: #bfcda5; border: 1px #b6fd2c solid; border-collapse: collapse; font-size: 95%;"' + '_default': u'{|border="2" cellpadding="4" cellspacing="0" style="margin: 0.5em 0.5em 0.5em 1em; padding: 0.5em; background: #bfcda5; border: 1px #b6fd2c solid; border-collapse: collapse; font-size: 95%;"', + 'no': u'[[Kategori:Velkomstlogg|{{PAGENAME}}]]\n{| class="wikitable"', + 'it': u'[[Categoria:Benvenuto log|{{subst:PAGENAME}}]]\n{|border="2" cellpadding="4" cellspacing="0" style="margin: 0.5em 0.5em 0.5em 1em; padding: 0.5em; background: #bfcda5; border: 1px #b6fd2c solid; border-collapse: collapse; font-size: 95%;"' } # Ok, that's all. What is below, is the rest of code, now the code is fixed @@ -392,8 +401,10 @@ ############################################################################ ############################################################################ + class FilenameNotSet(pywikibot.Error): """An exception indicating that a signature filename was not specifed.""" + class Global(object): """Container class for global settings. @@ -416,8 +427,8 @@ queryLimit = 50 # number of users that the bot load to check quiet = False # Prevents users without contributions are displayed quick = False # Provide quick check by API bulk-retrieve user datas +## fileOption = False # check if the user wants to use a file or the wikipage - #fileOption = False # check if the user wants to use a file or the wikipage class WelcomeBot(object): @@ -431,10 +442,10 @@ if globalvar.randomSign: self.defineSign(True) - if __name__ != '__main__': #use only in module call + if __name__ != '__main__': # use only in module call self._checkQueue = [] - def badNameFilter(self, name, force = False): + def badNameFilter(self, name, force=False): if not globalvar.filtBadName: return False @@ -464,19 +475,23 @@ 'testicol', 'troia', 'universetoday.net', 'vaffanculo', 'vagina', 'vibrator', "vacca", 'yiddiot', "zoccola", ] - elenco_others = ['@', ".com", ".sex", ".org", ".uk", ".en", ".it", "admin", - "administrator", "amministratore", '@yahoo.com', '@alice.com', "amministratrice", - "burocrate", "checkuser", "developer", "http://", "jimbo", "mediawiki", - "on wheals", "on wheal", "on wheel", "planante", "razinger", "sysop", "troll", - "vandal", " v.f. ", "v. fighter", "vandal f.", "vandal fighter", 'wales jimmy', - "wheels", "wales", "www.", + elenco_others = [ + '@', ".com", ".sex", ".org", ".uk", ".en", ".it", "admin", + "administrator", "amministratore", '@yahoo.com', '@alice.com', + "amministratrice", "burocrate", "checkuser", "developer", "http://", + "jimbo", "mediawiki", "on wheals", "on wheal", "on wheel", "planante", + "razinger", "sysop", "troll", "vandal", " v.f. ", "v. fighter", + "vandal f.", "vandal fighter", 'wales jimmy', "wheels", "wales", + "www.", ] - #blacklist from wikipage - badword_page = pywikibot.Page(self.site, pywikibot.translate(self.site, bad_pag) ) + # blacklist from wikipage + badword_page = pywikibot.Page(self.site, + pywikibot.translate(self.site, bad_pag)) list_loaded = list() if badword_page.exists(): - pywikibot.output(u'\nLoading the bad words list from %s...' % self.site ) + pywikibot.output(u'\nLoading the bad words list from %s...' + % self.site) list_loaded = load_word_function(badword_page.get()) else: showStatus(4) @@ -485,14 +500,15 @@ del elenco, elenco_others, list_loaded if not hasattr(self, '_whitelist') or force: - #initialize whitelist + # initialize whitelist whitelist_default = ['emiliano'] wtlpg = pywikibot.translate(self.site, whitelist_pg) list_white = list() if wtlpg: whitelist_page = pywikibot.Page(self.site, wtlpg) if whitelist_page.exists(): - pywikibot.output(u'\nLoading the whitelist from %s...' % self.site ) + pywikibot.output(u'\nLoading the whitelist from %s...' + % self.site) list_white = load_word_function(whitelist_page.get()) else: showStatus(4) @@ -516,19 +532,21 @@ pass try: for bname in self._blacklist: - if bname.lower() in str(name).lower(): #bad name positive + if bname.lower() in str(name).lower(): # bad name positive self.bname[name] = bname return True except UnicodeEncodeError: pass return False - def reportBadAccount(self, name = None, final = False): + def reportBadAccount(self, name=None, final=False): #Queue process if name: if globalvar.confirm: - answer = pywikibot.inputChoice(u'%s may have an unwanted username, do you want to report this user?' - % name, ['Yes', 'No', 'All'], ['y', 'N', 'a'], 'N') + answer = pywikibot.inputChoice( + u'%s may have an unwanted username, do you want to report ' + u'this user?' % name, + ['Yes', 'No', 'All'], ['y', 'N', 'a'], 'N') if answer in ['a', 'all']: answer = 'y' globalvar.confirm = False @@ -537,7 +555,9 @@ if answer.lower() in ['yes', 'y'] or not globalvar.confirm: showStatus() - pywikibot.output(u'%s is possibly an unwanted username. It will be reported.' % name) + pywikibot.output( + u'%s is possibly an unwanted username. It will be reported.' + % name) if hasattr(self, '_BAQueue'): self._BAQueue.append(name) else: @@ -545,50 +565,58 @@ if len(self._BAQueue) >= globalvar.dumpToLog or final: rep_text = '' - #name in queue is max, put detail to report page + # name in queue is max, put detail to report page pywikibot.output("Updating badname accounts to report page...") - rep_page = pywikibot.Page(self.site, pywikibot.translate(self.site, report_page) ) + rep_page = pywikibot.Page(self.site, + pywikibot.translate(self.site, + report_page)) if rep_page.exists(): text_get = rep_page.get() else: text_get = u'This is a report page for the Bad-username, please translate me. --~~~' pos = 0 - # The talk page includes "_" between the two names, in this way i replace them to " ". + # The talk page includes "_" between the two names, in this way i + # replace them to " ". for usrna in self._BAQueue: username = pywikibot.url2link(usrna, self.site, self.site) n = re.compile(re.escape(username), re.UNICODE) y = n.search(text_get, pos) if y: - pywikibot.output(u'%s is already in the report page.' % username) + pywikibot.output(u'%s is already in the report page.' + % username) else: # Adding the log. - rep_text += pywikibot.translate(self.site, report_text) % username + rep_text += pywikibot.translate(self.site, report_text) + % username if self.site.lang == 'it': rep_text = "%s%s}}" % (rep_text, self.bname[username]) com = i18n.twtranslate(self.site, 'welcome-bad_username') if rep_text != '': - rep_page.put(text_get + rep_text, comment = com, force = True, minorEdit = True) + rep_page.put(text_get + rep_text, comment=com, force=True, + minorEdit=True) showStatus(5) pywikibot.output(u'Reported') self.BAQueue = list() else: return True - def makelogpage(self, queue = []): - if not globalvar.makeWelcomeLog: - return None - if len(queue) == 0: - return None + def makelogpage(self, queue=None): + if queue is None: + queue = [] + if not globalvar.makeWelcomeLog or len(queue) == 0: + return text = u'' logg = pywikibot.translate(self.site, logbook, fallback=False) if not logg: - return None + return - target = logg + '/' + time.strftime('%Y/%m/%d', time.localtime(time.time())) + target = logg + '/' + time.strftime('%Y/%m/%d', + time.localtime(time.time())) if self.site.lang == 'it': - target = logg + '/' + time.strftime('%d/%m/%Y', time.localtime(time.time())) + target = logg + '/' + time.strftime('%d/%m/%Y', + time.localtime(time.time())) logPage = pywikibot.Page(self.site, target) if logPage.exists(): @@ -596,15 +624,18 @@ else: #make new log page showStatus() - pywikibot.output('Log page is not exist, getting information for page creation') + pywikibot.output( + 'Log page is not exist, getting information for page creation') text = pywikibot.translate(self.site, logpage_header) text += u'\n!%s' % self.site.namespace(2) - text += u'\n!%s' % capitalize(self.site.mediawiki_message('contribslink')) + text += u'\n!%s' % capitalize( + self.site.mediawiki_message('contribslink')) for result in queue: # Adding the log... (don't take care of the variable's name...). luser = pywikibot.url2link(result.name(), self.site, self.site) - text += u'\n{{WLE|user=%s|contribs=%d}}' % (luser, result.editCount()) + text += u'\n{{WLE|user=%s|contribs=%d}}' % ( + luser, result.editCount()) #update log page. while True: try: @@ -612,7 +643,8 @@ 'welcome-updating')) return True except pywikibot.EditConflict: - pywikibot.output(u'An edit conflict has occured. Pausing for 10 seconds before continuing.') + pywikibot.output(u'An edit conflict has occured. Pausing for ' + u'10 seconds before continuing.') time.sleep(10) def parseNewUserLog(self): @@ -628,14 +660,17 @@ starttime = None if globalvar.timeoffset != 0: - now = self.site.server_time() - timedelta(minutes=globalvar.timeoffset) + now = self.site.server_time() - timedelta( + minutes=globalvar.timeoffset) starttime = int(now.strftime("%Y%m%d%H%M%S")) elif globalvar.offset != 0: starttime = globalvar.offset count_auto = 0 pywikibot.output("Querying new user log from API....") - for x in self.site.logpages(number = globalvar.queryLimit, mode = 'newusers',start = starttime, dump = True): + for x in self.site.logpages(number=globalvar.queryLimit, + mode='newusers', start=starttime, + dump=True): someone_found = True if 'user' not in x: continue @@ -645,7 +680,8 @@ if not globalvar.welcomeAuto and x['action'] == 'autocreate': if not globalvar.quick: showStatus(3) - pywikibot.output(u'%s has been created automatically.' % x['user']) + pywikibot.output(u'%s has been created automatically.' + % x['user']) count_auto += 1 continue @@ -654,7 +690,8 @@ if someone_found: if globalvar.quick and count_auto > 0: showStatus() - pywikibot.output(u'Ignored %d user(s) by auto-create' % count_auto) + pywikibot.output(u'Ignored %d user(s) by auto-create' + % count_auto) showStatus(5) pywikibot.output(u'There is nobody left to be welcomed...') @@ -665,7 +702,8 @@ someone_found = False URL = self.site.log_address(globalvar.queryLimit, 'newusers') if globalvar.timeoffset != 0: - now = self.site.server_time() - timedelta(minutes=globalvar.timeoffset) + now = self.site.server_time() - timedelta( + minutes=globalvar.timeoffset) globalvar.offset = int(now.strftime("%Y%m%d%H%M%S")) if globalvar.offset != 0: URL += "&offset=%d" % globalvar.offset @@ -675,7 +713,7 @@ # I search with a regex how many user have not the talk page # and i put them in a list (i find it more easy and secure). # XXX: That's the regex, if there are problems, take a look here. - reg = u'\(<a href=\"' + re.escape(self.site.path()) + reg = u'\(<a href=\"' + re.escape(self.site.path()) reg += u'\?title=%s(?P<user>.*?)&(?:amp;|)action=(?:edit|editredlink|edit&redlink=1)\"' % re.escape('%s:' % urllib.quote(self.site.namespace(3).replace(" ", "_").encode(self.site.encoding()))) reg += u'.*?</span> (?P<reason>.*?) *?</li>' @@ -685,9 +723,11 @@ someone_found = True userN = unicode(urllib.unquote(str(x.group('user'))), 'utf-8') #skip autocreated users (SUL) - if not globalvar.welcomeAuto and self.site.mediawiki_message('newuserlog-autocreate-entry') in x.group('reason'): + if not globalvar.welcomeAuto and self.site.mediawiki_message( + 'newuserlog-autocreate-entry') in x.group('reason'): showStatus(3) - pywikibot.output(u'%s has been created automatically, skipping...' % userN) + pywikibot.output( + u'%s has been created automatically, skipping...' % userN) continue #FIXME: It counts the first 50 edits @@ -701,8 +741,8 @@ else: pywikibot.output(u'\nLoaded all users...') - def defineSign(self, force = False): - if hasattr(self,'_randomSignature') and not force: + def defineSign(self, force=False): + if hasattr(self, '_randomSignature') and not force: return self._randomSignature signText = u'' @@ -711,24 +751,28 @@ signPageName = pywikibot.translate(self.site, random_sign) if not signPageName: showStatus(4) - pywikibot.output("%s doesn't allow random signature, force disable." % self.site) + pywikibot.output( + "%s doesn't allow random signature, force disable." + % self.site) globalvar.randomSign = False - return None + return - signPage = pywikibot.Page(self.site, signPageName ) + signPage = pywikibot.Page(self.site, signPageName) if signPage.exists(): pywikibot.output('Loading signature list...') signText = signPage.get() else: - pywikibot.output('The Signature list page is not exist, random signature will disable.') + pywikibot.output('The Signature list page is not exist, random ' + 'signature will disable.') globalvar.randomSign = False else: try: - f = codecs.open(pywikibot.config.datafilepath(globalvar.signFileName), 'r', - encoding=config.console_encoding) + f = codecs.open( + pywikibot.config.datafilepath(globalvar.signFileName), 'r', + encoding=config.console_encoding) except LookupError: - f = codecs.open(pywikibot.config.datafilepath(globalvar.signFileName), 'r', - encoding='utf-8') + f = codecs.open(pywikibot.config.datafilepath( + globalvar.signFileName), 'r', encoding='utf-8') except IOError: pywikibot.error(u'No fileName!') raise FilenameNotSet("No signature filename specified.") @@ -754,25 +798,28 @@ for users in us: if users.isBlocked(): showStatus(3) - pywikibot.output(u'%s has been blocked!' % users.name() ) + pywikibot.output(u'%s has been blocked!' % users.name()) continue if 'bot' in users.groups(): showStatus(3) - pywikibot.output(u'%s is a bot!' % users.name() ) + pywikibot.output(u'%s is a bot!' % users.name()) continue if 'bot' in users.name().lower(): showStatus(3) - pywikibot.output(u'%s might be a global bot!' % users.name() ) + pywikibot.output(u'%s might be a global bot!' + % users.name()) continue #if globalvar.offset != 0 and time.strptime(users.registrationTime(), "%Y-%m-%dT%H:%M:%SZ") >= globalvar.offset: # if users.editCount() >= globalvar.attachEditCount: showStatus(2) - pywikibot.output(u'%s has enough edits to be welcomed.' % users.name() ) + pywikibot.output(u'%s has enough edits to be welcomed.' + % users.name()) ustp = users.getUserTalkPage() if ustp.exists(): showStatus(3) - pywikibot.output(u'%s has been already welcomed.' % users.name()) + pywikibot.output(u'%s has been already welcomed.' + % users.name()) continue else: if self.badNameFilter(users.name()): @@ -781,35 +828,44 @@ welcome_text = pywikibot.translate(self.site, netext) if globalvar.randomSign: if self.site.family != 'wikinews': - welcome_text = welcome_text % choice(self.defineSign()) - if self.site.family == 'wiktionary' and self.site.lang == 'it': + welcome_text = (welcome_text + % choice(self.defineSign())) + if self.site.family == 'wiktionary' and \ + self.site.lang == 'it': pass else: welcome_text += timeselected - elif (self.site.family != 'wikinews' and self.site.lang != 'it'): - welcome_text = welcome_text % globalvar.defaultSign + elif (self.site.family != 'wikinews' and + self.site.lang != 'it'): + welcome_text = (welcome_text + % globalvar.defaultSign) if self.site.lang in final_new_text_additions: - welcome_text += pywikibot.translate(self.site, final_new_text_additions) + welcome_text += pywikibot.translate( + self.site, final_new_text_additions) welcome_comment = i18n.twtranslate(self.site, 'welcome-welcome') try: #append welcomed, welcome_count++ - ustp.put(welcome_text, welcome_comment, minorEdit=False) + ustp.put(welcome_text, welcome_comment, + minorEdit=False) welcomed_count += 1 self._totallyCount += 1 self.welcomed_users.append(users) except pywikibot.EditConflict: showStatus(4) - pywikibot.output(u'An edit conflict has occured, skipping this user.') + pywikibot.output(u'An edit conflict has occured, ' + u'skipping this user.') - if globalvar.makeWelcomeLog and pywikibot.translate(self.site, logbook): + if globalvar.makeWelcomeLog and \ + pywikibot.translate(self.site, logbook): showStatus(5) if welcomed_count == 1: pywikibot.output(u'One user has been welcomed.') elif welcomed_count == 0: pywikibot.output(u'No users have been welcomed.') else: - pywikibot.output(u'%s users have been welcomed.' % welcomed_count ) + pywikibot.output(u'%s users have been welcomed.' + % welcomed_count) if welcomed_count >= globalvar.dumpToLog: if self.makelogpage(self.welcomed_users): self.welcomed_users = list() @@ -821,18 +877,23 @@ if users.editCount() == 0: if not globalvar.quiet: showStatus(1) - pywikibot.output(u'%s has no contributions.' % users.name() ) + pywikibot.output(u'%s has no contributions.' + % users.name()) else: showStatus(1) - pywikibot.output(u'%s has only %d contributions.' % (users.name(), users.editCount() ) ) + pywikibot.output(u'%s has only %d contributions.' + % (users.name(), users.editCount())) # That user mustn't be welcomed. continue - if globalvar.makeWelcomeLog and pywikibot.translate(self.site, logbook) and welcomed_count > 0: + if globalvar.makeWelcomeLog and pywikibot.translate( + self.site, logbook) and welcomed_count > 0: showStatus() if welcomed_count == 1: pywikibot.output(u'Putting the log of the latest user...') else: - pywikibot.output(u'Putting the log of the latest %d users...' % welcomed_count) + pywikibot.output( + u'Putting the log of the latest %d users...' + % welcomed_count) if self.makelogpage(self.welcomed_users): self.welcomed_users = list() else: @@ -841,15 +902,20 @@ if hasattr(self, '_BAQueue'): showStatus() pywikibot.output("Putting bad name to report page....") - self.reportBadAccount(None, final = True) + self.reportBadAccount(None, final=True) try: if globalvar.recursive: showStatus() if locale.getlocale()[1]: - strfstr = unicode(time.strftime(u"%d %b %Y %H:%M:%S (UTC)", time.gmtime()), locale.getlocale()[1]) + strfstr = unicode( + time.strftime(u"%d %b %Y %H:%M:%S (UTC)", + time.gmtime()), + locale.getlocale()[1]) else: - strfstr = unicode(time.strftime(u"%d %b %Y %H:%M:%S (UTC)", time.gmtime())) - pywikibot.output(u'Sleeping %d seconds before rerun. %s' % (globalvar.timeRecur, strfstr)) + strfstr = unicode(time.strftime( + u"%d %b %Y %H:%M:%S (UTC)", time.gmtime())) + pywikibot.output(u'Sleeping %d seconds before rerun. %s' + % (globalvar.timeRecur, strfstr)) time.sleep(globalvar.timeRecur) else: raise KeyboardInterrupt @@ -870,24 +936,27 @@ # self.run() # self._checkQueue = [] -def showStatus(n = 0): + +def showStatus(n=0): staColor = { - 0:'lightpurple', - 1:'lightaqua', - 2:'lightgreen', - 3:'lightyellow', - 4:'lightred', - 5:'lightblue' + 0: 'lightpurple', + 1: 'lightaqua', + 2: 'lightgreen', + 3: 'lightyellow', + 4: 'lightred', + 5: 'lightblue' } staMsg = { - 0:'MSG ', - 1:'NoAct', - 2:'Match', - 3:'Skip ', - 4:'Warning', - 5:'Done ', + 0: 'MSG ', + 1: 'NoAct', + 2: 'Match', + 3: 'Skip ', + 4: 'Warning', + 5: 'Done ', } - pywikibot.output("\03{%s}[%s]\03{default} " % (staColor[n], staMsg[n]) , newline = False) + pywikibot.output("\03{%s}[%s]\03{default} " + % (staColor[n], staMsg[n]), newline=False) + def load_word_function(raw): """ This is a function used to load the badword and the whitelist.""" @@ -905,36 +974,43 @@ for arg in pywikibot.handleArgs(): if arg.startswith('-edit'): if len(arg) == 5: - globalvar.attachEditCount = int(pywikibot.input(u'After how many edits would you like to welcome new users? (0 is allowed)')) + globalvar.attachEditCount = int(pywikibot.input( + u'After how many edits would you like to welcome new users? (0 is allowed)')) else: globalvar.attachEditCount = int(arg[6:]) elif arg.startswith('-timeoffset'): if len(arg) == 11: - globalvar.timeoffset = int(pywikibot.input(u'Which time offset (in minutest) for new users would you like to use?')) + globalvar.timeoffset = int(pywikibot.input( + u'Which time offset (in minutest) for new users would you like to use?')) else: globalvar.timeoffset = int(arg[12:]) elif arg.startswith('-time'): if len(arg) == 5: - globalvar.timeRecur = int(pywikibot.input(u'For how many seconds would you like to bot to sleep before checking again?')) + globalvar.timeRecur = int(pywikibot.input( + u'For how many seconds would you like to bot to sleep before checking again?')) else: globalvar.timeRecur = int(arg[6:]) elif arg.startswith('-offset'): if len(arg) == 7: - globalvar.offset = int(pywikibot.input(u'Which time offset for new users would you like to use? (yyyymmddhhmmss)')) + globalvar.offset = int(pywikibot.input( + u'Which time offset for new users would you like to use? (yyyymmddhhmmss)')) else: globalvar.offset = int(arg[8:]) if len(str(globalvar.offset)) != 14: # upon request, we might want to check for software version here - raise ValueError("Mediawiki has changed, -offset:# is not supported anymore, but -offset:TIMESTAMP is, assuming TIMESTAMP is yyyymmddhhmmss. -timeoffset is now also supported. Please read this script source header for documentation.") + raise ValueError( + "Mediawiki has changed, -offset:# is not supported anymore, but -offset:TIMESTAMP is, assuming TIMESTAMP is yyyymmddhhmmss. -timeoffset is now also supported. Please read this script source header for documentation.") elif arg.startswith('-file:'): globalvar.randomSign = True if len(arg) == 6: - globalvar.signFileName = pywikibot.input(u'Where have you saved your signatures?') + globalvar.signFileName = pywikibot.input( + u'Where have you saved your signatures?') else: globalvar.signFileName = arg[6:] elif arg.startswith('-sign:'): if len(arg) == 6: - globalvar.defaultSign = pywikibot.input(u'Which signature to use?') + globalvar.defaultSign = pywikibot.input( + u'Which signature to use?') else: globalvar.defaultSign = arg[6:] globalvar.defaultSign += timeselected @@ -954,12 +1030,14 @@ globalvar.welcomeAuto = True elif arg.startswith('-limit'): if len(arg) == 6: - globalvar.queryLimit = int(pywikibot.input(u'How many of the latest new users would you like to load?')) + globalvar.queryLimit = int(pywikibot.input( + u'How many of the latest new users would you like to load?')) else: globalvar.queryLimit = int(arg[7:]) elif arg.startswith('-numberlog'): if len(arg) == 10: - globalvar.dumpToLog = int(pywikibot.input(u'After how many welcomed users would you like to update the welcome log?')) + globalvar.dumpToLog = int(pywikibot.input( + u'After how many welcomed users would you like to update the welcome log?')) else: globalvar.dumpToLog = int(arg[11:]) elif arg == '-quiet': @@ -969,9 +1047,12 @@ # Filename and pywikipedia path # file where is stored the random signature index - filename = pywikibot.config.datafilepath('welcome-%s-%s.data' % (pywikibot.default_family, pywikibot.default_code)) + filename = pywikibot.config.datafilepath('welcome-%s-%s.data' + % (pywikibot.default_family, + pywikibot.default_code)) if globalvar.offset and globalvar.timeoffset: - pywikibot.warning('both -offset and -timeoffset were provided, ignoring -offset') + pywikibot.warning( + 'both -offset and -timeoffset were provided, ignoring -offset') globalvar.offset = 0 bot = WelcomeBot() try: @@ -984,7 +1065,8 @@ pywikibot.output("\nQuitting...") finally: # If there is the savedata, the script must save the number_user. - if globalvar.randomSign and globalvar.saveSignIndex and bot.welcomed_users: + if globalvar.randomSign and globalvar.saveSignIndex and \ + bot.welcomed_users: import cPickle f = file(filename, 'w') cPickle.dump(bot.welcomed_users, f) -- To view, visit https://gerrit.wikimedia.org/r/94867 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie276842e02658562f896eae34084ffbcd25cd8cd Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] [PEP8] pep8ify us-states.py - change (pywikibot/compat)
by jenkins-bot (Code Review) 12 Nov '13

12 Nov '13

jenkins-bot has submitted this change and it was merged. Change subject: [PEP8] pep8ify us-states.py ...................................................................... [PEP8] pep8ify us-states.py Change-Id: I86e68c006a8ec6e93bd1d703c4353f5dea6fc5ae --- M us-states.py 1 file changed, 23 insertions(+), 19 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/us-states.py b/us-states.py index 0418c79..aa7168e 100644 --- a/us-states.py +++ b/us-states.py @@ -16,23 +16,25 @@ """ # # (C) Andre Engels, 2004 -# (C) Pywikipedia bot team, 2004-2010 +# (C) Pywikibot team, 2004-2013 # # Distributed under the terms of the MIT license. # __version__ = '$Id$' # -import re, sys +import re +import sys import wikipedia as pywikibot + def main(): start = '0' force = False - msg = {'en':'Creating state abbreviation redirect', - 'ar':u'إنشاء تحويلة اختصار الولاية', - 'fa':u'ایجاد تغییرمسیر برای نام اختصاری ایالت', - 'he':u'יוצר הפניה מראשי התיבות של המדינה', + msg = {'en': 'Creating state abbreviation redirect', + 'ar': u'إنشاء تحويلة اختصار الولاية', + 'fa': u'ایجاد تغییرمسیر برای نام اختصاری ایالت', + 'he': u'יוצר הפניה מראשי התיבות של המדינה', } abbrev = { @@ -97,11 +99,11 @@ u'argument "%s" not understood; ignoring.' % arg) mysite = pywikibot.getSite() - for p in mysite.allpages(start = start): + for p in mysite.allpages(start=start): for sn in abbrev: - R=re.compile('[^[]]*' + '\%2C_' + sn) + R = re.compile('[^[]]*' + '\%2C_' + sn) for res in R.findall(p.title()): - pl=pywikibot.Page(mysite, p.title().replace(sn,abbrev[sn])) + pl = pywikibot.Page(mysite, p.title().replace(sn, abbrev[sn])) # A bit hacking here - the real work is done in the # 'except pywikibot.NoPage' part rather than the 'try'. try: @@ -119,26 +121,28 @@ u"Page %s already exists and is not a redirect. Please check page!" % goal) except pywikibot.NoPage: - change='' + change = '' if p.isRedirectPage(): p2 = p.getRedirectTarget() wikipeda.ouput( - u'Note: goal page is redirect. Creating redirect to "%s" to avoid double redirect.' - % p2.title().replace("%2C",",").replace("_"," ")) + u'Note: goal page is redirect. Creating redirect ' + u'to "%s" to avoid double redirect.' + % p2.title().replace("%2C", ",").replace("_", " ")) else: p2 = p if force: - change='y' + change = 'y' else: - while not change in ['y','n']: + while not change in ['y', 'n']: pywikibot.output( u"Create redirect %s" % - pl.title().replace("%2C",",").replace("_"," ")) + pl.title().replace("%2C", + ",").replace("_", " ")) change = raw_input("(y/n)? ") - if change=='y': - text = '#REDIRECT [['+p2.title().replace("%2C",",").replace("_"," ")+']]' - pl.put(text, comment=pywikibot.translate(mysite, msg), - minorEdit = '0') + if change == 'y': + text = '#REDIRECT [[%s]]' % p2.title().replace( + "%2C", ",").replace("_", " ") + pl.put(text, comment=pywikibot.translate(mysite, msg)) try: main() -- To view, visit https://gerrit.wikimedia.org/r/94859 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I86e68c006a8ec6e93bd1d703c4353f5dea6fc5ae Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] [PEP8] pep8ity xmlreader - change (pywikibot/compat)
by Xqt (Code Review) 12 Nov '13

12 Nov '13

Xqt has submitted this change and it was merged. Change subject: [PEP8] pep8ity xmlreader ...................................................................... [PEP8] pep8ity xmlreader Change-Id: Ic7bfa88e0eaf6f7dcc048b998d8b2b8ae9d6ed31 --- M xmlreader.py 1 file changed, 38 insertions(+), 32 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/xmlreader.py b/xmlreader.py index d4568af..dab0687 100644 --- a/xmlreader.py +++ b/xmlreader.py @@ -16,16 +16,17 @@ to the older method using regular expressions. """ # -# (C) Pywikipedia bot team, 2005-2012 +# (C) Pywikibot team, 2005-2013 # # Distributed under the terms of the MIT license. # -__version__='$Id$' +__version__ = '$Id$' # import threading import xml.sax -import codecs, re +import codecs +import re import wikipedia as pywikibot try: @@ -35,6 +36,7 @@ from cElementTree import iterparse except ImportError: pass + def parseRestrictions(restrictions): """ @@ -68,7 +70,7 @@ # TODO: there are more tags we can read. self.title = title self.ns = ns - self.id =id + self.id = id self.text = text self.username = username.strip() self.ipedit = ipedit @@ -131,7 +133,7 @@ pass elif name == 'text': self.destination = 'text' - self.text=u'' + self.text = u'' elif name == 'id': if self.inContributorTag: self.destination = 'userid' @@ -158,13 +160,13 @@ self.restrictions = u'' elif name == 'title': self.destination = 'title' - self.title=u'' + self.title = u'' elif name == 'ns': self.destination = 'ns' self.ns = u'' elif name == 'timestamp': self.destination = 'timestamp' - self.timestamp=u'' + self.timestamp = u'' elif self.headercallback: if name == 'siteinfo': self.header = XmlHeaderEntry() @@ -179,8 +181,8 @@ if name == 'contributor': self.inContributorTag = False elif name == 'restrictions': - self.editRestriction, self.moveRestriction \ - = parseRestrictions(self.restrictions) + self.editRestriction, self.moveRestriction = parseRestrictions( + self.restrictions) elif name == 'redirect': self.isredirect = True elif name == 'revision': @@ -347,7 +349,6 @@ self.editRestriction, self.moveRestriction \ = parseRestrictions(self.restrictions) - def _create_revision(self, revision): """Creates a Single revision""" revisionid = revision.findtext("{%s}id" % self.uri) @@ -362,7 +363,7 @@ ns=self.ns, id=self.pageid, text=text or u'', - username=username or u'', #username might be deleted + username=username or u'', # username might be deleted ipedit=bool(ipeditor), timestamp=timestamp, editRestriction=self.editRestriction, @@ -370,7 +371,7 @@ revisionid=revisionid, comment=comment, redirect=self.isredirect - ) + ) def regex_parse(self): """ @@ -382,25 +383,30 @@ haven't installed cElementTree. """ Rpage = re.compile( - '<page>\s*'+ - '<title>(?P<title>.+?)</title>\s*'+ - '<ns>(?P<namespace>\d+?)</ns>\s*'+ - '<id>(?P<pageid>\d+?)</id>\s*'+ - '(<restrictions>(?P<restrictions>.+?)</restrictions>)?\s*'+ - '<revision>\s*'+ - '<id>(?P<revisionid>\d+?)</id>\s*'+ - '<timestamp>(?P<timestamp>.+?)</timestamp>\s*'+ - '<contributor>\s*'+ - '(<username>(?P<username>.+?)</username>\s*'+ - '<id>(?P<userid>\d+?)</id>|<ip>(?P<ip>.+?)</ip>)\s*'+ - '</contributor>\s*'+ - '(?P<minor>(<minor />))?\s*'+ - '(?:<comment>(?P<comment>.+?)</comment>\s*)?'+ - '(<text xml:space="preserve">(?P<text>.*?)</text>|<text xml:space="preserve" />)\s*'+ - '</revision>\s*'+ + '<page>\s*' + + '<title>(?P<title>.+?)</title>\s*' + + '<ns>(?P<namespace>\d+?)</ns>\s*' + + '<id>(?P<pageid>\d+?)</id>\s*' + + '(<restrictions>(?P<restrictions>.+?)</restrictions>)?\s*' + + '<revision>\s*' + + + '<id>(?P<revisionid>\d+?)</id>\s*' + + '<timestamp>(?P<timestamp>.+?)</timestamp>\s*' + + '<contributor>\s*' + + + '(<username>(?P<username>.+?)</username>\s*' + + '<id>(?P<userid>\d+?)</id>|<ip>(?P<ip>.+?)</ip>)\s*' + + + '</contributor>\s*' + + '(?P<minor>(<minor />))?\s*' + + '(?:<comment>(?P<comment>.+?)</comment>\s*)?' + + '(<text xml:space="preserve">(?P<text>.*?)</text>|<text xml:space="preserve" />)\s*' + + + '</revision>\s*' + '</page>', - re.DOTALL) - f = codecs.open(self.filename, 'r', encoding = pywikibot.getSite().encoding(), + re.DOTALL) + f = codecs.open(self.filename, 'r', + encoding=pywikibot.getSite().encoding(), errors='replace') eof = False lines = u'' @@ -438,7 +444,7 @@ id=m.group('pageid'), text=text, username=username, ipedit=ipedit, timestamp=m.group('timestamp'), - editRestriction = editRestriction, + editRestriction=editRestriction, moveRestriction=moveRestriction, revisionid=m.group('revisionid') - ) + ) -- To view, visit https://gerrit.wikimedia.org/r/94857 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic7bfa88e0eaf6f7dcc048b998d8b2b8ae9d6ed31 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] [CR] exclude wiktionary.py - change (pywikibot/compat)
by Xqt (Code Review) 12 Nov '13

12 Nov '13

Xqt has submitted this change and it was merged. Change subject: [CR] exclude wiktionary.py ...................................................................... [CR] exclude wiktionary.py Change-Id: I46a4b5a7b8164b852970a558398c5d0d1c615a7f --- M .pep8 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/.pep8 b/.pep8 index e965588..8e83dbb 100644 --- a/.pep8 +++ b/.pep8 @@ -1,4 +1,4 @@ [pep8] ignore = E122,E127,E241,E502 -exclude = ./wiktionary/*,./tests/*,./userinterfaces/*,./commonsdelinker/*,./families/*,./maintenance/*,./pywikibot/*,./externals/* +exclude = ./wiktionary.py,./wiktionary/*,./tests/*,./userinterfaces/*,./commonsdelinker/*,./families/*,./maintenance/*,./pywikibot/*,./externals/* max_line_length = 256 -- To view, visit https://gerrit.wikimedia.org/r/94855 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I46a4b5a7b8164b852970a558398c5d0d1c615a7f Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits