Pywikibot-commits

pywikibot-commits@lists.wikimedia.org

1 participants
13423 discussions

[Gerrit] [PEP8] changes for archivebot.py - change (pywikibot/compat)
by Xqt (Code Review) 16 Nov '13

16 Nov '13

Xqt has submitted this change and it was merged. Change subject: [PEP8] changes for archivebot.py ...................................................................... [PEP8] changes for archivebot.py Change-Id: I31f9063e0bb5ac9c8e3263f83d041fc1a2c9dfed --- M archivebot.py 1 file changed, 137 insertions(+), 104 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/archivebot.py b/archivebot.py index d0f79ee..bb11637 100644 --- a/archivebot.py +++ b/archivebot.py @@ -76,21 +76,30 @@ # __version__ = '$Id$' # -import wikipedia as pywikibot -from pywikibot import i18n -import pagegenerators, query -Site = pywikibot.getSite() - -import os, re, time, locale, traceback, string, urllib, unicodedata - -try: #Get a constructor for the MD5 hash object +import os +import re +import time +import locale +import traceback +import string +import urllib +import unicodedata +try: # Get a constructor for the MD5 hash object import hashlib new_hash = hashlib.md5 -except ImportError: #Old python? +except ImportError: # Old python? import md5 new_hash = md5.md5 +import wikipedia as pywikibot +from pywikibot import i18n +import pagegenerators +import query + + +Site = pywikibot.getSite() language = Site.language() + def message(key, lang=Site.language()): return i18n.twtranslate(lang, key) @@ -102,7 +111,9 @@ class MissingConfigError(pywikibot.Error): """The config is missing in the header (either it's in one of the threads - or transcluded from another page).""" + or transcluded from another page). + + """ class AlgorithmError(MalformedConfigError): @@ -111,20 +122,25 @@ class ArchiveSecurityError(pywikibot.Error): """Archive is not a subpage of page being archived and key not specified - (or incorrect).""" + (or incorrect). + + """ def str2time(str): """Accepts a string defining a time period: 7d - 7 days 36h - 36 hours - Returns the corresponding time, measured in seconds.""" + Returns the corresponding time, measured in seconds. + + """ if str[-1] == 'd': - return int(str[:-1])*24*3600 + return int(str[:-1]) * 24 * 3600 elif str[-1] == 'h': - return int(str[:-1])*3600 + return int(str[:-1]) * 3600 else: return int(str) + def str2size(str): """Accepts a string defining a size: @@ -132,17 +148,20 @@ 150K - 150 kilobytes 2M - 2 megabytes Returns a tuple (size,unit), where size is an integer and unit is - 'B' (bytes) or 'T' (threads).""" - if str[-1] in string.digits: #TODO: de-uglify - return (int(str),'B') + 'B' (bytes) or 'T' (threads). + + """ + if str[-1] in string.digits: # TODO: de-uglify + return (int(str), 'B') elif str[-1] in ['K', 'k']: - return (int(str[:-1])*1024,'B') + return (int(str[:-1]) * 1024, 'B') elif str[-1] == 'M': - return (int(str[:-1])*1024*1024,'B') + return (int(str[:-1]) * 1024 * 1024, 'B') elif str[-1] == 'T': - return (int(str[:-1]),'T') + return (int(str[:-1]), 'T') else: - return (int(str[:-1])*1024,'B') + return (int(str[:-1]) * 1024, 'B') + def int2month(num): """Returns the locale's full name of month 'num' (1-12).""" @@ -150,29 +169,36 @@ return locale.nl_langinfo(locale.MON_1+num-1).decode('utf-8') Months = ['january', 'february', 'march', 'april', 'may_long', 'june', 'july', 'august', 'september', 'october', 'november', 'december'] - return Site.mediawiki_message(Months[num-1]) + return Site.mediawiki_message(Months[num - 1]) + def int2month_short(num): """Returns the locale's abbreviated name of month 'num' (1-12).""" if hasattr(locale, 'nl_langinfo'): #filter out non-alpha characters - return ''.join([c for c in locale.nl_langinfo(locale.ABMON_1+num-1).decode('utf-8') if c.isalpha()]) + return ''.join([c for c in + locale.nl_langinfo( + locale.ABMON_1 + num - 1).decode('utf-8') + if c.isalpha()]) Months = ['jan', 'feb', 'mar', 'apr', 'may', 'jun', 'jul', 'aug', 'sep', 'oct', 'nov', 'dec'] - return Site.mediawiki_message(Months[num-1]) + return Site.mediawiki_message(Months[num - 1]) + def txt2timestamp(txt, format): """Attempts to convert the timestamp 'txt' according to given 'format'. - On success, returns the time tuple; on failure, returns None.""" + On success, returns the time tuple; on failure, returns None. + + """ ## print txt, format try: - return time.strptime(txt,format) + return time.strptime(txt, format) except ValueError: try: - return time.strptime(txt.encode('utf8'),format) + return time.strptime(txt.encode('utf8'), format) except: pass - return None + def generateTransclusions(Site, template, namespaces=[]): pywikibot.output(u'Fetching template transclusions...') @@ -186,12 +212,14 @@ class DiscussionThread(object): - """An object representing a discussion thread on a page, that is something of the form: + """An object representing a discussion thread on a page, that is something + of the form: == Title of thread == Thread content here. ~~~~ :Reply, etc. ~~~~ + """ def __init__(self, title): @@ -201,7 +229,7 @@ def __repr__(self): return '%s("%s",%d bytes)' \ - % (self.__class__.__name__,self.title,len(self.content)) + % (self.__class__.__name__, self.title, len(self.content)) def feedLine(self, line): if not self.content and not line: @@ -216,33 +244,38 @@ # 2007. december 8., 13:42 (CET) TM = re.search(r'(\d\d):(\d\d), (\d\d?) (\S+) (\d\d\d\d) $.*?$', line) if not TM: - TM = re.search(r'(\d\d):(\d\d), (\S+) (\d\d?), (\d\d\d\d) $.*?$', line) + TM = re.search(r'(\d\d):(\d\d), (\S+) (\d\d?), (\d\d\d\d) $.*?$', + line) if not TM: - TM = re.search(r'(\d{4})\. (\S+) (\d\d?)\., (\d\d:\d\d) $.*?$', line) + TM = re.search(r'(\d{4})\. (\S+) (\d\d?)\., (\d\d:\d\d) $.*?$', + line) # 18. apr 2006 kl.18:39 (UTC) # 4. nov 2006 kl. 20:46 (CET) if not TM: - TM = re.search(r'(\d\d?)\. (\S+) (\d\d\d\d) kl\.\W*(\d\d):(\d\d) $.*?$', line) + TM = re.search(r'(\d\d?)\. (\S+) (\d\d\d\d) kl\.\W*(\d\d):(\d\d) $.*?$', + line) #3. joulukuuta 2008 kello 16.26 (EET) if not TM: - TM = re.search(r'(\d\d?)\. (\S+) (\d\d\d\d) kello \W*(\d\d).(\d\d) $.*?$', line) + TM = re.search(r'(\d\d?)\. (\S+) (\d\d\d\d) kello \W*(\d\d).(\d\d) $.*?$', + line) if not TM: # 14:23, 12. Jan. 2009 (UTC) pat = re.compile(r'(\d\d):(\d\d), (\d\d?)\. (\S+)\.? (\d\d\d\d) $(?:UTC|CES?T)$') TM = pat.search(line) # ro.wiki: 4 august 2012 13:01 (EEST) if not TM: - TM = re.search(r'(\d\d?) (\S+) (\d\d\d\d) (\d\d):(\d\d) $.*?$', line) + TM = re.search(r'(\d\d?) (\S+) (\d\d\d\d) (\d\d):(\d\d) $.*?$', + line) if TM: # Strip away all diacritics in the Mn ('Mark, non-spacing') category - # NFD decomposition splits combined characters (e.g. 'ä", LATIN SMALL - # LETTER A WITH DIAERESIS) into two entities: LATIN SMALL LETTER A - # and COMBINING DIAERESIS. The latter falls in the Mn category and is - # filtered out, resuling in 'a'. + # NFD decomposition splits combined characters (e.g. 'ä", + # LATIN SMALL LETTER A WITH DIAERESIS) into two entities: + # LATIN SMALL LETTER A and COMBINING DIAERESIS. The latter falls + # in the Mn category and is filtered out, resuling in 'a'. _TM = ''.join(c for c in unicodedata.normalize('NFD', TM.group(0)) - if unicodedata.category(c) != 'Mn') + if unicodedata.category(c) != 'Mn') - TIME = txt2timestamp(_TM,"%d. %b %Y kl. %H:%M (%Z)") + TIME = txt2timestamp(_TM, "%d. %b %Y kl. %H:%M (%Z)") if not TIME: TIME = txt2timestamp(_TM, "%Y. %B %d., %H:%M (%Z)") if not TIME: @@ -264,7 +297,7 @@ if not TIME: TIME = txt2timestamp(_TM, "%H:%M, %B %d, %Y (%Z)") if not TIME: - TIME = txt2timestamp(_TM,"%d. %Bta %Y kello %H.%M (%Z)") + TIME = txt2timestamp(_TM, "%d. %Bta %Y kello %H.%M (%Z)") if not TIME: TIME = txt2timestamp(_TM, "%d %B %Y %H:%M (%Z)") if not TIME: @@ -282,9 +315,9 @@ def toText(self): return "== " + self.title + ' ==\n\n' + self.content - def shouldBeArchived(self,Archiver): + def shouldBeArchived(self, Archiver): algo = Archiver.get('algo') - reT = re.search(r'^old$(.*)$$',algo) + reT = re.search(r'^old$(.*)$$', algo) if reT: if not self.timestamp: return '' @@ -298,7 +331,9 @@ class DiscussionPage(pywikibot.Page): """A class that represents a single discussion page as well as an archive - page. Feed threads to it and run an update() afterwards.""" + page. Feed threads to it and run an update() afterwards. + + """ def __init__(self, title, archiver, vars=None): pywikibot.Page.__init__(self, Site, title) @@ -321,12 +356,12 @@ self.archives = {} self.archivedThreads = 0 lines = self.get().split('\n') - found = False #Reading header + found = False # Reading header curThread = None for line in lines: - threadHeader = re.search('^== *([^=].*?) *== *$',line) + threadHeader = re.search('^== *([^=].*?) *== *$', line) if threadHeader: - found = True #Reading threads now + found = True # Reading threads now if curThread: self.threads.append(curThread) curThread = DiscussionThread(threadHeader.group(1)) @@ -339,7 +374,7 @@ self.threads.append(curThread) pywikibot.output(u'%d Threads found on %s' % (len(self.threads), self)) - def feedThread(self, thread, maxArchiveSize=(250*1024,'B')): + def feedThread(self, thread, maxArchiveSize=(250 * 1024, 'B')): self.threads.append(thread) self.archivedThreads += 1 if maxArchiveSize[1] == 'B': @@ -353,11 +388,11 @@ def size(self): return len(self.header) + sum([t.size() for t in self.threads]) - def update(self, summary, sortThreads = False): + def update(self, summary, sortThreads=False): if sortThreads: pywikibot.output(u'Sorting threads...') - self.threads.sort(key = lambda t: t.timestamp) - newtext = re.sub('\n*$', '\n\n', self.header) #Fix trailing newlines + 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() if self.full: @@ -374,25 +409,25 @@ def __init__(self, Page, tpl, salt, force=False): self.attributes = { - 'algo' : ['old(24h)',False], - 'archive' : ['',False], - 'maxarchivesize' : ['1000M',False], - 'counter' : ['1',False], - 'key' : ['',False], - } + 'algo': ['old(24h)', False], + 'archive': ['', False], + 'maxarchivesize': ['1000M', False], + 'counter': ['1', False], + 'key': ['', False], + } self.tpl = tpl self.salt = salt self.force = force self.Page = DiscussionPage(Page.title(), self) self.loadConfig() self.commentParams = { - 'from' : self.Page.title(), - } + 'from': self.Page.title(), + } self.archives = {} self.archivedThreads = 0 def get(self, attr, default=''): - return self.attributes.get(attr,[default])[0] + return self.attributes.get(attr, [default])[0] def set(self, attr, value, out=True): if attr == 'archive': @@ -404,15 +439,15 @@ and a != 'maxage'] def attr2text(self): - return '{{%s\n%s\n}}' \ - % (self.tpl, - '\n'.join(['|%s = %s'%(a,self.get(a)) - for a in self.saveables()])) + return '{{%s\n%s\n}}' % (self.tpl, + '\n'.join(['|%s = %s ' + % (a, self.get(a)) + for a in self.saveables()])) 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): @@ -439,12 +474,13 @@ 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 if not archive in self.archives: self.archives[archive] = DiscussionPage(archive, self, vars) - return self.archives[archive].feedThread(thread,maxArchiveSize) + return self.archives[archive].feedThread(thread, maxArchiveSize) def analyzePage(self): maxArchSize = str2size(self.get('maxarchivesize')) @@ -456,9 +492,9 @@ pywikibot.output(u'Processing %d threads' % len(oldthreads)) for t in oldthreads: if len(oldthreads) - self.archivedThreads \ - <= int(self.get('minthreadsleft',5)): + <= int(self.get('minthreadsleft', 5)): self.Page.threads.append(t) - continue #Because there's too little threads left. + continue # Because there's too little threads left. # TODO: Make an option so that unstamped (unsigned) posts get # archived. why = t.shouldBeArchived(self) @@ -466,17 +502,17 @@ archive = self.get('archive') TStuple = time.gmtime(t.timestamp) vars = { - 'counter' : archCounter, - 'year' : TStuple[0], - 'month' : TStuple[1], - 'monthname' : int2month(TStuple[1]), - 'monthnameshort' : int2month_short(TStuple[1]), - 'week' : int(time.strftime('%W',TStuple)), - } + 'counter': archCounter, + 'year': TStuple[0], + 'month': TStuple[1], + 'monthname': int2month(TStuple[1]), + 'monthnameshort': int2month_short(TStuple[1]), + 'week': int(time.strftime('%W', TStuple)), + } archive = archive % vars - if self.feedArchive(archive,t,maxArchSize,vars): + if self.feedArchive(archive, t, maxArchSize, vars): archCounter += 1 - self.set('counter',str(archCounter)) + self.set('counter', str(archCounter)) whys.append(why) self.archivedThreads += 1 else: @@ -487,7 +523,7 @@ if not self.Page.botMayEdit(Site.username): return whys = self.analyzePage() - if self.archivedThreads < int(self.get('minthreadstoarchive',2)): + if self.archivedThreads < int(self.get('minthreadstoarchive', 2)): # We might not want to archive a measly few threads # (lowers edit frequency) pywikibot.output(u'There are only %d Threads. Skipping' @@ -504,11 +540,11 @@ 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) + 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'] \ - = ', '.join(['[['+a.title()+']]' for a in self.archives.values()]) + self.commentParams['archives'] = ', '.join( + ['[[%s]]' % a.title() for a in self.archives.values()]) if not self.commentParams['archives']: self.commentParams['archives'] = '/dev/null' self.commentParams['why'] = ', '.join(whys) @@ -523,30 +559,30 @@ from optparse import OptionParser parser = OptionParser(usage='usage: %prog [options] [LINKPAGE(s)]') parser.add_option('-f', '--file', dest='filename', - help='load list of pages from FILE', metavar='FILE') + help='load list of pages from FILE', metavar='FILE') parser.add_option('-p', '--page', dest='pagename', - help='archive a single PAGE', metavar='PAGE') + help='archive a single PAGE', metavar='PAGE') parser.add_option('-n', '--namespace', dest='namespace', type='int', - help='only archive pages from a given namespace') + help='only archive pages from a given namespace') parser.add_option('-s', '--salt', dest='salt', - help='specify salt') + help='specify salt') parser.add_option('-F', '--force', action='store_true', dest='force', - help='override security options') + help='override security options') parser.add_option('-c', '--calc', dest='calc', - help='calculate key for PAGE and exit', metavar='PAGE') + help='calculate key for PAGE and exit', metavar='PAGE') parser.add_option('-l', '--locale', dest='locale', - help='switch to locale LOCALE', metavar='LOCALE') + help='switch to locale LOCALE', metavar='LOCALE') parser.add_option('-L', '--lang', dest='lang', - help='current language code', metavar='lang') + help='current language code', metavar='lang') parser.add_option('-T', '--timezone', dest='timezone', - help='switch timezone to TIMEZONE', metavar='TIMEZONE') + help='switch timezone to TIMEZONE', metavar='TIMEZONE') parser.add_option('-S', '--simulate', action='store_true', dest='simulate', - help='Do not change pages, just simulate') + help='Do not change pages, just simulate') (options, args) = parser.parse_args() if options.locale: #Required for english month names - locale.setlocale(locale.LC_TIME,options.locale) + locale.setlocale(locale.LC_TIME, options.locale) if options.timezone: os.environ['TZ'] = options.timezone @@ -558,8 +594,8 @@ if not options.salt: parser.error('Note: you must specify a salt to calculate a key') s = new_hash() - s.update(options.salt+'\n') - s.update(options.calc+'\n') + s.update(options.salt + '\n') + s.update(options.calc + '\n') pywikibot.output(u'key = ' + s.hexdigest()) return @@ -588,23 +624,19 @@ for a in args: pagelist = [] if not options.filename and not options.pagename: - #for pg in pywikibot.Page(Site,a).getReferences(follow_redirects=False,onlyTemplateInclusion=True): - if not options.namespace == None: + if options.namespace is not None: ns = [str(options.namespace)] else: ns = [] for pg in generateTransclusions(Site, a, ns): pagelist.append(pg) if options.filename: - for pg in file(options.filename,'r').readlines(): - pagelist.append(pywikibot.Page(Site,pg)) + for pg in file(options.filename, 'r').readlines(): + pagelist.append(pywikibot.Page(Site, pg)) if options.pagename: pagelist.append(pywikibot.Page(Site, options.pagename, defaultNamespace=3)) - pagelist = sorted(pagelist) - #if not options.namespace == None: - # pagelist = [pg for pg in pagelist if pg.namespace()==options.namespace] for pg in iter(pagelist): pywikibot.output(u'Processing %s' % pg) # Catching exceptions, so that errors in one page do not bail out @@ -617,6 +649,7 @@ pywikibot.output(u'Error occured while processing page %s' % pg) traceback.print_exc() + if __name__ == '__main__': try: main() -- To view, visit https://gerrit.wikimedia.org/r/95760 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I31f9063e0bb5ac9c8e3263f83d041fc1a2c9dfed 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] changes in checkimages.py - change (pywikibot/compat)
by jenkins-bot (Code Review) 16 Nov '13

