Pywikipedia-svn September 2010

pywikipedia-svn@lists.wikimedia.org

5 participants
127 discussions

SVN: [8590] trunk/pywikipedia
by xqt＠svn.wikimedia.org 22 Sep '10

22 Sep '10

Revision: 8590 Author: xqt Date: 2010-09-22 05:10:49 +0000 (Wed, 22 Sep 2010) Log Message: ----------- easier merging to rewrite branch Modified Paths: -------------- trunk/pywikipedia/category.py trunk/pywikipedia/category_redirect.py Modified: trunk/pywikipedia/category.py =================================================================== --- trunk/pywikipedia/category.py 2010-09-22 05:07:29 UTC (rev 8589) +++ trunk/pywikipedia/category.py 2010-09-22 05:10:49 UTC (rev 8590) @@ -419,15 +419,15 @@ except pywikibot.NoPage: if self.create: pywikibot.output(u"Page %s doesn't exist yet; creating." - % (page.aslink())) + % (page.title(asLink=True))) text = '' else: pywikibot.output(u"Page %s does not exist; skipping." - % page.aslink()) + % page.title(asLink=True)) except pywikibot.IsRedirectPage: redirTarget = pywikibot.Page(site, arg.args[0]) pywikibot.output(u"WARNING: Page %s is a redirect to %s; skipping." - % (page.aslink(), redirTarget.aslink())) + % (page.title(asLink=True), redirTarget.title(asLink=True))) else: return text return None @@ -460,7 +460,7 @@ minorEdit=minorEdit, botflag=botflag) except pywikibot.LockedPage: pywikibot.output(u"Page %s is locked; skipping." - % page.aslink()) + % page.title(asLink=True)) except pywikibot.EditConflict: pywikibot.output( u'Skipping %s because of edit conflict' @@ -493,11 +493,12 @@ else: if self.sort: catpl = self.sorted_by_last_name(catpl, page) - pywikibot.output(u'Adding %s' % catpl.aslink()) + pywikibot.output(u'Adding %s' % catpl.title(asLink=True)) cats.append(catpl) text = pywikibot.replaceCategoryLinks(text, cats) if not self.save(text, page, self.editSummary): - pywikibot.output(u'Page %s not saved.' % page.aslink()) + pywikibot.output(u'Page %s not saved.' + % page.title(asLink=True)) class CategoryMoveRobot: Modified: trunk/pywikipedia/category_redirect.py =================================================================== --- trunk/pywikipedia/category_redirect.py 2010-09-22 05:07:29 UTC (rev 8589) +++ trunk/pywikipedia/category_redirect.py 2010-09-22 05:10:49 UTC (rev 8590) @@ -219,32 +219,33 @@ # an update due to changes in a transcluded template article.put(newtext, comment) if newtext == oldtext: - pywikibot.output( - u'No changes in made in page %s.' % article.aslink()) + pywikibot.output(u'No changes in 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.aslink()) + pywikibot.output(u'Skipping %s because of edit conflict' + % article.title(asLink=True)) except pywikibot.LockedPage: - pywikibot.output(u'Skipping locked page %s' % article.aslink()) - self.edit_requests.append((article.aslink(), + pywikibot.output(u'Skipping locked page %s' + % article.title(asLink=True)) + self.edit_requests.append((article.title(asLink=True), oldCat.aslink(textlink=True), newCat.aslink(textlink=True))) except pywikibot.SpamfilterError, error: pywikibot.output( u'Changing page %s blocked by spam filter (URL=%s)' - % (article.aslink(), error.url)) + % (article.title(asLink=True), error.url)) except pywikibot.NoUsername: pywikibot.output( u"Page %s not saved; sysop privileges required." - % article.aslink()) + % article.title(asLink=True)) self.edit_requests.append((article.aslink(textlink=True), oldCat.aslink(textlink=True), newCat.aslink(textlink=True))) except pywikibot.PageNotSaved, error: pywikibot.output(u"Saving page %s failed: %s" - % (article.aslink(), error.message)) + % (article.title(asLink=True), error.message)) return False def move_contents(self, oldCatTitle, newCatTitle, editSummary):

1 0

SVN: [8589] trunk/pywikipedia
by xqt＠svn.wikimedia.org 22 Sep '10

22 Sep '10

Revision: 8589 Author: xqt Date: 2010-09-22 05:07:29 +0000 (Wed, 22 Sep 2010) Log Message: ----------- easier merging to rewrite branch Modified Paths: -------------- trunk/pywikipedia/basic.py trunk/pywikipedia/blockpageschecker.py trunk/pywikipedia/blockreview.py trunk/pywikipedia/capitalize_redirects.py trunk/pywikipedia/fixing_redirects.py trunk/pywikipedia/pagegenerators.py trunk/pywikipedia/replace.py trunk/pywikipedia/welcome.py trunk/pywikipedia/xmlreader.py Modified: trunk/pywikipedia/basic.py =================================================================== --- trunk/pywikipedia/basic.py 2010-09-22 04:53:21 UTC (rev 8588) +++ trunk/pywikipedia/basic.py 2010-09-22 05:07:29 UTC (rev 8589) @@ -86,7 +86,7 @@ text = 'Test ' + text if not self.save(text, page, self.summary): - pywikibot.output(u'Page %s not saved.' % page.aslink()) + pywikibot.output(u'Page %s not saved.' % page.title(asLink=True)) def load(self, page): """ @@ -97,10 +97,10 @@ text = page.get() except pywikibot.NoPage: pywikibot.output(u"Page %s does not exist; skipping." - % page.aslink()) + % page.title(asLink=True)) except pywikibot.IsRedirectPage: pywikibot.output(u"Page %s is a redirect; skipping." - % page.aslink()) + % page.title(asLink=True)) else: return text return None @@ -126,7 +126,7 @@ minorEdit=minorEdit, botflag=botflag) except pywikibot.LockedPage: pywikibot.output(u"Page %s is locked; skipping." - % page.aslink()) + % page.title(asLink=True)) except pywikibot.EditConflict: pywikibot.output( u'Skipping %s because of edit conflict' Modified: trunk/pywikipedia/blockpageschecker.py =================================================================== --- trunk/pywikipedia/blockpageschecker.py 2010-09-22 04:53:21 UTC (rev 8588) +++ trunk/pywikipedia/blockpageschecker.py 2010-09-22 05:07:29 UTC (rev 8589) @@ -269,7 +269,7 @@ # Main Loop preloadingGen = pagegenerators.PreloadingGenerator(generator, pageNumber = 60) for page in preloadingGen: - pagename = page.aslink() + pagename = page.title(asLink=True) pywikibot.output('Loading %s...' % pagename) try: text = page.get() Modified: trunk/pywikipedia/blockreview.py =================================================================== --- trunk/pywikipedia/blockreview.py 2010-09-22 04:53:21 UTC (rev 8588) +++ trunk/pywikipedia/blockreview.py 2010-09-22 05:07:29 UTC (rev 8589) @@ -93,7 +93,7 @@ self.treat(page) else: pywikibot.output(u'Ignoring %s, user namespace required' - % page.aslink()) + % page.title(asLink=True)) def treat(self, userPage): """ @@ -241,10 +241,10 @@ text = page.get() except pywikibot.NoPage: pywikibot.output(u"Page %s does not exist; skipping." - % page.aslink()) + % page.title(asLink=True)) except pywikibot.IsRedirectPage: pywikibot.output(u"Page %s is a redirect; skipping." - % page.aslink()) + % page.title(asLink=True)) else: return text return None @@ -259,14 +259,17 @@ pywikibot.showDiff(page.get(), text) pywikibot.output(u'Comment: %s' %comment) if not self.dry: - choice = pywikibot.inputChoice(u'Do you want to accept these changes?', ['Yes', 'No'], ['y', 'N'], 'N') + choice = pywikibot.inputChoice( + u'Do you want to accept these changes?', + ['Yes', 'No'], ['y', 'N'], 'N') if choice == 'y': try: # Save the page - page.put(text, comment=comment, minorEdit=minorEdit, botflag=botflag) + page.put(text, comment=comment, minorEdit=minorEdit, + botflag=botflag) except pywikibot.LockedPage: pywikibot.output(u"Page %s is locked; skipping." - % page.aslink()) + % page.title(asLink=True)) except pywikibot.EditConflict: pywikibot.output( u'Skipping %s because of edit conflict' Modified: trunk/pywikipedia/capitalize_redirects.py =================================================================== --- trunk/pywikipedia/capitalize_redirects.py 2010-09-22 04:53:21 UTC (rev 8588) +++ trunk/pywikipedia/capitalize_redirects.py 2010-09-22 05:07:29 UTC (rev 8589) @@ -77,7 +77,7 @@ page_cap = pywikibot.Page(self.site, page_t.capitalize()) if page_cap.exists(): pywikibot.output(u'%s already exists, skipping...\n' - % page_cap.aslink()) + % page_cap.title(asLink=True)) else: pywikibot.output(u'[[%s]] doesn\'t exist' % page_cap.title()) if not self.acceptall: Modified: trunk/pywikipedia/fixing_redirects.py =================================================================== --- trunk/pywikipedia/fixing_redirects.py 2010-09-22 04:53:21 UTC (rev 8588) +++ trunk/pywikipedia/fixing_redirects.py 2010-09-22 05:07:29 UTC (rev 8589) @@ -166,10 +166,12 @@ try: text = page.get() except pywikibot.IsRedirectPage: - pywikibot.output(u'%s is a redirect page. Skipping' % page.aslink()) + pywikibot.output(u'%s is a redirect page. Skipping' + % page.title(asLink=True)) return except pywikibot.NoPage: - pywikibot.output(u'%s does not exist. Skipping' % page.aslink()) + pywikibot.output(u'%s does not exist. Skipping' + % page.title(asLink=True)) return pywikibot.output(u"\n\n>>> \03{lightpurple}%s\03{default} <<<" % page.title()) @@ -192,7 +194,8 @@ try: page.put(text, comment) except (pywikibot.Error): - pywikibot.output('Error: unable to put %s' % page.aslink()) + pywikibot.output('Error: unable to put %s' + % page.title(asLink=True)) def main(): featured = False Modified: trunk/pywikipedia/pagegenerators.py =================================================================== --- trunk/pywikipedia/pagegenerators.py 2010-09-22 04:53:21 UTC (rev 8588) +++ trunk/pywikipedia/pagegenerators.py 2010-09-22 05:07:29 UTC (rev 8589) @@ -1087,7 +1087,7 @@ site = pywikibot.getSite() fd = date.FormatDate(site) firstPage = pywikibot.Page(site, fd(startMonth, 1)) - pywikibot.output(u"Starting with %s" % firstPage.aslink()) + pywikibot.output(u"Starting with %s" % firstPage.title(asLink=True)) for month in xrange(startMonth, endMonth+1): for day in xrange(1, date.getNumberOfDaysInMonth(month)+1): yield pywikibot.Page(site, fd(month, day)) Modified: trunk/pywikipedia/replace.py =================================================================== --- trunk/pywikipedia/replace.py 2010-09-22 04:53:21 UTC (rev 8588) +++ trunk/pywikipedia/replace.py 2010-09-22 05:07:29 UTC (rev 8589) @@ -364,29 +364,29 @@ if self.isTitleExcepted(page.title()): pywikibot.output( u'Skipping %s because the title is on the exceptions list.' - % page.aslink()) + % page.title(asLink=True)) continue try: # Load the page's text from the wiki original_text = page.get(get_redirect=True) if not page.canBeEdited(): pywikibot.output(u"You can't edit page %s" - % page.aslink()) + % page.title(asLink=True)) continue except pywikibot.NoPage: - pywikibot.output(u'Page %s not found' % page.aslink()) + pywikibot.output(u'Page %s not found' % page.title(asLink=True)) continue new_text = original_text while True: if self.isTextExcepted(new_text): pywikibot.output( u'Skipping %s because it contains text that is on the exceptions list.' - % page.aslink()) + % page.title(asLink=True)) break new_text = self.doReplacements(new_text) if new_text == original_text: pywikibot.output(u'No changes were necessary in %s' - % page.aslink()) + % page.title(asLink=True)) break if self.recursive: newest_text = self.doReplacements(new_text) @@ -711,7 +711,8 @@ pageNumber=20, lookahead=100) else: preloadingGen = pagegenerators.PreloadingGenerator(gen, pageNumber=maxquerysize) - bot = ReplaceRobot(preloadingGen, replacements, exceptions, acceptall, allowoverlap, recursive, add_cat, sleep, editSummary) + bot = ReplaceRobot(preloadingGen, replacements, exceptions, acceptall, + allowoverlap, recursive, add_cat, sleep, editSummary) bot.run() Modified: trunk/pywikipedia/welcome.py =================================================================== --- trunk/pywikipedia/welcome.py 2010-09-22 04:53:21 UTC (rev 8588) +++ trunk/pywikipedia/welcome.py 2010-09-22 05:07:29 UTC (rev 8589) @@ -177,21 +177,20 @@ # # Distributed under the terms of the MIT license. # +__version__ = '$Id$' # -__version__ = '$Id$' - - -import wikipedia, config, query, userlib import time, re, urllib, locale import codecs from datetime import timedelta from random import choice from string import capitalize +import wikipedia as pywikibot +import config, query, userlib locale.setlocale(locale.LC_ALL, '') -# Script users the class wikipedia.translate() to find the right +# Script users the class pywikibot.translate() to find the right # page/user/summary/etc so the need to specify language and project have # been eliminated. # FIXME: Not all language/project combinations have been defined yet. @@ -446,7 +445,7 @@ ############################################################################ ############################################################################ -class FilenameNotSet(wikipedia.Error): +class FilenameNotSet(pywikibot.Error): """An exception indicating that a signature filename was not specifed.""" class Global(object): @@ -477,7 +476,7 @@ def __init__(self): #Initial - self.site = wikipedia.getSite() + self.site = pywikibot.getSite() self.bname = dict() self._totallyCount = 0 @@ -527,33 +526,33 @@ ] #blacklist from wikipage - badword_page = wikipedia.Page(self.site, wikipedia.translate(self.site, bad_pag) ) + badword_page = pywikibot.Page(self.site, pywikibot.translate(self.site, bad_pag) ) list_loaded = list() if badword_page.exists(): - wikipedia.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) - wikipedia.output(u'The bad word page doesn\'t exist!') + pywikibot.output(u'The bad word page doesn\'t exist!') self._blacklist = elenco + elenco_others + list_loaded del elenco, elenco_others, list_loaded if not hasattr(self, '_whitelist') or force: #initialize whitelist whitelist_default = ['emiliano'] - wtlpg = wikipedia.translate(self.site, whitelist_pg) + wtlpg = pywikibot.translate(self.site, whitelist_pg) list_white = list() if wtlpg: - whitelist_page = wikipedia.Page(self.site, wtlpg) + whitelist_page = pywikibot.Page(self.site, wtlpg) if whitelist_page.exists(): - wikipedia.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) - wikipedia.output(u"The whitelist's page doesn't exist!") + pywikibot.output(u"The whitelist's page doesn't exist!") else: showStatus(4) - wikipedia.output(u"WARNING: The whitelist hasn't been setted!") + pywikibot.output(u"WARNING: The whitelist hasn't been setted!") # Join the whitelist words. self._whitelist = list_white + whitelist_default @@ -581,7 +580,7 @@ #Queue process if name: if globalvar.confirm: - answer = wikipedia.inputChoice(u'%s may have an unwanted username, do you want to report this user?' + 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') if answer in ['a', 'all']: answer = 'y' @@ -591,7 +590,7 @@ if answer.lower() in ['yes', 'y'] or not globalvar.confirm: showStatus() - wikipedia.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: @@ -600,8 +599,8 @@ if len(self._BAQueue) >= globalvar.dumpToLog or final: rep_text = '' #name in queue is max, put detail to report page - wikipedia.output("Updating badname accounts to report page...") - rep_page = wikipedia.Page(self.site, wikipedia.translate(self.site, report_page) ) + pywikibot.output("Updating badname accounts to report page...") + rep_page = pywikibot.Page(self.site, pywikibot.translate(self.site, report_page) ) if rep_page.exists(): text_get = rep_page.get() else: @@ -609,22 +608,22 @@ pos = 0 # The talk page includes "_" between the two names, in this way i replace them to " ". for usrna in self._BAQueue: - username = wikipedia.url2link(usrna, self.site, self.site) + username = pywikibot.url2link(usrna, self.site, self.site) n = re.compile(re.escape(username), re.UNICODE) y = n.search(text_get, pos) if y: - wikipedia.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 += wikipedia.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 = wikipedia.translate(self.site, comment) + com = pywikibot.translate(self.site, comment) if rep_text != '': rep_page.put(text_get + rep_text, comment = com, minorEdit = True) showStatus(5) - wikipedia.output(u'Reported') + pywikibot.output(u'Reported') self.BAQueue = list() else: return True @@ -636,7 +635,7 @@ return None text = u'' - logg = wikipedia.translate(self.site, logbook) + logg = pywikibot.translate(self.site, logbook) if not logg: return None @@ -644,28 +643,28 @@ if self.site.lang == 'it': target = logg + '/' + time.strftime('%d/%m/%Y', time.localtime(time.time())) - logPage = wikipedia.Page(self.site, target) + logPage = pywikibot.Page(self.site, target) if logPage.exists(): text = logPage.get() else: #make new log page showStatus() - wikipedia.output('Log page is not exist, getting information for page creation') - text = wikipedia.translate(self.site, logpage_header) + 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')) for result in queue: # Adding the log... (don't take care of the variable's name...). - luser = wikipedia.url2link(result.name(), self.site, self.site) + luser = pywikibot.url2link(result.name(), self.site, self.site) text += u'\n{{WLE|user=%s|contribs=%d}}' % (luser, result.editCount()) #update log page. while True: try: - logPage.put(text, wikipedia.translate(self.site, summary2) ) + logPage.put(text, pywikibot.translate(self.site, summary2) ) return True - except wikipedia.EditConflict: - wikipedia.output(u'An edit conflict has occured. Pausing for 10 seconds before continuing.') + except pywikibot.EditConflict: + pywikibot.output(u'An edit conflict has occured. Pausing for 10 seconds before continuing.') time.sleep(10) def parseNewUserLog(self): @@ -687,7 +686,7 @@ starttime = globalvar.offset count_auto = 0 - wikipedia.output("Querying new user log from API....") + pywikibot.output("Querying new user log from API....") for x in self.site.logpages(number = globalvar.queryLimit, mode = 'newusers',start = starttime, dump = True): someone_found = True if 'user' not in x: @@ -698,7 +697,7 @@ if not globalvar.welcomeAuto and x['action'] == 'autocreate': if not globalvar.quick: showStatus(3) - wikipedia.output(u'%s has been created automatically.' % x['user']) + pywikibot.output(u'%s has been created automatically.' % x['user']) count_auto += 1 continue @@ -707,12 +706,12 @@ if someone_found: if globalvar.quick and count_auto > 0: showStatus() - wikipedia.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) - wikipedia.output(u'There is nobody left to be welcomed...') + pywikibot.output(u'There is nobody left to be welcomed...') else: - wikipedia.output(u'\nLoaded all users...') + pywikibot.output(u'\nLoaded all users...') def _parseNewUserLogOld(self): someone_found = False @@ -722,7 +721,7 @@ globalvar.offset = int(now.strftime("%Y%m%d%H%M%S")) if globalvar.offset != 0: URL += "&offset=%d" % globalvar.offset - wikipedia.output("Getting new user log from Special:Log/newusers....") + pywikibot.output("Getting new user log from Special:Log/newusers....") raw = self.site.getUrl(URL) # I search with a regex how many user have not the talk page @@ -740,7 +739,7 @@ #skip autocreated users (SUL) if not globalvar.welcomeAuto and self.site.mediawiki_message('newuserlog-autocreate-entry') in x.group('reason'): showStatus(3) - wikipedia.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 @@ -750,9 +749,9 @@ if someone_found: showStatus(5) - wikipedia.output(u'There is nobody left to be welcomed...') + pywikibot.output(u'There is nobody left to be welcomed...') else: - wikipedia.output(u'\nLoaded all users...') + pywikibot.output(u'\nLoaded all users...') def defineSign(self, force = False): if hasattr(self,'_randomSignature') and not force: @@ -761,29 +760,29 @@ signText = u'' creg = re.compile(r"^\* ?(.*?)$", re.M) if not globalvar.signFileName: - signPageName = wikipedia.translate(self.site, random_sign) + signPageName = pywikibot.translate(self.site, random_sign) if not signPageName: showStatus(4) - wikipedia.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 - signPage = wikipedia.Page(self.site, signPageName ) + signPage = pywikibot.Page(self.site, signPageName ) if signPage.exists(): - wikipedia.output('Loading signature list...') + pywikibot.output('Loading signature list...') signText = signPage.get() else: - wikipedia.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(wikipedia.config.datafilepath(globalvar.signFileName), 'r', + f = codecs.open(pywikibot.config.datafilepath(globalvar.signFileName), 'r', encoding=config.console_encoding) except LookupError: - f = codecs.open(wikipedia.config.datafilepath(globalvar.signFileName), 'r', + f = codecs.open(pywikibot.config.datafilepath(globalvar.signFileName), 'r', encoding='utf-8') except IOError: - wikipedia.output(u'Error! - No fileName!') + pywikibot.output(u'Error! - No fileName!') raise FilenameNotSet("No signature filename specified.") signText = f.read() @@ -807,31 +806,31 @@ for users in us: if users.isBlocked(): showStatus(3) - wikipedia.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) - wikipedia.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) - wikipedia.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) - wikipedia.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) - wikipedia.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()): self.reportBadAccount(users.name()) continue - welcome_text = wikipedia.translate(self.site, netext) + welcome_text = pywikibot.translate(self.site, netext) if globalvar.randomSign: if self.site.family != 'wikinews': welcome_text = welcome_text % choice(self.defineSign()) @@ -842,26 +841,26 @@ 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 += wikipedia.translate(self.site, final_new_text_additions) - welcome_comment = wikipedia.translate(self.site, summary) + welcome_text += pywikibot.translate(self.site, final_new_text_additions) + welcome_comment = pywikibot.translate(self.site, summary) try: #append welcomed, welcome_count++ ustp.put(welcome_text, welcome_comment, minorEdit=False) welcomed_count += 1 self._totallyCount += 1 self.welcomed_users.append(users) - except wikipedia.EditConflict: + except pywikibot.EditConflict: showStatus(4) - wikipedia.output(u'An edit conflict has occured, skipping this user.') + pywikibot.output(u'An edit conflict has occured, skipping this user.') - if globalvar.makeWelcomeLog and wikipedia.translate(self.site, logbook): + if globalvar.makeWelcomeLog and pywikibot.translate(self.site, logbook): showStatus(5) if welcomed_count == 1: - wikipedia.output(u'One user has been welcomed.') + pywikibot.output(u'One user has been welcomed.') elif welcomed_count == 0: - wikipedia.output(u'No users have been welcomed.') + pywikibot.output(u'No users have been welcomed.') else: - wikipedia.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() @@ -873,18 +872,18 @@ if users.editCount() == 0: if not globalvar.quiet: showStatus(1) - wikipedia.output(u'%s has no contributions.' % users.name() ) + pywikibot.output(u'%s has no contributions.' % users.name() ) else: showStatus(1) - wikipedia.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 wikipedia.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: - wikipedia.output(u'Putting the log of the latest user...') + pywikibot.output(u'Putting the log of the latest user...') else: - wikipedia.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: @@ -892,7 +891,7 @@ self.welcomed_users = list() if hasattr(self, '_BAQueue'): showStatus() - wikipedia.output("Putting bad name to report page....") + pywikibot.output("Putting bad name to report page....") self.reportBadAccount(None, final = True) try: if globalvar.recursive: @@ -901,13 +900,13 @@ 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())) - wikipedia.output(u'Sleeping %d seconds before rerun. %s' % (globalvar.timeRecur, strfstr)) + pywikibot.output(u'Sleeping %d seconds before rerun. %s' % (globalvar.timeRecur, strfstr)) time.sleep(globalvar.timeRecur) else: raise KeyboardInterrupt except KeyboardInterrupt: #if globalvar.makeWelcomeLog and len(self.welcomed_users) > 0: - # wikipedia.output("Update log before qutting script.") + # pywikibot.output("Update log before qutting script.") # self.makelogpage(self.welcomed_users) #if hasattr(self, '_BAQueue') and len(self._BAQueue) > 0 and globalvar.filtBadName: # self.reportBadAccount(None, final = True) @@ -939,14 +938,14 @@ 4:'Warning', 5:'Done ', } - wikipedia.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.""" page = re.compile(r"(?:\"|\')(.*?)(?:\"|\')(?:, |\))", re.UNICODE) list_loaded = page.findall(raw) if len(list_loaded) == 0: - wikipedia.output(u'There was no input on the real-time page.') + pywikibot.output(u'There was no input on the real-time page.') return list_loaded globalvar = Global() @@ -954,25 +953,25 @@ if __name__ == "__main__": try: number_user = 0 - for arg in wikipedia.handleArgs(): + for arg in pywikibot.handleArgs(): if arg.startswith('-edit'): if len(arg) == 5: - globalvar.attachEditCount = int(wikipedia.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(wikipedia.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(wikipedia.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(wikipedia.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: @@ -981,12 +980,12 @@ elif arg.startswith('-file:'): globalvar.randomSign = True if len(arg) == 6: - globalvar.signFileName = wikipedia.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 = wikipedia.input(u'Which signature to use?') + globalvar.defaultSign = pywikibot.input(u'Which signature to use?') else: globalvar.defaultSign = arg[6:] globalvar.defaultSign += timeselected @@ -1006,12 +1005,12 @@ globalvar.welcomeAuto = True elif arg.startswith('-limit'): if len(arg) == 6: - globalvar.queryLimit = int(wikipedia.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(wikipedia.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': @@ -1021,9 +1020,9 @@ # Filename and pywikipedia path # file where is stored the random signature index - filename = wikipedia.config.datafilepath('welcome-%s-%s.data' % (wikipedia.default_family, wikipedia.default_code)) + filename = pywikibot.config.datafilepath('welcome-%s-%s.data' % (pywikibot.default_family, pywikibot.default_code)) if globalvar.offset and globalvar.timeoffset: - wikipedia.output('WARING: both -offset and -timeoffset were provided, ignoring -offset') + pywikibot.output('WARING: both -offset and -timeoffset were provided, ignoring -offset') globalvar.offset = 0 bot = WelcomeBot() try: @@ -1031,9 +1030,9 @@ except KeyboardInterrupt: if bot.welcomed_users: showStatus() - wikipedia.output("Put welcomed users before quit...") + pywikibot.output("Put welcomed users before quit...") bot.makelogpage(bot.welcomed_users) - wikipedia.output("\nQuitting...") + 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: @@ -1041,4 +1040,4 @@ f = file(filename, 'w') cPickle.dump(bot.welcomed_users, f) f.close() - wikipedia.stopme() + pywikibot.stopme() Modified: trunk/pywikipedia/xmlreader.py =================================================================== --- trunk/pywikipedia/xmlreader.py 2010-09-22 04:53:21 UTC (rev 8588) +++ trunk/pywikipedia/xmlreader.py 2010-09-22 05:07:29 UTC (rev 8589) @@ -26,7 +26,7 @@ import threading import xml.sax import codecs, re -import wikipedia +import wikipedia as pywikibot try: from xml.etree.cElementTree import iterparse @@ -282,7 +282,7 @@ """Return a generator that will yield XmlEntry objects""" print 'Reading XML dump...' if not 'iterparse' in globals(): - wikipedia.output( + pywikibot.output( u'''WARNING: cElementTree not found. Using slower fallback solution. Consider installing the python-celementtree package.''') return self.regex_parse() @@ -397,7 +397,7 @@ '</revision>\s*'+ '</page>', re.DOTALL) - f = codecs.open(self.filename, 'r', encoding = wikipedia.getSite().encoding(), + f = codecs.open(self.filename, 'r', encoding = pywikibot.getSite().encoding(), errors='replace') eof = False lines = u''

