Pywikibot-commits

pywikibot-commits@lists.wikimedia.org

1 participants
13418 discussions

[Gerrit] add_text.py: removed unused import, added missing import - change (pywikibot/compat)
by jenkins-bot (Code Review) 30 Dec '13

30 Dec '13

jenkins-bot has submitted this change and it was merged. Change subject: add_text.py: removed unused import, added missing import ...................................................................... add_text.py: removed unused import, added missing import Change-Id: I1c304277b5992cb18bacdec0ae692f75f8ecf742 --- M add_text.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/add_text.py b/add_text.py index 475722a..44ba099 100644 --- a/add_text.py +++ b/add_text.py @@ -75,13 +75,13 @@ import re import urllib2 -import urllib import webbrowser import codecs import wikipedia as pywikibot import config from pywikibot import i18n import pagegenerators +import time docuReplacements = { '&params;': pagegenerators.parameterHelp, -- To view, visit https://gerrit.wikimedia.org/r/104471 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1c304277b5992cb18bacdec0ae692f75f8ecf742 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] date.py: fixed spelling in called function name - change (pywikibot/compat)
by jenkins-bot (Code Review) 30 Dec '13

30 Dec '13

jenkins-bot has submitted this change and it was merged. Change subject: date.py: fixed spelling in called function name ...................................................................... date.py: fixed spelling in called function name Change-Id: I076167fdf7f5ec2966b78488fc468f859412955b --- M date.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/date.py b/date.py index a4cab15..da3e246 100644 --- a/date.py +++ b/date.py @@ -1577,7 +1577,7 @@ lambda p: p == 4), (lambda v: dh_constVal(v, 5, u'Föfte Johdousend'), lambda p: p == 5), - (lambda v: dh_milleniumAD(v, u'%d. Johdousend'), alwaysTrue)]), + (lambda v: dh_millenniumAD(v, u'%d. Johdousend'), alwaysTrue)]), 'lb': lambda v: dh_millenniumAD(v, u'%d. Joerdausend'), 'mhr': lambda v: dh_millenniumAD(v, u'%R. курым — '), 'lt': lambda v: dh_millenniumAD(v, u'%d tūkstantmetis'), -- To view, visit https://gerrit.wikimedia.org/r/104474 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I076167fdf7f5ec2966b78488fc468f859412955b Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] (bug 59107) template.py passes "editSummary" but should pass... - change (pywikibot/core)
by jenkins-bot (Code Review) 29 Dec '13

29 Dec '13

jenkins-bot has submitted this change and it was merged. Change subject: (bug 59107) template.py passes "editSummary" but should pass "summary" ...................................................................... (bug 59107) template.py passes "editSummary" but should pass "summary" Bug: 59107 Change-Id: I4179640dc0900660608b6bbe0c7d0e2b8bf0f7f6 --- M scripts/template.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/template.py b/scripts/template.py index 7a74685..a2432c3 100755 --- a/scripts/template.py +++ b/scripts/template.py @@ -278,7 +278,7 @@ replaceBot = replace.ReplaceRobot(self.generator, replacements, exceptions, acceptall=self.acceptAll, addedCat=self.addedCat, - editSummary=self.editSummary) + summary=self.editSummary) replaceBot.run() -- To view, visit https://gerrit.wikimedia.org/r/104483 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4179640dc0900660608b6bbe0c7d0e2b8bf0f7f6 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Gerrit Patch Uploader <gerritpatchuploader(a)gmail.com> Gerrit-Reviewer: DixonD <dixond(a)acm.lviv.ua> Gerrit-Reviewer: Gerrit Patch Uploader <gerritpatchuploader(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] (bug 55187) archivebot.py: proper handling of command line args - change (pywikibot/compat)
by jenkins-bot (Code Review) 29 Dec '13

29 Dec '13