16 Nov '13

jenkins-bot has submitted this change and it was merged. Change subject: [PEP8] changes in checkimages.py ...................................................................... [PEP8] changes in checkimages.py Change-Id: Ibd16e389f99252eaf80a33fb2a823df5dcb7d6c0 --- M checkimages.py 1 file changed, 63 insertions(+), 29 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/checkimages.py b/checkimages.py index 4f48382..da98deb 100644 --- a/checkimages.py +++ b/checkimages.py @@ -290,12 +290,16 @@ 'ur': u"\n== تصویر بدون اجازہ ==\n", } # That's the text that the bot will add if it doesn't find the license. -# Note: every __botnick__ will be repleaced with your bot's nickname (feel free not to use if you don't need it) +# Note: every __botnick__ will be repleaced with your bot's nickname +# (feel free not to use if you don't need it) nothing_notification = { - 'commons': u"\n{{subst:User:Filnik/untagged|File:%s}}\n\n''This message was '''added automatically by " + \ - u"__botnick__''', if you need some help about it, please read the text above again and follow the links in it," + \ - u"if you still need help ask at the [[File:Human-help-browser.svg|18px|link=Commons:Help desk|?]] '''[[Commons:Help desk|->]]" + \ - u"[[Commons:Help desk]]''' in any language you like to use.'' --__botnick__ ~~~~~""", + 'commons': (u"\n{{subst:User:Filnik/untagged|File:%s}}\n\n''This message " + u"was '''added automatically by __botnick__''', if you need " + u"some help about it, please read the text above again and " + u"follow the links in it, if you still need help ask at the " + u"[[File:Human-help-browser.svg|18px|link=Commons:Help desk|?]] " + u"'''[[Commons:Help desk|->]][[Commons:Help desk]]''' in any " + u"language you like to use.'' --__botnick__ ~~~~~"""), 'ar': u"{{subst:مصدر الصورة|File:%s}} --~~~~", 'en': u"{{subst:image source|File:%s}} --~~~~", 'fa': u"{{جا:اخطار نگاره|%s}}", @@ -407,7 +411,9 @@ # Warning 3: the part that use this regex is case-insensitive (just to let you # know..) HiddenTemplate = { - 'commons': [u'Template:Information'], # Put the other in the page on the project defined below + # Put the other in the page on the project defined below + 'commons': [u'Template:Information'], + 'ar': [u'Template:معلومات'], 'de': [u'Template:Information'], 'en': [u'Template:Information'], @@ -415,9 +421,11 @@ 'fr': [u'Template:Information'], 'ga': [u'Template:Information'], 'hu': [u'Template:Információ', u'Template:Enwiki', u'Template:Azonnali'], + # Put the other in the page on the project defined below 'it': [u'Template:EDP', u'Template:Informazioni file', u'Template:Information', u'Template:Trademark', - u'Template:Permissionotrs'], # Put the other in the page on the project defined below + u'Template:Permissionotrs'], + 'ja': [u'Template:Information'], 'ko': [u'Template:그림 정보'], 'ta': [u'Template:Information'], @@ -444,7 +452,13 @@ # Note: every __botnick__ will be repleaced with your bot's nickname # (feel free not to use if you don't need it) HiddenTemplateNotification = { - 'commons': u"""\n{{subst:User:Filnik/whitetemplate|File:%s}}\n\n''This message was added automatically by __botnick__, if you need some help about it please read the text above again and follow the links in it, if you still need help ask at the [[File:Human-help-browser.svg|18px|link=Commons:Help desk|?]] '''[[Commons:Help desk|→]] [[Commons:Help desk]]''' in any language you like to use.'' --__botnick__ ~~~~~""", + 'commons': (u"\n{{subst:User:Filnik/whitetemplate|File:%s}}\n\n''This " + u"message was added automatically by __botnick__, if you need " + u"some help about it please read the text above again and " + u"follow the links in it, if you still need help ask at the " + u"[[File:Human-help-browser.svg|18px|link=Commons:Help desk|?]]" + u" '''[[Commons:Help desk|→]] [[Commons:Help desk]]''' in any " + u"language you like to use.'' --__botnick__ ~~~~~"), 'it': u"{{subst:Progetto:Coordinamento/Immagini/Bot/Messaggi/Template_insufficiente|%s|__botnick__}} --~~~~", 'ko': u"\n{{subst:User:Kwj2772/whitetemplates|%s}} --~~~~", } @@ -827,15 +841,20 @@ URL = u'http://toolserver.org/~daniel/WikiSense/UntaggedImages.php?' if lang == 'commons': - link = URL + \ - 'wikifam=commons.wikimedia.org&since=-100d&until=&img_user_text=&order=img_timestamp&max=100&order=img_timestamp&format=html' + link = ( + URL + + 'wikifam=commons.wikimedia.org&since=-100d&until=&img_user_text=&order=img_timestamp&max=100&order=img_timestamp&format=html' + ) else: - link = URL + \ - 'wikilang=%s&wikifam=%s&order=img_timestamp&max=%s&ofs=0&max=%s' \ - % (lang, project, limit, limit) + link = ( + URL + + 'wikilang=%s&wikifam=%s&order=img_timestamp&max=%s&ofs=0&max=%s' + % (lang, project, limit, limit) + ) text = self.site.getUrl(link, no_hostname=True) - results = re.findall(r"<td valign='top' title='Name'><a href='http://.*?\.org/w/index\.php\?title=(.*?)'>.*?</a></td>", - text) + results = re.findall( + r"<td valign='top' title='Name'><a href='http://.*?\.org/w/index\.php\?title=(.*?)'>.*?</a></td>", + text) if results: for result in results: wikiPage = pywikibot.ImagePage(self.site, result) @@ -944,7 +963,8 @@ if not hash_found: return # Image deleted, no hash found. Skip the image. - commons_image_with_this_hash = commons_site.getFilesFromAnHash(hash_found) + commons_image_with_this_hash = commons_site.getFilesFromAnHash( + hash_found) if commons_image_with_this_hash and \ commons_image_with_this_hash is not 'None': servTMP = pywikibot.translate(self.site, serviceTemplates, @@ -961,7 +981,8 @@ pywikibot.output(u'%s is on commons!' % self.imageName) on_commons_text = self.image.getImagePageHtml() - if re.search(ur"\<div class\=(?:'|\")sharedUploadNotice(?:'|\")\>",on_commons_text): + if re.search(ur"\<div class\=(?:'|\")sharedUploadNotice(?:'|\")\>", + on_commons_text): pywikibot.output( u"But, the file doesn't exist on your project! Skip...") # We have to skip the check part for that image because @@ -973,7 +994,8 @@ pywikibot.output( u'%s has "stemma" inside, means that it\'s ok.' % self.imageName) - return True # It's not only on commons but the image needs a check + return True + # It's not only on commons but the image needs a check # the second usually is a url or something like that. # Compare the two in equal way, both url. if self.convert_to_url(self.imageName) \ @@ -1009,7 +1031,7 @@ duplicates = self.site.getFilesFromAnHash(hash_found) if not duplicates: - return # Error, image deleted, no hash found. Skip the image. + return # Error, image deleted, no hash found. Skip the image. if len(duplicates) > 1: if len(duplicates) == 2: @@ -1042,7 +1064,8 @@ for duplicate in duplicates: if pywikibot.ImagePage(self.site, duplicate) \ == pywikibot.ImagePage(self.site, older_image): - continue # the older image, not report also this as duplicate + # the older image, not report also this as duplicate + continue DupePage = pywikibot.ImagePage(self.site, duplicate) try: DupPageText = DupePage.get() @@ -1056,11 +1079,12 @@ u'%s is a duplicate and has to be tagged...' % duplicate) images_to_tag_list.append(duplicate) - #if duplicate != duplicates[-1]: +## if duplicate != duplicates[-1]: string += u"*[[:%s%s]]\n" % (self.image_namespace, duplicate) - #else: - # string += "*[[:%s%s]]" % (self.image_namespace, duplicate) +## else: +## string += "*[[:%s%s]]" \ +## % (self.image_namespace, duplicate) else: pywikibot.output( u"Already put the dupe-template in the files's page" @@ -1068,7 +1092,9 @@ return # Ok - Let's continue the checking phase older_image_ns = u'%s%s' % (self.image_namespace, older_image) - only_report = False # true if the image are not to be tagged as dupes + + # true if the image are not to be tagged as dupes + only_report = False # put only one image or the whole list according to the request if u'__images__' in dupText: @@ -1105,7 +1131,8 @@ u'File:%s' % images_to_tag_list[-1], self.botolist) image_to_resub = images_to_tag_list[-1] from_regex = r'\n\*\[\[:File:%s\]\]' \ - % re.escape(self.convert_to_url(self.imageName)) + % re.escape(self.convert_to_url( + self.imageName)) # Delete the image in the list where we're write on text_for_the_report = re.sub(from_regex, '', text_for_the_report) @@ -1130,7 +1157,8 @@ for duplicate in duplicates: if self.convert_to_url(duplicate) == \ self.convert_to_url(self.imageName): - continue # the image itself, not report also this as duplicate + # the image itself, not report also this as duplicate + continue repme += u"\n**[[:File:%s]]" \ % self.convert_to_url(duplicate) @@ -1141,7 +1169,9 @@ return True # If Errors, exit (but continue the check) if older_image != self.imageName: - return # The image is a duplicate, it will be deleted. So skip the check-part, useless + # The image is a duplicate, it will be deleted. So skip the + # check-part, useless + return return True # Ok - No problem. Let's continue the checking phase def report_image(self, image_to_report, rep_page=None, com=None, @@ -1176,7 +1206,10 @@ pywikibot.output( u"The log page (%s) is full! Please delete the old files " u" reported. Skip!" % another_page.title()) - return True # Don't report, but continue with the check (we don't now if this is the first time we check this file or not) + # Don't report, but continue with the check + # (we don't now if this is the first time we check this file + # or not) + return True # The talk page includes "_" between the two names, in this way I # replace them to " " @@ -1372,7 +1405,8 @@ self.imageCheckText) if not self.licenses_found and templatesInTheImageRaw: - # {{nameTemplate|something <- this is not a template, be sure that we haven't catch something like that. + # {{nameTemplate|something <- this is not a template, be sure + # that we haven't catch something like that. licenses_TEST = regex_are_licenses.findall(self.imageCheckText) if not self.licenses_found and licenses_TEST: raise pywikibot.Error( -- To view, visit https://gerrit.wikimedia.org/r/95759 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibd16e389f99252eaf80a33fb2a823df5dcb7d6c0 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] for cfd.py - change (pywikibot/compat)
by jenkins-bot (Code Review) 16 Nov '13