1 0

SVN: [8588] trunk/pywikipedia/userlib.py
by xqt＠svn.wikimedia.org 22 Sep '10

22 Sep '10

Revision: 8588 Author: xqt Date: 2010-09-22 04:53:21 +0000 (Wed, 22 Sep 2010) Log Message: ----------- Fix for ascii encoding error for User.__str__() reported by DrTrigon Modified Paths: -------------- trunk/pywikipedia/userlib.py Modified: trunk/pywikipedia/userlib.py =================================================================== --- trunk/pywikipedia/userlib.py 2010-09-21 16:47:03 UTC (rev 8587) +++ trunk/pywikipedia/userlib.py 2010-09-22 04:53:21 UTC (rev 8588) @@ -11,7 +11,7 @@ import re import wikipedia as pywikibot -import query +import query, config class AutoblockUser(pywikibot.Error): """ @@ -85,7 +85,9 @@ return ip_regexp.match(self.username) is not None def __str__(self): - return u'%s:%s' % (self.site() , self.name()) + return (u'%s:%s' + % (self.site(), self.name())).encode(config.console_encoding, + 'replace') def __repr__(self): return self.__str__()

1 0

SVN: [8587] trunk/pywikipedia/redirect.py
by xqt＠svn.wikimedia.org 22 Sep '10

22 Sep '10

Revision: 8587 Author: xqt Date: 2010-09-21 16:47:03 +0000 (Tue, 21 Sep 2010) Log Message: ----------- broken redirect is not included ''Deletion policy'' and/or ''Criteria for speedy deletion'' in Japanese Wikipedia. feature request bug #3072733 Modified Paths: -------------- trunk/pywikipedia/redirect.py Modified: trunk/pywikipedia/redirect.py =================================================================== --- trunk/pywikipedia/redirect.py 2010-09-21 04:56:05 UTC (rev 8586) +++ trunk/pywikipedia/redirect.py 2010-09-21 16:47:03 UTC (rev 8587) @@ -183,7 +183,7 @@ 'ga': u'{{scrios|Athsheoladh briste}}', 'hu': u'{{azonnali|Hibás átirányítás|~~~~}}', 'it': u'{{Cancella subito|9}}', - 'ja': u'{{即時削除|壊れたリダイレクト}}', +## 'ja': u'{{即時削除|壊れたリダイレクト}}', ## tracker no 3072733 'ksh':u'{{Schmieß fott}}Di Ömlëijdong jeiht noh nörjendwoh hen. --~~~~~\n\n', 'nds':u'{{delete}}Kaputte Wiederleiden, wat nich brukt ward. --~~~~\n\n', 'pdc':u'{{lesche|Kaputte Weiderleiding --~~~~}}',

1 0

SVN: [8586] trunk/pywikipedia/noreferences.py
by xqt＠svn.wikimedia.org 21 Sep '10

21 Sep '10

Revision: 8586 Author: xqt Date: 2010-09-21 04:56:05 +0000 (Tue, 21 Sep 2010) Log Message: ----------- sort order of referencesTemplate Modified Paths: -------------- trunk/pywikipedia/noreferences.py Modified: trunk/pywikipedia/noreferences.py =================================================================== --- trunk/pywikipedia/noreferences.py 2010-09-20 16:34:04 UTC (rev 8585) +++ trunk/pywikipedia/noreferences.py 2010-09-21 04:56:05 UTC (rev 8586) @@ -317,9 +317,6 @@ 'en': [u'Reflist', u'Refs', u'FootnotesSmall', u'Reference', u'Ref-list', u'Reference list', u'References-small', u'Reflink', u'Footnotes', u'FootnotesSmall'], - 'ru': [u'Reflist', u'Ref-list', u'Refs', u'Sources', - u'Примечания', u'Список примечаний', - u'Сноска', u'Сноски'], 'eo': [u'Referencoj'], 'es': ['Listaref', 'Reflist', 'muchasref'], 'fa': [u'Reflist', u'Refs', u'FootnotesSmall', u'Reference', @@ -338,6 +335,9 @@ u'Noot', u'FootnotesSmall'], 'pl': [u'przypisy', u'Przypisy'], 'pt': [u'Notas', u'ref-section', u'Referências', u'Reflist'], + 'ru': [u'Reflist', u'Ref-list', u'Refs', u'Sources', + u'Примечания', u'Список примечаний', + u'Сноска', u'Сноски'], 'zh': [u'Reflist'], }, }

1 0

SVN: [8585] branches/rewrite/pywikibot/page.py
by russblau＠svn.wikimedia.org 21 Sep '10

21 Sep '10

Revision: 8585 Author: russblau Date: 2010-09-20 16:34:04 +0000 (Mon, 20 Sep 2010) Log Message: ----------- improve parsing of interwiki prefixes that point to the source wiki family Modified Paths: -------------- branches/rewrite/pywikibot/page.py Modified: branches/rewrite/pywikibot/page.py =================================================================== --- branches/rewrite/pywikibot/page.py 2010-09-20 07:10:00 UTC (rev 8584) +++ branches/rewrite/pywikibot/page.py 2010-09-20 16:34:04 UTC (rev 8585) @@ -2191,6 +2191,11 @@ return (fam.name, prefix) known = fam.get_known_families(site=self._source) if prefix in known: + if known[prefix] == fam.name: + # interwiki prefix links back to source family + t = t[t.index(u":")+1: ].lstrip(u" ") + # strip off the prefix and retry + continue # prefix is a different wiki family return (known[prefix], code) break

1 0

SVN: [8584] branches/rewrite/scripts/redirect.py
by xqt＠svn.wikimedia.org 20 Sep '10

20 Sep '10

Revision: 8584 Author: xqt Date: 2010-09-20 07:10:00 +0000 (Mon, 20 Sep 2010) Log Message: ----------- update from trunk r8583 Modified Paths: -------------- branches/rewrite/scripts/redirect.py Modified: branches/rewrite/scripts/redirect.py =================================================================== --- branches/rewrite/scripts/redirect.py 2010-09-20 07:05:21 UTC (rev 8583) +++ branches/rewrite/scripts/redirect.py 2010-09-20 07:10:00 UTC (rev 8584) @@ -178,7 +178,7 @@ 'ja': u'{{即時削除|壊れたリダイレクト}}', 'ksh':u'{{Schmieß fott}}Di Ömlëijdong jeiht noh nörjendwoh hen. --~~~~~\n\n', 'nds':u'{{delete}}Kaputte Wiederleiden, wat nich brukt ward. --~~~~\n\n', - 'pdc':u'{{lösche|Defekte Weiterleitung --~~~~}}', + 'pdc':u'{{lesche|Kaputte Weiderleiding --~~~~}}', 'ru': u'{{db-redirnone}}', 'war':u'{{delete}}Nautod o nagbinalikbalik nga redirek.--~~~~\n\n', 'zh': u'{{delete|R1}}', @@ -622,11 +622,13 @@ pywikibot.output( u' Links to: %s.' % targetPage.title(asLink=True)) - if targetPage.site.sitename() == 'wikipedia:en' \ - and targetPage.title() == 'Target page name': - pywikibot.output( - u"Skipping: Redirect source is vandalized.") - break + if targetPage.site.sitename() == 'wikipedia:en': + mw_msg = targetPage.site.mediawiki_message( + 'Wikieditor-toolbar-tool-redirect-example') + if targetPage.title() == mw_msg: + pywikibot.output( + u"Skipping toolbar example: Redirect source is potentially vandalized.") + break if targetPage.site != self.site: pywikibot.output( u'Warning: redirect target (%s) is on a different site.'

1 0

SVN: [8583] trunk/pywikipedia/redirect.py
by xqt＠svn.wikimedia.org 20 Sep '10

20 Sep '10

Revision: 8583 Author: xqt Date: 2010-09-20 07:05:21 +0000 (Mon, 20 Sep 2010) Log Message: ----------- use MediaWiki message instead of hard coding string for redirect target sample Modified Paths: -------------- trunk/pywikipedia/redirect.py Modified: trunk/pywikipedia/redirect.py =================================================================== --- trunk/pywikipedia/redirect.py 2010-09-19 20:53:14 UTC (rev 8582) +++ trunk/pywikipedia/redirect.py 2010-09-20 07:05:21 UTC (rev 8583) @@ -186,7 +186,7 @@ 'ja': u'{{即時削除|壊れたリダイレクト}}', 'ksh':u'{{Schmieß fott}}Di Ömlëijdong jeiht noh nörjendwoh hen. --~~~~~\n\n', 'nds':u'{{delete}}Kaputte Wiederleiden, wat nich brukt ward. --~~~~\n\n', - 'pdc':u'{{lösche|Defekte Weiterleitung --~~~~}}', + 'pdc':u'{{lesche|Kaputte Weiderleiding --~~~~}}', 'ru': u'{{db-redirnone}}', 'war':u'{{delete}}Nautod o nagbinalikbalik nga redirek.--~~~~\n\n', 'zh': u'{{delete|R1}}', @@ -710,11 +710,13 @@ pywikibot.output( u' Links to: %s.' % targetPage.title(asLink=True)) - if targetPage.site().sitename() == 'wikipedia:en' \ - and targetPage.title() == 'Target page name': - pywikibot.output( - u"Skipping: Redirect source is vandalized.") - break + if targetPage.site().sitename() == 'wikipedia:en': + mw_msg = targetPage.site().mediawiki_message( + 'Wikieditor-toolbar-tool-redirect-example') + if targetPage.title() == mw_msg: + pywikibot.output( + u"Skipping toolbar example: Redirect source is potentially vandalized.") + break if targetPage.site() != self.site: pywikibot.output( u'Warning: redirect target (%s) is on a different site.'

1 0

SVN: [8582] trunk/pywikipedia/redirect.py
by xqt＠svn.wikimedia.org 20 Sep '10

20 Sep '10

Revision: 8582 Author: xqt Date: 2010-09-19 20:53:14 +0000 (Sun, 19 Sep 2010) Log Message: ----------- fix for from __future__ import Modified Paths: -------------- trunk/pywikipedia/redirect.py Modified: trunk/pywikipedia/redirect.py =================================================================== --- trunk/pywikipedia/redirect.py 2010-09-19 20:47:22 UTC (rev 8581) +++ trunk/pywikipedia/redirect.py 2010-09-19 20:53:14 UTC (rev 8582) @@ -51,6 +51,7 @@ -always Don't prompt you for each replacement. """ +from __future__ import generators # # (C) Daniel Herding, 2004. # (C) Purodha Blissenbach, 2009. @@ -61,14 +62,12 @@ # __version__='$Id$' # -from __future__ import generators import re, sys, datetime import wikipedia as pywikibot import config import query import xmlreader - # Summary message for fixing double redirects msg_double={ 'als':u'Bötli: Uflösig vun de doppleti Wyterleitig zue %s',