jenkins-bot has submitted this change and it was merged. Change subject: (bug 55187) archivebot.py: proper handling of command line args ...................................................................... (bug 55187) archivebot.py: proper handling of command line args "-family:" is now effective even when "--lang" is not provided. The first positional arg (script name) is now ignored. (Follow-up to I97b14b21f3c4c73183f85473926e0b204c4f1abd) Change-Id: Ia747df50b5736805b0cb1bbfdc2f5d1db180252a (cherry picked from commit 0da738ee7d39433a79b18dcc6e40af8b07dc7e14) --- M archivebot.py 1 file changed, 6 insertions(+), 4 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/archivebot.py b/archivebot.py index 9c5603f..3146732 100644 --- a/archivebot.py +++ b/archivebot.py @@ -701,13 +701,15 @@ force = False if options.lang: - Site = pywikibot.getSite(options.lang) - language = Site.language() + pywikibot.default_code = options.lang + + Site = pywikibot.getSite() + language = Site.language() if options.simulate: pywikibot.simulate = True - if not args: + if not args or len(args) <= 1: pywikibot.output(u'NOTE: you must specify a template to run the bot') pywikibot.showHelp('archivebot') return @@ -715,7 +717,7 @@ #query site for original months name and create convenience look-up dictionaries Months.updateMonths(site=Site) - for a in args: + for a in args[1:]: pagelist = [] if not options.filename and not options.pagename: #for pg in pywikibot.Page(Site,a).getReferences(follow_redirects=False,onlyTemplateInclusion=True): -- To view, visit https://gerrit.wikimedia.org/r/101002 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia747df50b5736805b0cb1bbfdc2f5d1db180252a Gerrit-PatchSet: 5 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Whym <whym(a)whym.org> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] Archivebot: support all languages and timezones. - change (pywikibot/compat)
by jenkins-bot (Code Review) 29 Dec '13

29 Dec '13