16 Nov '13

jenkins-bot has submitted this change and it was merged. Change subject: [PEP8] for cfd.py ...................................................................... [PEP8] for cfd.py Change-Id: I3b7a82579d4cc37cd4f3f5081118e9329de29144 --- M cfd.py 1 file changed, 50 insertions(+), 25 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/cfd.py b/cfd.py index 8da3657..17d77c5 100644 --- a/cfd.py +++ b/cfd.py @@ -21,25 +21,34 @@ cfdPage = 'Wikipedia:Categories for discussion/Working' # A list of templates that are used on category pages as part of the CFD -# process that contain information such as the link to the per-day discussion page. +# process that contain information such as the link to the per-day discussion +# page. cfdTemplates = ['Cfd full', 'Cfr full'] # Regular expression declarations -# See the en-wiki CFD working page at [[Wikipedia:Categories for discussion/Working]] -# to see how these work in context. To get this bot working on other wikis you will -# need to adjust these regular expressions at the very least. +# See the en-wiki CFD working page at +# [[Wikipedia:Categories for discussion/Working]] +# to see how these work in context. To get this bot working on other wikis you +# will need to adjust these regular expressions at the very least. nobots = re.compile(r"NO\s*BOTS", re.IGNORECASE) example = re.compile(r"\[\[\:Category\:(.)\1\1\1\1\]\]", re.IGNORECASE) speedymode = re.compile(r"^===*\s*Speedy Moves\s*===*\s*$", re.IGNORECASE) -movemode = re.compile(r"^===*\s*Move\/Merge then delete\s*===*\s*$", re.IGNORECASE) +movemode = re.compile(r"^===*\s*Move\/Merge then delete\s*===*\s*$", + re.IGNORECASE) emptymode = re.compile(r"^===*\s*Empty then delete\s*===*\s*$", re.IGNORECASE) deletemode = re.compile(r"^===*\s*Ready for deletion\s*===*\s*$", re.IGNORECASE) -maintenance = re.compile(r"^===*\s*Old by month categories with entries\s*===*\s*$", re.IGNORECASE) -dateheader = re.compile(r"(\[\[Wikipedia\:Categories[_ ]for[_ ](?:discussion|deletion)\/Log\/([^\]]*?)\]\])", - re.IGNORECASE) -movecat = re.compile(r"\[\[\:Category\:([^\]]*?)\]\][^\]]*?\[\[\:Category\:([^\]]*?)\]\]", re.IGNORECASE) +maintenance = re.compile( + r"^===*\s*Old by month categories with entries\s*===*\s*$", re.IGNORECASE) +dateheader = re.compile( + r"(\[\[Wikipedia\:Categories[_ ]for[_ ](?:discussion|deletion)\/Log\/([^\]]*?)\]\])", + re.IGNORECASE) +movecat = re.compile( + r"\[\[\:Category\:([^\]]*?)\]\][^\]]*?\[\[\:Category\:([^\]]*?)\]\]", + re.IGNORECASE) deletecat = re.compile(r"\[\[\:Category\:([^\]]*?)\]\]", re.IGNORECASE) -findday = re.compile(r"\[\[(Wikipedia\:Categories for (?:discussion|deletion)\/Log\/\d{4} \w+ \d+)#", re.IGNORECASE) +findday = re.compile( + r"\[\[(Wikipedia\:Categories for (?:discussion|deletion)\/Log\/\d{4} \w+ \d+)#", + re.IGNORECASE) class ReCheck: @@ -86,7 +95,8 @@ mode = "Delete" day = "None" elif maintenance.search(line): - # It's probably best not to try to handle these in an automated fashion. + # It's probably best not to try to handle these in an automated + # fashion. mode = "None" day = "None" elif m.check(dateheader, line): @@ -97,9 +107,12 @@ dest = m.result.group(2) thisDay = findDay(src, day) if mode == "Move" and thisDay != "None": - summary = "Robot - Moving category " + src + " to [[:Category:" + dest + "]] per [[WP:CFD|CFD]] at " + thisDay + "." + summary = ("Robot - Moving category %s to [[:Category:%s]] per " + "[[WP:CFD|CFD]] at %s.") % (src, dest, thisDay) elif mode == "Speedy": - summary = "Robot - Speedily moving category " + src + " to [[:Category:" + dest + "]] per [[WP:CFDS|CFDS]]." + summary = ("Robot - Speedily moving category %s to " + "[[:Category:%s]] per [[WP:CFDS|CFDS]].") % (src, + dest) else: continue # If the category is redirect, we do NOT want to move articles to @@ -112,23 +125,33 @@ pywikibot.output(summary, toStdout=True) robot = None else: - robot = category.CategoryMoveRobot(oldCatTitle=src, newCatTitle=dest, batchMode=True, - editSummary=summary, inPlace=True, moveCatPage=True, - deleteEmptySourceCat=True, useSummaryForDeletion=True) + robot = category.CategoryMoveRobot(oldCatTitle=src, + newCatTitle=dest, + batchMode=True, + editSummary=summary, + inPlace=True, + moveCatPage=True, + deleteEmptySourceCat=True, + useSummaryForDeletion=True) elif m.check(deletecat, line): src = m.result.group(1) - # I currently don't see any reason to handle these two cases separately, though - # if are guaranteed that the category in the "Delete" case is empty, it might be - # easier to call delete.py on it. + # I currently don't see any reason to handle these two cases + # separately, though if are guaranteed that the category in the + # "Delete" case is empty, it might be easier to call delete.py on + # it. thisDay = findDay(src, day) if (mode == "Empty" or mode == "Delete") and thisDay != "None": - summary = "Robot - Removing category " + src + " per [[WP:CFD|CFD]] at " + thisDay + "." + summary = ("Robot - Removing category %s per [[WP:CFD|CFD]] " + "at %s.") % (src, thisDay) else: continue - robot = category.CategoryRemoveRobot(catTitle=src, batchMode=True, editSummary=summary, - useSummaryForDeletion=True, inPlace=True) + robot = category.CategoryRemoveRobot(catTitle=src, batchMode=True, + editSummary=summary, + useSummaryForDeletion=True, + inPlace=True) else: - # This line does not fit any of our regular expressions, so ignore it. + # This line does not fit any of our regular expressions, so ignore + # it. pass if summary != "" and robot is not None: pywikibot.output(summary, toStdout=True) @@ -169,12 +192,14 @@ elif paramName == 'year': year = paramVal if day and month and year: - return "[[Wikipedia:Categories for discussion/Log/%s %s %s]]" % (year, month, day) + return ( + "[[Wikipedia:Categories for discussion/Log/%s %s %s]]" + % (year, month, day)) return oldDay + if __name__ == "__main__": try: main() finally: pywikibot.stopme() - -- To view, visit https://gerrit.wikimedia.org/r/95758 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3b7a82579d4cc37cd4f3f5081118e9329de29144 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]ify censure.py - change (pywikibot/compat)
by jenkins-bot (Code Review) 16 Nov '13