1 0

SVN: [8581] trunk/pywikipedia/wikipedia.py
by xqt＠svn.wikimedia.org 20 Sep '10

20 Sep '10

Revision: 8581 Author: xqt Date: 2010-09-19 20:47:22 +0000 (Sun, 19 Sep 2010) Log Message: ----------- update from rewrite Modified Paths: -------------- trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2010-09-19 20:44:50 UTC (rev 8580) +++ trunk/pywikipedia/wikipedia.py 2010-09-19 20:47:22 UTC (rev 8581) @@ -940,7 +940,7 @@ self.latestRevision()) def latestRevision(self): - """Return the latest revision id for this page.""" + """Return the current revision id for this page.""" if not self._permalink: # When we get the page with getall, the permalink is received # automatically @@ -949,7 +949,31 @@ if hasattr(self, '_getexception'): raise self._getexception return int(self._permalink) + def userName(self): + """Return name or IP address of last user to edit page. + Returns None unless page was retrieved with getAll(). + + """ + return self._userName + + def isIpEdit(self): + """Return True if last editor was unregistered. + + Returns None unless page was retrieved with getAll() or _getEditPage(). + + """ + return self._ipedit + + def editTime(self): + """Return timestamp (in MediaWiki format) of last revision to page. + + Returns None if last edit time is unknown. + + """ + return self._editTime + + def previousRevision(self): """Return the revision id for the previous revision of this Page.""" vh = self.getVersionHistory(revCount=2) @@ -1052,19 +1076,50 @@ def isStaticRedirect(self, force=False): """Return True if this is a redirect containing the magic word - __STATICREDIRECT__, False if not or not existing.""" + __STATICREDIRECT__, False if not or not existing. + + """ + found = False if self.isRedirectPage(): staticKeys = self.site().getmagicwords('staticredirect') text = self.get(get_redirect=True, force=force) if staticKeys: - found = False for key in staticKeys: if key in text: found = True break - if found: return True - return False + return found + def isCategoryRedirect(self, text=None): + """Return True if this is a category redirect page, False otherwise.""" + + if not self.isCategory(): + return False + if not hasattr(self, "_catredirect"): + if not text: + try: + text = self.get(get_redirect=True) + except NoPage: + return False + catredirs = self.site().category_redirects() + for (t, args) in self.templatesWithParams(thistxt=text): + template = Page(self.site(), t, defaultNamespace=10 + ).titleWithoutNamespace() # normalize title + if template in catredirs: + # Get target (first template argument) + self._catredirect = self.site().namespace(14) + ":" + args[0] + break + else: + self._catredirect = False + return bool(self._catredirect) + + def getCategoryRedirectTarget(self): + """If this is a category redirect, return the target category title.""" + if self.isCategoryRedirect(): + import catlib + return catlib.Category(self.site(), self._catredirect) + raise IsNotRedirectPage + def isEmpty(self): """Return True if the page text has less than 4 characters. @@ -1085,6 +1140,94 @@ ns = self.namespace() return ns >= 0 and ns % 2 == 1 + def toggleTalkPage(self): + """Return other member of the article-talk page pair for this Page. + + If self is a talk page, returns the associated content page; + otherwise, returns the associated talk page. + Returns None if self is a special page. + + """ + ns = self.namespace() + if ns < 0: # Special page + return None + if self.isTalkPage(): + ns -= 1 + else: + ns += 1 + + if ns == 6: + return ImagePage(self.site(), self.titleWithoutNamespace()) + + return Page(self.site(), self.titleWithoutNamespace(), defaultNamespace=ns) + + def isCategory(self): + """Return True if the page is a Category, False otherwise.""" + return self.namespace() == 14 + + def isImage(self): + """Return True if this is an image description page, False otherwise.""" + return self.namespace() == 6 + + def isDisambig(self): + """Return True if this is a disambiguation page, False otherwise. + + Relies on the presence of specific templates, identified in + the Family file or on a wiki page, to identify disambiguation + pages. + + By default, loads a list of template names from the Family file; + if the value in the Family file is None, looks for the list on + [[MediaWiki:Disambiguationspage]]. + + """ + if not hasattr(self, "_isDisambig"): + if not hasattr(self._site, "_disambigtemplates"): + distl = self._site.family.disambig(self._site.lang) + if distl is None: + try: + disambigpages = Page(self._site, + "MediaWiki:Disambiguationspage") + self._site._disambigtemplates = set( + link.titleWithoutNamespace() + for link in disambigpages.linkedPages() + if link.namespace() == 10 + ) + except NoPage: + self._site._disambigtemplates = set(['Disambig']) + else: + # Normalize template capitalization + self._site._disambigtemplates = set( + t[:1].upper() + t[1:] for t in distl + ) + disambigInPage = self._site._disambigtemplates.intersection(self.templates()) + self._isDisambig = self.namespace() != 10 and len(disambigInPage) > 0 + return self._isDisambig + + def canBeEdited(self): + """Return bool indicating whether this page can be edited. + + This returns True if and only if: + - page is unprotected, and bot has an account for this site, or + - page is protected, and bot has a sysop account for this site. + + """ + try: + self.get() + except: + pass + if self.editRestriction == 'sysop': + userdict = config.sysopnames + else: + userdict = config.usernames + try: + userdict[self.site().family.name][self.site().lang] + return True + except: + # We don't have a user account for that wiki, or the + # page is locked and we don't have a sysop account. + return False + def botMayEdit(self, username): """Return True if this page allows bots to edit it. @@ -1118,14 +1261,14 @@ if len(template[1]) == 0: return True else: - (type, bots) = template[1][0].split('=', 1) + (ttype, bots) = template[1][0].split('=', 1) bots = bots.split(',') - if type == 'allow': + if ttype == 'allow': if 'all' in bots or username in bots: return True else: return False - if type == 'deny': + if ttype == 'deny': if 'all' in bots or username in bots: return False else: @@ -1133,30 +1276,6 @@ # no restricting template found return True - def userName(self): - """Return name or IP address of last user to edit page. - - Returns None unless page was retrieved with getAll(). - - """ - return self._userName - - def isIpEdit(self): - """Return True if last editor was unregistered. - - Returns None unless page was retrieved with getAll() or _getEditPage(). - - """ - return self._ipedit - - def editTime(self): - """Return timestamp (in MediaWiki format) of last revision to page. - - Returns None if last edit time is unknown. - - """ - return self._editTime - def namespace(self): """Return the number of the namespace of the page. @@ -1166,79 +1285,6 @@ """ return self._namespace - def isCategory(self): - """Return True if the page is a Category, False otherwise.""" - return self.namespace() == 14 - - def isImage(self): - """Return True if this is an image description page, False otherwise.""" - return self.namespace() == 6 - - def isCategoryRedirect(self, text=None): - """Return True if this is a category redirect page, False otherwise.""" - - if not self.isCategory(): - return False - if not hasattr(self, "_catredirect"): - if not text: - try: - text = self.get(get_redirect=True) - except NoPage: - return False - catredirs = self.site().category_redirects() - for (t, args) in self.templatesWithParams(thistxt=text): - template = Page(self.site(), t, defaultNamespace=10 - ).titleWithoutNamespace() # normalize title - if template in catredirs: - # Get target (first template argument) - self._catredirect = self.site().namespace(14) + ":" + args[0] - break - else: - self._catredirect = False - return bool(self._catredirect) - - def getCategoryRedirectTarget(self): - """If this is a category redirect, return the target category title.""" - if self.isCategoryRedirect(): - import catlib - return catlib.Category(self.site(), self._catredirect) - raise IsNotRedirectPage - - def isDisambig(self): - """Return True if this is a disambiguation page, False otherwise. - - Relies on the presence of specific templates, identified in - the Family file or on a wiki page, to identify disambiguation - pages. - - By default, loads a list of template names from the Family file; - if the value in the Family file is None, looks for the list on - [[MediaWiki:Disambiguationspage]]. - - """ - if not hasattr(self, "_isDisambig"): - if not hasattr(self._site, "_disambigtemplates"): - distl = self._site.family.disambig(self._site.lang) - if distl is None: - try: - disambigpages = Page(self._site, - "MediaWiki:Disambiguationspage") - self._site._disambigtemplates = set( - link.titleWithoutNamespace() - for link in disambigpages.linkedPages() - if link.namespace() == 10 - ) - except NoPage: - self._site._disambigtemplates = set(['Disambig']) - else: - # Normalize template capitalization - self._site._disambigtemplates = set( - t[:1].upper() + t[1:] for t in distl - ) - disambigInPage = self._site._disambigtemplates.intersection(self.templates()) - self._isDisambig = self.namespace() != 10 and len(disambigInPage) > 0 - return self._isDisambig - def getReferences(self, follow_redirects=True, withTemplateInclusion=True, onlyTemplateInclusion=False, redirectsOnly=False, internal = False): """Yield all pages that link to the page by API @@ -2138,29 +2184,6 @@ return response.code, response.msg, data - def canBeEdited(self): - """Return bool indicating whether this page can be edited. - - This returns True if and only if: - * page is unprotected, and bot has an account for this site, or - * page is protected, and bot has a sysop account for this site. - """ - try: - self.get() - except: - pass - if self.editRestriction == 'sysop': - userdict = config.sysopnames - else: - userdict = config.usernames - try: - userdict[self.site().family.name][self.site().lang] - return True - except: - # We don't have a user account for that wiki, or the - # page is locked and we don't have a sysop account. - return False - def protection(self): """Return list of dicts of this page protection level. like: [{u'expiry': u'2010-05-26T14:41:51Z', u'type': u'edit', u'level': u'autoconfirmed'}, {u'expiry': u'2010-05-26T14:41:51Z', u'type': u'move', u'level': u'sysop'}] @@ -2179,28 +2202,6 @@ data=datas['query']['pages'].values()[0]['protection'] return data - - def toggleTalkPage(self): - """Return the other member of the article-talk page pair for this Page. - - If self is a talk page, returns the associated content page; otherwise, - returns the associated talk page. - Returns None if self is a special page. - - """ - ns = self.namespace() - if ns < 0: # Special page - return None - if self.isTalkPage(): - ns -= 1 - else: - ns += 1 - - if ns == 6: - return ImagePage(self.site(), self.titleWithoutNamespace()) - - return Page(self.site(), self.titleWithoutNamespace(), defaultNamespace=ns) - def interwiki(self): """Return a list of interwiki links in the page text.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

Pywikipedia-svn September 2010