jenkins-bot has submitted this change and it was merged. Change subject: Archivebot: support all languages and timezones. ...................................................................... Archivebot: support all languages and timezones. Necessary info are retrieved directly from site. No use of locale should be necessary any longer. Change-Id: Iede5165fd36b8e5747db032183094fa11177b037 --- M archivebot.py 1 file changed, 257 insertions(+), 172 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/archivebot.py b/archivebot.py index f7de303..9c5603f 100644 --- a/archivebot.py +++ b/archivebot.py @@ -36,7 +36,7 @@ algo specifies the maximum age of a thread. Must be in the form old(<delay>) where <delay> specifies the age in hours or days like 24h or 5d. - Default ist old(24h) + Default is old(24h) counter The current value of a counter which could be assigned as variable. Will be actualized by bot. Initial value is 1. maxarchivesize The maximum archive size before incrementing the counter. @@ -70,20 +70,28 @@ # # (C) Misza13, 2006-2010 # (C) xqt, 2009-2012 -# (C) Pywikipedia bot team, 2007-2012 +# (C) Pywikipedia bot team, 2007-2013 # # Distributed under the terms of the MIT license. # __version__ = '$Id$' # +import wikipedia as pywikibot +from pywikibot import i18n +import pagegenerators +import query +import datetime +import time import os import re -import time import locale import traceback -import string -import urllib -import unicodedata + + +ZERO = datetime.timedelta(0) + +Site = pywikibot.getSite() + try: # Get a constructor for the MD5 hash object import hashlib new_hash = hashlib.md5 @@ -91,13 +99,6 @@ import md5 new_hash = md5.md5 -import wikipedia as pywikibot -from pywikibot import i18n -import pagegenerators -import query - - -Site = pywikibot.getSite() language = Site.language() @@ -111,9 +112,7 @@ 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): @@ -122,24 +121,20 @@ 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 timedelta object.""" if str[-1] == 'd': - return int(str[:-1]) * 24 * 3600 + return datetime.timedelta(days=int(str[:-1])) elif str[-1] == 'h': - return int(str[:-1]) * 3600 + return datetime.timedelta(hours=int(str[:-1])) else: - return int(str) + return datetime.timedelta(seconds=int(str)) def str2size(str): @@ -148,10 +143,8 @@ 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 + 'B' (bytes) or 'T' (threads).""" + if str[-1].isdigit(): # TODO: de-uglify return (int(str), 'B') elif str[-1] in ['K', 'k']: return (int(str[:-1]) * 1024, 'B') @@ -161,43 +154,6 @@ return (int(str[:-1]), 'T') else: return (int(str[:-1]) * 1024, 'B') - - -def int2month(num): - """Returns the locale's full name of month 'num' (1-12).""" - if hasattr(locale, 'nl_langinfo'): - 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]) - - -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()]) - Months = ['jan', 'feb', 'mar', 'apr', 'may', 'jun', - 'jul', 'aug', 'sep', 'oct', 'nov', 'dec'] - 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. - - """ -## print txt, format - try: - return time.strptime(txt, format) - except ValueError: - try: - return time.strptime(txt.encode('utf8'), format) - except: - pass def generateTransclusions(Site, template, namespaces=[]): @@ -211,20 +167,215 @@ yield page +class Months(object): + """ + Generation of look-up dictionaries for months, used by Timestripper() and PageArchiver + """ + + def __init__(self, site=None): + if site is None: + self.site = pywikibot.getSite() + else: + self.site = site + + @classmethod + def queryMonths(self): + months_long = ['january', 'february', 'march', 'april', 'may_long', 'june', + 'july', 'august', 'september', 'october', 'november', 'december'] + months_short = ['jan', 'feb', 'mar', 'apr', 'may', 'jun', + 'jul', 'aug', 'sep', 'oct', 'nov', 'dec'] + + #one query instead of multiple queries using site.mediawiki_message() + #can be refactored to use site.mediawiki_message() + params = { + 'action': 'query', + 'meta': 'allmessages', + 'ammessages': '|'.join(months_long) + '|' + '|'.join(months_short), + 'amlang': self.site.lang, + } + + monthsDict = query.GetData(params)['query']['allmessages'] + + monthNum2origNames = dict((i, {'short': '', 'long': ''}) for i in range(1, 13)) + origNames2monthNum = dict() + + for el in monthsDict: + orig, eng = el['*'], el['name'] + try: + month_num = months_long.index(eng) + 1 + monthNum2origNames[month_num]['long'] = orig + except ValueError: + month_num = months_short.index(eng) + 1 + monthNum2origNames[month_num]['short'] = orig + + origNames2monthNum[orig] = month_num + + return monthNum2origNames, origNames2monthNum + + @classmethod + def updateMonths(self, site=None): + if site is None: + self.site = pywikibot.getSite() + else: + self.site = site + self.monthsDicts = self.queryMonths() + + +class tzoneUTC(datetime.tzinfo): + """ + Class building a UTC tzinfo object + """ + + def utcoffset(self, dt): + return ZERO + + def tzname(self, dt): + return 'UTC' + + def dst(self, dt): + return ZERO + + def __repr__(self): + return "%s()" % self.__class__.__name__ + + +class tzoneFixedOffset(datetime.tzinfo): + """ + Class building tzinfo objects for fixed-offset time zones + + @offset: a number indicating fixed offset in minutes east from UTC + @name: a string with name of the timezone""" + + def __init__(self, offset, name): + self.__offset = datetime.timedelta(minutes=offset) + self.__name = name + + def utcoffset(self, dt): + return self.__offset + + def tzname(self, dt): + return self.__name + + def dst(self, dt): + return ZERO + + def __repr__(self): + return "%s(%s, %s)" % ( + self.__class__.__name__, + self.__offset.days * 86400 + self.__offset.seconds, + self.__name + ) + + +class TimeStripper(object): + """ + Find timetstamp in page text and returns it as timezone aware datetime object + """ + + def __init__(self): + self.monthNum2origNames, self.origNames2monthNum = Months.monthsDicts + self.site = Months.site + + self.groups = [u'year', u'month', u'hour', u'time', u'day', u'minute', u'tzinfo'] + + timeR = r'(?P<time>(?P<hour>[0-2]\d)[:\.h](?P<minute>[0-5]\d))' + timeznR = r'$(?P<tzinfo>[A-Z]+)$' + yearR = r'(?P<year>(19|20)\d\d)' + monthR = ur'(?P<month>(%s))' % (u'|'.join(self.origNames2monthNum)) + dayR = r'(?P<day>(3[01]|[12]\d|0?[1-9]))' + + self.ptimeR = re.compile(timeR) + self.timeznR = re.compile(timeznR) + self.yearR = re.compile(yearR) + self.pmonthR = re.compile(monthR, re.U) + self.pdayR = re.compile(dayR) + + #order is important to avoid mismatch when searching + self.patterns = [ + self.ptimeR, + self.timeznR, + self.yearR, + self.pmonthR, + self.pdayR, + ] + + def findmarker(self, text, base=u'@@', delta='@'): + # find a string which is not part of text + while base in text: + base += delta + return base + + def last_match_and_replace(self, txt, pat): + """ + Take the rightmost match, to prevent spurious earlier matches, and replace with marker + """ + m = None + for m in pat.finditer(txt): + pass + + if m: + marker = self.findmarker(txt) + txt = pat.sub(marker, txt) + return (txt, m.groupdict()) + else: + return (txt, None) + + def timestripper(self, line): + """ + Find timestamp in line and convert it to time zone aware datetime + """ + _line = line + #match date fields + dateDict = dict() + for pat in self.patterns: + line, matchDict = self.last_match_and_replace(line, pat) + if matchDict: + dateDict.update(matchDict) + + #all fields matched -> date valid + if all(g in dateDict for g in self.groups): + #remove 'time' key, now splitted in hour/minute and not needed by datetime + del dateDict['time'] + + #replace month name in original language with month number + try: + dateDict['month'] = self.origNames2monthNum[dateDict['month']] + except KeyError: + pywikibot.output(u'incorrect month name in page') + + #convert to integers + for k, v in dateDict.items(): + try: + dateDict[k] = int(v) + except ValueError: + pass + + #find timezone + dateDict['tzinfo'] = tzoneFixedOffset(self.site.siteinfo()['timeoffset'], + self.site.siteinfo()['timezone']) + + timestamp = datetime.datetime(**dateDict) + + else: + timestamp = None + + return timestamp + + 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): + def __init__(self, title, now): self.title = title + self.now = now self.content = "" + self.ts = TimeStripper() self.timestamp = None def __repr__(self): @@ -234,86 +385,16 @@ def feedLine(self, line): if not self.content and not line: return - self.content += line + '\n' - #Update timestamp -# nnwiki: -# 19:42, 25 mars 2008 (CET) -# enwiki -# 16:36, 30 March 2008 (UTC) -# huwiki -# 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) - if not TM: - 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) -#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) - 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) -# Japanese: 2012年8月4日 (日) 13:01 (UTC) - if not TM: - TM = re.search(re.compile(u'(\d\d\d\d)年(\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'. - _TM = ''.join(c for c in unicodedata.normalize('NFD', TM.group(0)) - if unicodedata.category(c) != 'Mn') - 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: - TIME = txt2timestamp(_TM, "%d. %b %Y kl.%H:%M (%Z)") - if not TIME: - TIME = txt2timestamp(re.sub(' *$[^ ]+$ *', '', _TM), - "%H:%M, %d %B %Y") - if not TIME: - TIME = txt2timestamp(_TM, "%H:%M, %d %b %Y (%Z)") - if not TIME: - TIME = txt2timestamp(re.sub(' *$[^ ]+$ *', '', _TM), - "%H:%M, %d %b %Y") - if not TIME: - TIME = txt2timestamp(_TM, "%H:%M, %b %d %Y (%Z)") - if not TIME: - TIME = txt2timestamp(_TM, "%H:%M, %B %d %Y (%Z)") - if not TIME: - TIME = txt2timestamp(_TM, "%H:%M, %b %d, %Y (%Z)") - 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)") - if not TIME: - TIME = txt2timestamp(_TM, "%d %B %Y %H:%M (%Z)") - if not TIME: - TIME = txt2timestamp(_TM, "%Y年%B%d日 (%a) %H:%M (%Z)") - if not TIME: - TIME = txt2timestamp(re.sub(' *$[^ ]+$ *', '', _TM), - "%H:%M, %d. %b. %Y") - if TIME: - self.timestamp = max(self.timestamp, time.mktime(TIME)) -## pywikibot.output(u'Time to be parsed: %s' % TM.group(0)) -## pywikibot.output(u'Parsed time: %s' % TIME) -## pywikibot.output(u'Newest timestamp in thread: %s' % TIME) + self.content += line + '\n' + + timestamp = self.ts.timestripper(line) + + if not self.timestamp: # first time + self.timestamp = timestamp + + if timestamp: + self.timestamp = max(self.timestamp, timestamp) def size(self): return len(self.title) + len(self.content) + 12 @@ -330,16 +411,14 @@ #TODO: handle this: #return 'unsigned' maxage = str2time(reT.group(1)) - if self.timestamp + maxage < time.time(): + if self.now - self.timestamp > maxage: return message('archivebot-older-than') + ' ' + reT.group(1) return '' 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) @@ -347,6 +426,8 @@ self.full = False self.archiver = archiver self.vars = vars + self.now = datetime.datetime.utcnow().replace(tzinfo=tzoneUTC()) + try: self.loadPage() except pywikibot.NoPage: @@ -370,7 +451,7 @@ found = True # Reading threads now if curThread: self.threads.append(curThread) - curThread = DiscussionThread(threadHeader.group(1)) + curThread = DiscussionThread(threadHeader.group(1), self.now) else: if found: curThread.feedLine(line) @@ -431,6 +512,7 @@ } self.archives = {} self.archivedThreads = 0 + self.monthNum2origNames, self.origNames2monthNum = Months.monthsDicts def get(self, attr, default=''): return self.attributes.get(attr, [default])[0] @@ -445,10 +527,10 @@ 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() @@ -480,8 +562,7 @@ 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: @@ -493,7 +574,6 @@ archCounter = int(self.get('counter', '1')) oldthreads = self.Page.threads self.Page.threads = [] - T = time.mktime(time.gmtime()) whys = [] pywikibot.output(u'Processing %d threads' % len(oldthreads)) for t in oldthreads: @@ -506,14 +586,13 @@ why = t.shouldBeArchived(self) if why: 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)), + 'year': t.timestamp.year, + 'month': t.timestamp.month, + 'monthname': self.monthNum2origNames[t.timestamp.month]['long'], + 'monthnameshort': self.monthNum2origNames[t.timestamp.month]['short'], + 'week': int(time.strftime('%W', t.timestamp.timetuple())), } archive = pywikibot.Page(Site, archive % vars).title() if self.feedArchive(archive, t, maxArchSize, vars): @@ -545,12 +624,12 @@ self.commentParams) self.archives[a].update(comment) - #Save the page itself - rx = re.compile('{{%s\n.*?\n}}' % self.tpl, re.DOTALL) + # Save the page itself + rx = re.compile('{{' + self.tpl + '\n.*?\n}}', re.DOTALL) self.Page.header = rx.sub(self.attr2text(), self.Page.header) self.commentParams['count'] = self.archivedThreads - self.commentParams['archives'] = ', '.join( - ['[[%s]]' % a.title() for a in self.archives.values()]) + self.commentParams['archives'] \ + = ', '.join(['[[' + a.title() + ']]' for a in self.archives.values()]) if not self.commentParams['archives']: self.commentParams['archives'] = '/dev/null' self.commentParams['why'] = ', '.join(whys) @@ -633,9 +712,13 @@ pywikibot.showHelp('archivebot') return + #query site for original months name and create convenience look-up dictionaries + Months.updateMonths(site=Site) + 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 options.namespace is not None: ns = [str(options.namespace)] else: @@ -648,7 +731,10 @@ 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 @@ -660,7 +746,6 @@ except: pywikibot.output(u'Error occured while processing page %s' % pg) traceback.print_exc() - if __name__ == '__main__': try: -- To view, visit https://gerrit.wikimedia.org/r/94583 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iede5165fd36b8e5747db032183094fa11177b037 Gerrit-PatchSet: 10 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Mineo <themineo(a)gmail.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] Reorder UserEditFilterGenerator in right place - change (pywikibot/compat)
by jenkins-bot (Code Review) 29 Dec '13