16 Nov '13

jenkins-bot has submitted this change and it was merged. Change subject: [PEP8]ify censure.py ...................................................................... [PEP8]ify censure.py Change-Id: I099529ab6a61291d3b0bd60da6813b7765684da5 --- M censure.py 1 file changed, 32 insertions(+), 19 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/censure.py b/censure.py index 5d0754a..856d765 100644 --- a/censure.py +++ b/censure.py @@ -21,29 +21,34 @@ logPages = { 'hu.wikipedia': u'Wikipédia:Potenciálisan vandalizmus áldozatául esett szócikkek', - } +} # To add a new language, create or find the bad word page -# similarly to the 'hu.wikipedia' one (one word per line, starting with <pre> and ending with </pre> lines), -# and add to the badWordList lines below. +# similarly to the 'hu.wikipedia' one (one word per line, starting with <pre> +# and ending with </pre> lines), and add to the badWordList lines below. badWordList = { 'hu.wikipedia': u'User:Cenzúrabot/lista', - } +} site = pywikibot.getSite() -if not (site.language() + '.' + site.family.name) in badWordList or not (site.language() + '.' + site.family.name) in logPages: - pywikibot.error('your language isn\'t supported, see the source code for further details') +if not (site.language() + '.' + site.family.name) in badWordList or \ + not (site.language() + '.' + site.family.name) in logPages: + pywikibot.error('your language isn\'t supported, see the source code for ' + 'further details') sys.exit(1) -ownWordPage = pywikibot.Page(site, badWordList[site.language() + '.' + site.family.name]) +ownWordPage = pywikibot.Page(site, badWordList[site.language() + '.' + + site.family.name]) try: - ownWordList = ownWordPage.get(get_redirect = True) + ownWordList = ownWordPage.get(get_redirect=True) except pywikibot.NoPage: - pywikibot.error('the page containing the bad word list of your language doesn\'t exist') + pywikibot.error('the page containing the bad word list of your language ' + 'doesn\'t exist') sys.exit(1) ownWordList = ownWordList.split('\n') del ownWordList[0] del ownWordList[len(ownWordList) - 1] + def seekbpos(str1, str2): i = 0 @@ -52,6 +57,7 @@ return i i += 1 return i + def seekepos(str1, str2, bpos): i1 = len(str1) - 1 @@ -65,10 +71,11 @@ i2 -= 1 return -1 -def checkPage(title, onlyLastDiff = False): + +def checkPage(title, onlyLastDiff=False): if title == logPages[site.language() + '.' + site.family.name]: return - pywikibot.output(u'Checking %s for bad word list' %title) + pywikibot.output(u'Checking %s for bad word list' % title) page = pywikibot.Page(site, title) try: text = page.get() @@ -76,7 +83,8 @@ try: oldver = page.getOldVersion(page.previousRevision()) except IndexError: - pywikibot.output(u'Page %s has no version history, skipping' %title) + pywikibot.output(u'Page %s has no version history, skipping' + % title) return if len(text) > len(oldver): bpos = seekbpos(oldver, text) @@ -84,10 +92,10 @@ diff = text[bpos:epos] text = diff except pywikibot.NoPage: - pywikibot.output(u'Page %s doesn\'t exist, skipping' %title) + pywikibot.output(u'Page %s doesn\'t exist, skipping' % title) return except pywikibot.IsRedirectPage: - pywikibot.output(u'Page %s is a redirect, skipping' %title) + pywikibot.output(u'Page %s is a redirect, skipping' % title) return report = False @@ -97,24 +105,29 @@ wordsIn.append(badWord) report = True if report: - logPage = pywikibot.Page(site, logPages[site.language() + '.' + site.family.name]) + logPage = pywikibot.Page(site, logPages[site.language() + '.' + + site.family.name]) try: log = logPage.get() except: pass - pywikibot.output(u'%s matches the bad word list' %title) - log = '* [' + page.permalink()+ ' ' + title + '] - ' + ' '.join(wordsIn) + '\n' + log + pywikibot.output(u'%s matches the bad word list' % title) + log = '* [%s %s] - ' % (page.permalink(), + title) + ' '.join(wordsIn) + '\n' + log logPage.put(log, title) else: - pywikibot.output(u'%s doesn\'t match any of the bad word list' %title) + pywikibot.output(u'%s doesn\'t match any of the bad word list' % title) + def main(): - pywikibot.warning('this script should not be run manually/directly, but automatically by maintainer.py') + pywikibot.warning('this script should not be run manually/directly, but ' + 'automatically by maintainer.py') if len(sys.argv) == 1: pywikibot.output("Usage: censure.py <article title>") sys.exit(1) del sys.argv[0] checkPage(' '.join(sys.argv).decode('utf-8')) + if __name__ == "__main__": main() -- To view, visit https://gerrit.wikimedia.org/r/95757 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I099529ab6a61291d3b0bd60da6813b7765684da5 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]ify catlib.py - change (pywikibot/compat)
by Xqt (Code Review) 16 Nov '13

16 Nov '13

Xqt has submitted this change and it was merged. Change subject: [PEP8]ify catlib.py ...................................................................... [PEP8]ify catlib.py Change-Id: I9bf397a5dd89d333a68741c1c6f23c26e502f29e --- M catlib.py 1 file changed, 5 insertions(+), 3 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/catlib.py b/catlib.py index c2ca83f..02834b9 100644 --- a/catlib.py +++ b/catlib.py @@ -638,8 +638,9 @@ rearranging them. """ - #get list of Category objects the article is in and remove possible duplicates cats = [] + + # get list of Category objects the article is in and remove duplicates for cat in article.categories(get_redirect=True): if cat not in cats: cats.append(cat) @@ -664,7 +665,8 @@ newtext = pywikibot.replaceCategoryInPlace(oldtext, oldCat, newCat) else: if newCat: - cats[cats.index(oldCat)] = Category(site, newCat.title(), sortKey=sortKey) + cats[cats.index(oldCat)] = Category(site, newCat.title(), + sortKey=sortKey) else: cats.pop(cats.index(oldCat)) oldtext = article.get(get_redirect=True) @@ -698,13 +700,13 @@ def categoryAllElementsAPI(CatName, cmlimit=5000, categories_parsed=[], site=None): - # action=query&list=categorymembers&cmlimit=500&cmtitle=Category:License_tags """ Category to load all the elements in a category using the APIs. Limit: 5000 elements. """ pywikibot.output("Loading %s..." % CatName) + # action=query&list=categorymembers&cmlimit=500&cmtitle=Category:License_tags params = { 'action': 'query', 'list': 'categorymembers', -- To view, visit https://gerrit.wikimedia.org/r/95756 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9bf397a5dd89d333a68741c1c6f23c26e502f29e 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 56531): Ignore Version ID for SVN repository - change (pywikibot/core)
by jenkins-bot (Code Review) 16 Nov '13

16 Nov '13

jenkins-bot has submitted this change and it was merged. Change subject: (Bug 56531): Ignore Version ID for SVN repository ...................................................................... (Bug 56531): Ignore Version ID for SVN repository SVN repository does not replace ID keyword and searching for the keyword ID does raise an exception. Thus we ignore that part of code. Maybe we could get this information from version.py but because that code does not work properly yet, this could be a second part. Change-Id: Icd7384908ebc6409aee17c435f659681bd530f71 --- M pywikibot/bot.py 1 file changed, 10 insertions(+), 6 deletions(-) Approvals: Xqt: Looks good to me, approved Pyfisch: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/pywikibot/bot.py b/pywikibot/bot.py index b885a6a..2db129f 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -3,7 +3,7 @@ User-interface related functions for building bots """ # -# (C) Pywikibot team, 2008-2012 +# (C) Pywikibot team, 2008-2013 # # Distributed under the terms of the MIT license. # @@ -20,6 +20,7 @@ import os import os.path import sys +import re _logger = "bot" @@ -244,7 +245,7 @@ except AttributeError: return - log(u'=== Pywikipediabot framework v2.0 -- Logging header ===') + log(u'=== Pywikibot framework v2.0 -- Logging header ===') # script call log(u'COMMAND: %s' % unicode(sys.argv)) @@ -625,8 +626,6 @@ init_handlers() if config.verbose_output: - import re - ver = pywikibot.__version__ # probably can be improved on # Please don't change the regular expression here unless you really # have to - some git versions (like 1.7.0.4) seem to treat lines # containing just `$Id:` as if they were ident lines (see @@ -634,8 +633,13 @@ # replacement with `$Id$` # or `$Id$`. m = re.search(r"\$Id" - r": (\w+) \$", ver) - pywikibot.output(u'Pywikipediabot r%s' % m.group(1)) + r": (\w+) \$", pywikibot.__version__) + if m: + pywikibot.output(u'Pywikibot r%s' % m.group(1)) + else: + # Version ID not availlable on SVN repository. + # Maybe these informations should be imported from version.py + pywikibot.output(u'Pywikibot SVN repository') pywikibot.output(u'Python %s' % sys.version) if do_help: -- To view, visit https://gerrit.wikimedia.org/r/93313 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icd7384908ebc6409aee17c435f659681bd530f71 Gerrit-PatchSet: 4 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Pyfisch <pyfisch(a)googlemail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] Partially merge branch 'python3': - change (pywikibot/core)
by jenkins-bot (Code Review) 15 Nov '13