29 Dec '13

jenkins-bot has submitted this change and it was merged. Change subject: Reorder UserEditFilterGenerator in right place ...................................................................... Reorder UserEditFilterGenerator in right place synchronized with core Change-Id: I46e88b7e0313c0f1c4560b74c2c9208b828868fc --- M template.py 1 file changed, 2 insertions(+), 3 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/template.py b/template.py index f75797e..d284a22 100644 --- a/template.py +++ b/template.py @@ -351,8 +351,6 @@ if xmlfilename: gen = XmlDumpTemplatePageGenerator(oldTemplates, xmlfilename) - elif user: - gen = UserEditFilterGenerator(gen, user, timestamp, skip) else: gen = genFactory.getCombinedGenerator() if not gen: @@ -362,7 +360,8 @@ ] gen = pagegenerators.CombinedPageGenerator(gens) gen = pagegenerators.DuplicateFilterPageGenerator(gen) - + if user: + gen = UserEditFilterGenerator(gen, user, timestamp, skip) preloadingGen = pagegenerators.PreloadingGenerator(gen) bot = TemplateRobot(preloadingGen, templates, subst, remove, editSummary, -- To view, visit https://gerrit.wikimedia.org/r/103651 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I46e88b7e0313c0f1c4560b74c2c9208b828868fc Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Huji <huji.huji(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Siebrand <siebrand(a)wikimedia.org> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] [PEP8] changes, remove obsolete else statement in handleArg - change (pywikibot/core)
by jenkins-bot (Code Review) 29 Dec '13

29 Dec '13

jenkins-bot has submitted this change and it was merged. Change subject: [PEP8] changes, remove obsolete else statement in handleArg ...................................................................... [PEP8] changes, remove obsolete else statement in handleArg Change-Id: Idc488c269eb30de2e7c28323cead797b09cc554d --- M pywikibot/pagegenerators.py 1 file changed, 2 insertions(+), 3 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index 2801746..b146d6a 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -488,8 +488,7 @@ gen = YahooSearchPageGenerator(arg[7:]) elif arg.startswith('-untagged'): gen = UntaggedPageGenerator(arg[10:]) - else: - pass + if gen: self.gens.append(gen) return True @@ -1043,7 +1042,7 @@ """ URL = "http://toolserver.org/~daniel/WikiSense/UntaggedImages.php?" REGEXP = r"<td valign='top' title='Name'><a href='http://.*?" \ - "\.org/w/index\.php\?title=(.*?)'>.*?</a></td>" + "\.org/w/index\.php\?title=(.*?)'>.*?</a></td>" lang, project = untaggedProject.split('.', 1) if lang == 'commons': wiki = 'wikifam=commons.wikimedia.org' -- To view, visit https://gerrit.wikimedia.org/r/104329 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idc488c269eb30de2e7c28323cead797b09cc554d Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Aaron1011 <aa1ronham(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Pyfisch <pyfisch(a)gmail.com> Gerrit-Reviewer: Russell Blau <russblau(a)imapmail.org> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] Rm change_category func from category_redirect.py - change (pywikibot/core)
by jenkins-bot (Code Review) 29 Dec '13

29 Dec '13

jenkins-bot has submitted this change and it was merged. Change subject: Rm change_category func from category_redirect.py ...................................................................... Rm change_category func from category_redirect.py Change-Id: I9d33a9efd94d48e1beb7abf48640956484d8f0cc --- M scripts/category_redirect.py 1 file changed, 4 insertions(+), 57 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/category_redirect.py b/scripts/category_redirect.py index fa7474b..1a018d4 100755 --- a/scripts/category_redirect.py +++ b/scripts/category_redirect.py @@ -79,59 +79,6 @@ self.edit_request_item = i18n.twtranslate( self.site.lang, 'category_redirect-edit-request-item') - def change_category(self, article, oldCat, newCat, comment=None, - sortKey=None): - """Given an article in category oldCat, moves it to category newCat. - Moves subcategories of oldCat as well. oldCat and newCat should be - Category objects. If newCat is None, the category will be removed. - - This is a copy of portions of [old] catlib.change_category(), with - some changes. - - """ - oldtext = article.get(get_redirect=True, force=True) - if newCat in article.categories() or newCat == article: - newtext = pywikibot.replaceCategoryInPlace(oldtext, oldCat, None, - site=self.site) - else: - newtext = pywikibot.replaceCategoryInPlace(oldtext, oldCat, newCat, - site=self.site) - try: - # even if no changes, still save the page, in case it needs - # an update due to changes in a transcluded template - article.put(newtext, comment) - if newtext == oldtext: - pywikibot.output(u'No changes made in page %s.' - % article.title(asLink=True)) - return False - return True - except pywikibot.EditConflict: - pywikibot.output(u'Skipping %s because of edit conflict' - % article.title(asLink=True)) - except pywikibot.LockedPage: - pywikibot.output(u'Skipping locked page %s' - % article.title(asLink=True)) - self.edit_requests.append({ - 'title': article.title(asLink=True, textlink=True), - 'oldcat': oldCat.title(asLink=True, textlink=True), - 'newcat': newCat.title(asLink=True, textlink=True)}) - except pywikibot.SpamfilterError as error: - pywikibot.output( - u'Changing page %s blocked by spam filter (URL=%s)' - % (article.title(asLink=True), error.url)) - except pywikibot.NoUsername: - pywikibot.output( - u"Page %s not saved; sysop privileges required." - % article.title(asLink=True)) - self.edit_requests.append({ - 'title': article.title(asLink=True, textlink=True), - 'oldcat': oldCat.title(asLink=True, textlink=True), - 'newcat': newCat.title(asLink=True, textlink=True)}) - except pywikibot.PageNotSaved as error: - pywikibot.output(u"Saving page %s failed: %s" - % (article.title(asLink=True), error)) - return False - def move_contents(self, oldCatTitle, newCatTitle, editSummary): """The worker function that moves pages out of oldCat into newCat""" while True: @@ -148,8 +95,8 @@ found, moved = 0, 0 for article in oldCat.members(): found += 1 - changed = self.change_category(article, oldCat, newCat, - comment=comment) + changed = article.change_category(oldCat, newCat, + comment=comment) if changed: moved += 1 @@ -164,8 +111,8 @@ old_text = doc.get() except pywikibot.Error: continue - changed = self.change_category(doc, oldCat, newCat, - comment=comment) + changed = doc.change_category(oldCat, newCat, + comment=comment) if changed: moved += 1 -- To view, visit https://gerrit.wikimedia.org/r/104330 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9d33a9efd94d48e1beb7abf48640956484d8f0cc Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Pyfisch <pyfisch(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] makecat.py: moved away from catlib. - change (pywikibot/core)
by jenkins-bot (Code Review) 29 Dec '13

29 Dec '13

jenkins-bot has submitted this change and it was merged. Change subject: makecat.py: moved away from catlib. ...................................................................... makecat.py: moved away from catlib. Change-Id: Ibdbbda3805bbf7b4f6e6725c9eb4fd2c37741ca2 --- M scripts/makecat.py 1 file changed, 8 insertions(+), 8 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/makecat.py b/scripts/makecat.py index e269620..509f8b9 100644 --- a/scripts/makecat.py +++ b/scripts/makecat.py @@ -41,7 +41,7 @@ import codecs import pywikibot -from pywikibot import date, catlib, pagegenerators, i18n +from pywikibot import date, pagegenerators, i18n def rawtoclean(c): @@ -72,8 +72,8 @@ def include(pl, checklinks=True, realinclude=True, linkterm=None): cl = checklinks if linkterm: - actualworkingcat = catlib.Category(mysite, workingcat.title(), - sortKey=linkterm) + actualworkingcat = pywikibot.Category(mysite, workingcat.title(), + sortKey=linkterm) else: actualworkingcat = workingcat if realinclude: @@ -91,7 +91,7 @@ for c in cats: if c in parentcats: if removeparent: - catlib.change_category(pl, c, actualworkingcat) + pl.change_category(actualworkingcat) break else: pl.put(pywikibot.replaceCategoryLinks( @@ -223,10 +223,10 @@ mysite = pywikibot.getSite() workingcatname = unicode(workingcatname, 'utf-8') pywikibot.setAction(i18n.twtranslate(mysite, 'makecat-create') + u' ' + workingcatname) - workingcat = catlib.Category(mysite, - u'%s:%s' - % (mysite.category_namespace(), - workingcatname)) + workingcat = pywikibot.Category(mysite, + u'%s:%s' + % (mysite.category_namespace(), + workingcatname)) filename = pywikibot.config.datafilepath('category', workingcatname.encode('ascii', 'xmlcharrefreplace') + '_exclude.txt') try: -- To view, visit https://gerrit.wikimedia.org/r/104331 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibdbbda3805bbf7b4f6e6725c9eb4fd2c37741ca2 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Pyfisch <pyfisch(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] notice for bug 57879 - change (pywikibot/compat)
by jenkins-bot (Code Review) 29 Dec '13

29 Dec '13

jenkins-bot has submitted this change and it was merged. Change subject: notice for bug 57879 ...................................................................... notice for bug 57879 Change-Id: I654d3377bf056c418f6dbf27d5a2e2870c24da2e --- M wikipedia.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/wikipedia.py b/wikipedia.py index a06e509..9946d0d 100644 --- a/wikipedia.py +++ b/wikipedia.py @@ -751,7 +751,7 @@ else: # Make sure we re-raise an exception we got on an earlier attempt if hasattr(self, '_redirarg') and not get_redirect: - raise IsRedirectPage, self._redirarg # noqa + raise IsRedirectPage, self._redirarg # do not change unless you see https://bugzilla.wikimedia.org/show_bug.cgi?id=57879 elif hasattr(self, '_getexception'): if self._getexception == IsRedirectPage and get_redirect: pass -- To view, visit https://gerrit.wikimedia.org/r/104344 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I654d3377bf056c418f6dbf27d5a2e2870c24da2e Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Ladsgroup <ladsgroup(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