15 Nov '13

jenkins-bot has submitted this change and it was merged. Change subject: Partially merge branch 'python3': ...................................................................... Partially merge branch 'python3': family.py Use key function instead of comparator for sorting interwikis https://gerrit.wikimedia.org/r/#/c/90753/ api.py Change Request from DictMixin to MutableMapping https://gerrit.wikimedia.org/r/#/c/90752/ Change-Id: Ia0039c7989cb31fbcff59b9cc1e5fb07c505c231 --- M .gitreview M pywikibot/comms/http.py M pywikibot/page.py M setup.py 4 files changed, 15 insertions(+), 20 deletions(-) Approvals: Xqt: Looks good to me, approved Pyfisch: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/.gitreview b/.gitreview index bd3baf7..9c70b97 100644 --- a/.gitreview +++ b/.gitreview @@ -2,5 +2,5 @@ host=gerrit.wikimedia.org port=29418 project=pywikibot/core.git -defaultbranch=python3 +defaultbranch=master defaultrebase=0 diff --git a/pywikibot/comms/http.py b/pywikibot/comms/http.py index 49e57ac..1dee9ec 100644 --- a/pywikibot/comms/http.py +++ b/pywikibot/comms/http.py @@ -27,10 +27,7 @@ import logging import atexit -try: - from httplib2 import SSLHandshakeError -except ImportError: - from ssl import SSLError as SSLHandshakeError +from httplib2 import SSLHandshakeError from pywikibot import config from pywikibot.exceptions import FatalServerError, Server504Error import pywikibot diff --git a/pywikibot/page.py b/pywikibot/page.py index 2888f5e..cb06350 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -21,10 +21,7 @@ import re import threading import unicodedata -try: - from urllib.parse import quote_from_bytes, unquote_to_bytes -except ImportError: - from urllib import quote as quote_from_bytes, unquote as unquote_to_bytes +import urllib import collections logger = logging.getLogger("pywiki.wiki.page") @@ -169,7 +166,7 @@ title = title.replace(u' ', u'_') if asUrl: encodedTitle = title.encode(self.site.encoding()) - title = quote_from_bytes(encodedTitle) + title = urllib.quote(encodedTitle) if as_filename: # Replace characters that are not possible in file names on some # systems. @@ -3458,7 +3455,7 @@ for enc in encList: try: t = title.encode(enc) - t = unquote_to_bytes(t) + t = urllib.unquote(t) return unicode(t, enc) except UnicodeError, ex: if not firstException: diff --git a/setup.py b/setup.py index 717771c..b022d2f 100644 --- a/setup.py +++ b/setup.py @@ -18,14 +18,16 @@ from setuptools.command import install test_deps = [] -testcollector = "tests" -if sys.version_info[0] == 2: - if sys.version_info[1] < 6: - raise RuntimeError("ERROR: Pywikipediabot only runs under Python 2.6 or higher") - elif sys.version_info[1] == 6: - test_deps = ['unittest2'] - testcollector = "tests.utils.collector" +if sys.version_info[0] != 2: + raise RuntimeError("ERROR: Pywikipediabot only runs under Python 2") +elif sys.version_info[1] < 6: + raise RuntimeError("ERROR: Pywikipediabot only runs under Python 2.6 or higher") +elif sys.version_info[1] == 6: + test_deps = ['unittest2'] + testcollector = "tests.utils.collector" +else: + testcollector = "tests" class pwb_install(install.install): @@ -65,6 +67,5 @@ ], cmdclass={ 'install': pwb_install - }, - use_2to3=True + } ) -- To view, visit https://gerrit.wikimedia.org/r/92173 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia0039c7989cb31fbcff59b9cc1e5fb07c505c231 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Pyfisch <pyfisch(a)googlemail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] Show __doc__ if pwb.py is called without arguments - change (pywikibot/core)
by jenkins-bot (Code Review) 15 Nov '13

15 Nov '13

jenkins-bot has submitted this change and it was merged. Change subject: Show __doc__ if pwb.py is called without arguments ...................................................................... Show __doc__ if pwb.py is called without arguments Change-Id: I96ee324611fdd77ef48ce78aafa9b7466cb7723f --- M pwb.py 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved Pyfisch: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/pwb.py b/pwb.py index 1c49181..d0e1aeb 100644 --- a/pwb.py +++ b/pwb.py @@ -124,3 +124,5 @@ else: raise Exception("%s not found!" % fn) run_python_file(fn, argv, argvu) +elif __name__ == "__main__": + print __doc__ -- To view, visit https://gerrit.wikimedia.org/r/92832 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I96ee324611fdd77ef48ce78aafa9b7466cb7723f Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Pyfisch <pyfisch(a)googlemail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] Persian redirect categories category is renamed - change (pywikibot/core)
by jenkins-bot (Code Review) 14 Nov '13

14 Nov '13

jenkins-bot has submitted this change and it was merged. Change subject: Persian redirect categories category is renamed ...................................................................... Persian redirect categories category is renamed http://fa.wikipedia.org/wiki/رده:رده‌های_منتقل_شده Change-Id: I5c7d6da434d73a10dbe1388e873052dbadf9d002 --- M scripts/category_redirect.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved Reza: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/scripts/category_redirect.py b/scripts/category_redirect.py index 005827f..290a87f 100755 --- a/scripts/category_redirect.py +++ b/scripts/category_redirect.py @@ -56,7 +56,7 @@ 'da': "Kategori:Omdirigeringskategorier", 'en': "Category:Wikipedia soft redirected categories", 'es': "Categoría:Wikipedia:Categorías redirigidas", - 'fa': u"رده:رده‌های منتقل شده", + 'fa': u"رده:رده‌های منتقل‌شده", 'hu': "Kategória:Kategóriaátirányítások", 'ja': "Category:移行中のカテゴリ", 'no': "Kategori:Wikipedia omdirigertekategorier", -- To view, visit https://gerrit.wikimedia.org/r/95377 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5c7d6da434d73a10dbe1388e873052dbadf9d002 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ebrahim <ebrahim(a)gnu.org> Gerrit-Reviewer: Reza <reza.energy(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] Persian redirect categories category is renamed - change (pywikibot/compat)
by Xqt (Code Review) 14 Nov '13

14 Nov '13

Xqt has submitted this change and it was merged. Change subject: Persian redirect categories category is renamed ...................................................................... Persian redirect categories category is renamed http://fa.wikipedia.org/wiki/رده:رده‌های_منتقل_شده Change-Id: I48588464c41d2afe9541523aee6005aea97cb7a1 --- M category_redirect.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved Reza: Looks good to me, but someone else must approve diff --git a/category_redirect.py b/category_redirect.py index ad0ea67..1603bb9 100644 --- a/category_redirect.py +++ b/category_redirect.py @@ -66,7 +66,7 @@ 'da': "Kategori:Omdirigeringskategorier", 'en': "Category:Wikipedia soft redirected categories", 'es': "Categoría:Wikipedia:Categorías redirigidas", - 'fa': u"رده:رده‌های منتقل شده", + 'fa': u"رده:رده‌های منتقل‌شده", 'hu': "Kategória:Kategóriaátirányítások", 'ja': "Category:移行中のカテゴリ", 'no': "Kategori:Wikipedia omdirigertekategorier", -- To view, visit https://gerrit.wikimedia.org/r/95378 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I48588464c41d2afe9541523aee6005aea97cb7a1 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Ebrahim <ebrahim(a)gnu.org> Gerrit-Reviewer: Reza <reza.energy(a)gmail.com> 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