http://www.mediawiki.org/wiki/Special:Code/pywikipedia/10647
Revision: 10647
Author: russblau
Date: 2012-11-01 20:25:15 +0000 (Thu, 01 Nov 2012)
Log Message:
-----------
Fix for bug 3569058: total-parameter for Page.getVersionHistory is incorrect
This is a hack that resolves the issue for this particular method call, but the underlying problem is in pywikibot.data.api.PropertyGenerator; it counts the number of pages received from the server, not the number of revisions. This underlying bug has not yet been fixed.
Modified Paths:
--------------
branches/rewrite/pywikibot/site.py
Modified: branches/rewrite/pywikibot/site.py
===================================================================
--- branches/rewrite/pywikibot/site.py 2012-11-01 16:26:54 UTC (rev 10646)
+++ branches/rewrite/pywikibot/site.py 2012-11-01 20:25:15 UTC (rev 10647)
@@ -1687,6 +1687,7 @@
else:
page = Page(self, pagedata['title'])
api.update_page(page, pagedata)
+ break
def pageinterwiki(self, page):
# No such function in the API (this method isn't called anywhere)
http://www.mediawiki.org/wiki/Special:Code/pywikipedia/10645
Revision: 10645
Author: xqt
Date: 2012-11-01 16:17:51 +0000 (Thu, 01 Nov 2012)
Log Message:
-----------
noreferences from trunk r10561
Added Paths:
-----------
branches/rewrite/scripts/noreferences.py
Copied: branches/rewrite/scripts/noreferences.py (from rev 10620, trunk/pywikipedia/noreferences.py)
===================================================================
--- branches/rewrite/scripts/noreferences.py (rev 0)
+++ branches/rewrite/scripts/noreferences.py 2012-11-01 16:17:51 UTC (rev 10645)
@@ -0,0 +1,697 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+"""
+This script goes over multiple pages, searches for pages where <references />
+is missing although a <ref> tag is present, and in that case adds a new
+references section.
+
+These command line parameters can be used to specify which pages to work on:
+
+¶ms;
+
+ -xml Retrieve information from a local XML dump (pages-articles
+ or pages-meta-current, see http://download.wikimedia.org).
+ Argument can also be given as "-xml:filename".
+
+ -namespace:n Number or name of namespace to process. The parameter can be
+ used multiple times. It works in combination with all other
+ parameters, except for the -start parameter. If you e.g.
+ want to iterate over all categories starting at M, use
+ -start:Category:M.
+
+ -always Don't prompt you for each replacement.
+
+All other parameters will be regarded as part of the title of a single page,
+and the bot will only work on that single page.
+
+If neither a page title nor a page generator is given, it takes all pages from
+the default maintenance category.
+
+It is strongly recommended not to run this script over the entire article
+namespace (using the -start) parameter, as that would consume too much
+bandwidth. Instead, use the -xml parameter, or use another way to generate
+a list of affected articles
+"""
+
+__version__='$Id$'
+
+import re, sys
+import pywikibot
+from pywikibot import i18n
+from pywikibot import pagegenerators, catlib
+import editarticle
+
+# This is required for the text that is shown when you run this script
+# with the parameter -help.
+docuReplacements = {
+ '¶ms;': pagegenerators.parameterHelp,
+}
+
+# References sections are usually placed before further reading / external
+# link sections. This dictionary defines these sections, sorted by priority.
+# For example, on an English wiki, the script would place the "References"
+# section in front of the "Further reading" section, if that existed.
+# Otherwise, it would try to put it in front of the "External links" section,
+# or if that fails, the "See also" section, etc.
+placeBeforeSections = {
+ 'ar': [ # no explicit policy on where to put the references
+ u'وصلات خارجية',
+ u'انظر أيضا',
+ u'ملاحظات'
+ ],
+ 'cs': [
+ u'Reference',
+ u'Poznámky',
+ ],
+ 'da': [ # no explicit policy on where to put the references
+ u'Eksterne links'
+ ],
+ 'de': [ # no explicit policy on where to put the references
+ u'Literatur',
+ u'Weblinks',
+ u'Siehe auch',
+ u'Weblink', # bad, but common singular form of Weblinks
+ ],
+ 'dsb':[
+ u'Nožki',
+ ],
+ 'en': [ # no explicit policy on where to put the references
+ u'Further reading',
+ u'External links',
+ u'See also',
+ u'Notes'
+ ],
+ 'ru': [
+ u'Ссылки',
+ u'Литература',
+ ],
+ 'eo': [
+ u'Eksteraj ligiloj',
+ u'Ekstera ligilo',
+ u'Eksteraj ligoj',
+ u'Ekstera ligo',
+ u'Rete'
+ ],
+ 'es': [
+ u'Enlaces externos',
+ u'Véase también',
+ u'Notas',
+ ],
+ 'fa': [
+ u'پیوند به بیرون',
+ u'پانویس',
+ u'جستارهای وابسته'
+ ],
+ 'fi': [
+ u'Kirjallisuutta',
+ u'Aiheesta muualla',
+ u'Ulkoiset linkit',
+ u'Linkkejä',
+ ],
+ 'fr': [
+ u'Liens externes',
+ u'Voir aussi',
+ u'Notes'
+ ],
+ 'hsb':[
+ u'Nóžki',
+ ],
+ 'hu': [
+ u'Külső hivatkozások',
+ u'Lásd még',
+ ],
+ 'it': [
+ u'Bibliografia',
+ u'Voci correlate',
+ u'Altri progetti',
+ u'Collegamenti esterni',
+ u'Vedi anche',
+ ],
+ 'ja':[
+ u'関連項目',
+ u'参考文献',
+ u'外部リンク',
+ ],
+ 'ko':[ # no explicit policy on where to put the references
+ u'외부 링크',
+ u'외부링크',
+ u'바깥 고리',
+ u'바깥고리',
+ u'바깥 링크',
+ u'바깥링크'
+ u'외부 고리',
+ u'외부고리'
+ ],
+ 'lt': [ # no explicit policy on where to put the references
+ u'Nuorodos'
+ ],
+ 'nl': [ # no explicit policy on where to put the references
+ u'Literatuur',
+ u'Zie ook',
+ u'Externe verwijzingen',
+ u'Externe verwijzing',
+ ],
+ 'pdc': [
+ u'Beweisunge',
+ u'Quelle unn Literatur',
+ u'Gwelle',
+ u'Gwuelle',
+ u'Auswenniche Gleecher',
+ u'Gewebbgleecher',
+ u'Guckt mol aa',
+ u'Seh aa',
+ ],
+ 'pl': [
+ u'Źródła',
+ u'Bibliografia',
+ u'Zobacz też',
+ u'Linki zewnętrzne',
+ ],
+ 'pt': [
+ u'Ligações externas',
+ u'Veja também',
+ u'Ver também',
+ u'Notas',
+ ],
+ 'sk': [
+ u'Pozri aj',
+ ],
+ 'szl': [
+ u'Przipisy',
+ u'Připisy',
+ ],
+ 'zh': [
+ u'外部链接',
+ u'外部連结',
+ u'外部連結',
+ u'外部连接',
+ ],
+}
+
+# Titles of sections where a reference tag would fit into.
+# The first title should be the preferred one: It's the one that
+# will be used when a new section has to be created.
+referencesSections = {
+ 'ar': [ # not sure about which ones are preferred.
+ u'مراجع',
+ u'ملاحظات',
+ ],
+ 'da': [
+ u'Noter',
+ ],
+ 'de': [ #see [[de:WP:REF]]
+ u'Einzelnachweise',
+ u'Anmerkungen',
+ u'Belege',
+ u'Endnoten',
+ u'Fußnoten',
+ u'Fuß-/Endnoten',
+ u'Quellen',
+ u'Quellenangaben',
+ ],
+ 'dsb':[
+ u'Nožki',
+ ],
+ 'en': [ # not sure about which ones are preferred.
+ u'References',
+ u'Footnotes',
+ u'Notes',
+ ],
+ 'ru': [
+ u'Примечания',
+ u'Сноски',
+ u'Источники',
+ ],
+ 'eo': [
+ u'Referencoj',
+ ],
+ 'es': [
+ u'Referencias',
+ u'Notas',
+ ],
+ 'fa': [
+ u'منابع',
+ u'منبع'
+ ],
+ 'fi': [
+ u'Lähteet',
+ u'Viitteet',
+ ],
+ 'fr': [ # [[fr:Aide:Note]]
+ u'Notes et références',
+ u'Références',
+ u'References',
+ u'Notes'
+ ],
+ 'he': [
+ u'הערות שוליים',
+ ],
+ 'hsb':[
+ u'Nóžki',
+ ],
+ 'hu': [
+ u'Források és jegyzetek',
+ u'Források',
+ u'Jegyzetek',
+ u'Hivatkozások',
+ u'Megjegyzések',
+ ],
+ 'is': [
+ u'Heimildir',
+ u'Tilvísanir',
+ ],
+ 'it': [
+ u'Note',
+ u'Riferimenti',
+ ],
+ 'ja': [
+ u'脚注',
+ u'脚注欄',
+ u'脚注・出典',
+ u'出典',
+ u'注釈',
+ u'註',
+ ],
+ 'ko': [
+ u'주석',
+ u'각주'
+ u'주석 및 참고 자료'
+ u'주석 및 참고자료',
+ u'주석 및 참고 출처'
+ ],
+ 'lt': [ # not sure about which ones are preferred.
+ u'Šaltiniai',
+ u'Literatūra',
+ ],
+ 'nl': [ # not sure about which ones are preferred.
+ u'Voetnoten',
+ u'Voetnoot',
+ u'Referenties',
+ u'Noten',
+ u'Bronvermelding',
+ ],
+ 'pdc': [
+ u'Aamarrickunge',
+ ],
+ 'pl': [
+ u'Przypisy',
+ u'Uwagi',
+ ],
+ 'pt': [
+ u'Referências',
+ ],
+ 'sk': [
+ u'Referencie',
+ ],
+ 'szl': [
+ u'Przipisy',
+ u'Připisy',
+ ],
+ 'zh': [
+ u'參考資料',
+ u'参考资料',
+ u'參考文獻',
+ u'参考文献',
+ u'資料來源',
+ u'资料来源',
+ ],
+}
+
+# Templates which include a <references /> tag. If there is no such template
+# on your wiki, you don't have to enter anything here.
+referencesTemplates = {
+ 'wikipedia': {
+ 'ar': [u'Reflist', u'ثبت المراجع', u'قائمة المراجع'],
+ 'be': [u'Зноскі', u'Примечания', u'Reflist', u'Спіс заўваг', u'Заўвагі'],
+ 'da': [u'Reflist'],
+ 'dsb':[u'Referency'],
+ 'en': [u'Reflist', u'Refs', u'FootnotesSmall', u'Reference',
+ u'Ref-list', u'Reference list', u'References-small', u'Reflink',
+ u'Footnotes', u'FootnotesSmall'],
+ 'eo': [u'Referencoj'],
+ 'es': ['Listaref', 'Reflist', 'muchasref'],
+ 'fa': [u'Reflist', u'Refs', u'FootnotesSmall', u'Reference',
+ u'پانویس', u'پانویسها ', u'پانویس ۲', u'پانویس۲',u'فهرست منابع'],
+ 'fi': [u'Viitteet', u'Reflist'],
+ 'fr': [u'Références', u'Notes', u'References', u'Reflist'],
+ 'hsb':[u'Referency'],
+ 'hu': [u'reflist', u'források', u'references', u'megjegyzések'],
+ 'is': [u'reflist'],
+ 'it': [u'References'],
+ 'ja': [u'Reflist', u'脚注リスト'],
+ 'ko': [u'주석', u'Reflist'],
+ 'lt': [u'Reflist', u'Ref', u'Litref'],
+ 'nl': [u'Reflist', u'Refs', u'FootnotesSmall', u'Reference',
+ u'Ref-list', u'Reference list', u'References-small', u'Reflink',
+ u'Referenties', u'Bron', u'Bronnen/noten/referenties', u'Bron2',
+ u'Bron3', u'ref', u'references', u'appendix',
+ u'Noot', u'FootnotesSmall'],
+ 'pl': [u'Przypisy', u'Przypisy-lista', u'Uwagi'],
+ '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'Сноски'],
+ 'szl':[u'Przipisy', u'Připisy'],
+ 'zh': [u'Reflist', u'RefFoot', u'NoteFoot'],
+ },
+}
+
+# Text to be added instead of the <references /> tag.
+# Define this only if required by your wiki.
+referencesSubstitute = {
+ 'wikipedia': {
+ 'be': u'{{зноскі}}',
+ 'da': u'{{reflist}}',
+ 'dsb':u'{{referency}}',
+ 'fa': u'{{پانویس}}',
+ 'fi': u'{{viitteet}}',
+ 'hsb':u'{{referency}}',
+ 'hu': u'{{Források}}',
+ 'pl': u'{{Przypisy}}',
+ 'ru': u'{{примечания}}',
+ 'szl':u'{{Przipisy}}',
+ 'zh': u'{{reflist}}',
+ },
+}
+
+# Sites where no title is required for references template
+# as it is already included there
+# like pl.wiki where {{Przypisy}} generates
+# == Przypisy ==
+# <references />
+noTitleRequired = [u'pl', u'be', u'szl']
+
+maintenance_category = {
+ 'wikipedia': {
+ 'be-x-old': u'Вікіпэдыя:Старонкі з адсутным сьпісам зносак',
+ 'de': u'Wikipedia:Seite mit fehlendem References-Tag',
+ 'en': u'Pages with missing references list',
+ 'fa': u'صفحههای با یادکرد خراب (فقدان پانویس)',
+ 'ja': u'Refタグがあるのにreferencesタグがないページ',
+ 'simple': u'Wikipedia pages with broken references',
+ 'zh': u'参考资料格式错误的页面',
+ },
+}
+
+class XmlDumpNoReferencesPageGenerator:
+ """
+ Generator which will yield Pages that might lack a references tag.
+ These pages will be retrieved from a local XML dump file
+ (pages-articles or pages-meta-current).
+ """
+ def __init__(self, xmlFilename):
+ """
+ Arguments:
+ * xmlFilename - The dump's path, either absolute or relative
+ """
+ self.xmlFilename = xmlFilename
+ self.refR = re.compile('</ref>', re.IGNORECASE)
+ # The references tab can contain additional spaces and a group
+ # attribute.
+ self.referencesR = re.compile('<references.*?/>', re.IGNORECASE)
+
+ def __iter__(self):
+ import xmlreader
+ dump = xmlreader.XmlDump(self.xmlFilename)
+ for entry in dump.parse():
+ text = pywikibot.removeDisabledParts(entry.text)
+ if self.refR.search(text) and not self.referencesR.search(text):
+ yield pywikibot.Page(pywikibot.getSite(), entry.title)
+
+
+class NoReferencesBot:
+
+ def __init__(self, generator, always=False):
+ self.generator = generator
+ self.always = always
+ self.site = pywikibot.getSite()
+ self.refR = re.compile('</ref>', re.IGNORECASE)
+ self.referencesR = re.compile('<references.*?/>', re.IGNORECASE)
+ self.referencesTagR = re.compile('<references>.*?</references>',
+ re.IGNORECASE|re.DOTALL)
+ try:
+ self.referencesTemplates = referencesTemplates[
+ pywikibot.getSite().family.name][pywikibot.getSite().lang]
+ except KeyError:
+ self.referencesTemplates = []
+ try:
+ self.referencesText = referencesSubstitute[
+ pywikibot.getSite().family.name][pywikibot.getSite().lang]
+ except KeyError:
+ self.referencesText = u'<references />'
+
+ def lacksReferences(self, text, verbose=True):
+ """
+ Checks whether or not the page is lacking a references tag.
+ """
+ oldTextCleaned = pywikibot.removeDisabledParts(text)
+ if self.referencesR.search(oldTextCleaned) or \
+ self.referencesTagR.search(oldTextCleaned):
+ if verbose:
+ pywikibot.output(u'No changes necessary: references tag found.')
+ return False
+ elif self.referencesTemplates:
+ templateR = u'{{(' + u'|'.join(self.referencesTemplates) + ')'
+ if re.search(templateR, oldTextCleaned, re.IGNORECASE|re.UNICODE):
+ if verbose:
+ pywikibot.output(
+ u'No changes necessary: references template found.')
+ return False
+ if not self.refR.search(oldTextCleaned):
+ if verbose:
+ pywikibot.output(u'No changes necessary: no ref tags found.')
+ return False
+ else:
+ if verbose:
+ pywikibot.output(u'Found ref without references.')
+ return True
+
+ def addReferences(self, oldText):
+ """
+ Tries to add a references tag into an existing section where it fits
+ into. If there is no such section, creates a new section containing
+ the references tag.
+ * Returns : The modified pagetext
+
+ """
+ # Is there an existing section where we can add the references tag?
+ for section in pywikibot.translate(self.site, referencesSections):
+ sectionR = re.compile(r'\r\n=+ *%s *=+ *\r\n' % section)
+ index = 0
+ while index < len(oldText):
+ match = sectionR.search(oldText, index)
+ if match:
+ if pywikibot.isDisabled(oldText, match.start()):
+ pywikibot.output(
+ 'Existing %s section is commented out, skipping.'
+ % section)
+ index = match.end()
+ else:
+ pywikibot.output(
+ u'Adding references tag to existing %s section...\n'
+ % section)
+ newText = oldText[:match.end()] + u'\n' + self.referencesText + u'\n' + oldText[match.end():]
+ return newText
+ else:
+ break
+
+ # Create a new section for the references tag
+ for section in pywikibot.translate(self.site, placeBeforeSections):
+ # Find out where to place the new section
+ sectionR = re.compile(r'\r\n(?P<ident>=+) *%s *(?P=ident) *\r\n'
+ % section)
+ index = 0
+ while index < len(oldText):
+ match = sectionR.search(oldText, index)
+ if match:
+ if pywikibot.isDisabled(oldText, match.start()):
+ pywikibot.output(
+ 'Existing %s section is commented out, won\'t add the references in front of it.'
+ % section)
+ index = match.end()
+ else:
+ pywikibot.output(
+ u'Adding references section before %s section...\n'
+ % section)
+ index = match.start()
+ ident = match.group('ident')
+ return self.createReferenceSection(oldText, index, ident)
+ else:
+ break
+ # This gets complicated: we want to place the new references
+ # section over the interwiki links and categories, but also
+ # over all navigation bars, persondata, and other templates
+ # that are at the bottom of the page. So we need some advanced
+ # regex magic.
+ # The strategy is: create a temporary copy of the text. From that,
+ # keep removing interwiki links, templates etc. from the bottom.
+ # At the end, look at the length of the temp text. That's the position
+ # where we'll insert the references section.
+ catNamespaces = '|'.join(self.site.category_namespaces())
+ categoryPattern = r'\[\[\s*(%s)\s*:[^\n]*\]\]\s*' % catNamespaces
+ interwikiPattern = r'\[\[([a-zA-Z\-]+)\s?:([^\[\]\n]*)\]\]\s*'
+ # won't work with nested templates
+ # the negative lookahead assures that we'll match the last template
+ # occurence in the temp text.
+ ### fix me:
+ ### {{commons}} or {{commonscat}} are part of Weblinks section
+ ### * {{template}} is mostly part of a section
+ ### so templatePattern must be fixed
+ templatePattern = r'\r\n{{((?!}}).)+?}}\s*'
+ commentPattern = r'<!--((?!-->).)*?-->\s*'
+ metadataR = re.compile(r'(\r\n)?(%s|%s|%s|%s)$'
+ % (categoryPattern, interwikiPattern,
+ templatePattern, commentPattern), re.DOTALL)
+ tmpText = oldText
+ while True:
+ match = metadataR.search(tmpText)
+ if match:
+ tmpText = tmpText[:match.start()]
+ else:
+ break
+ pywikibot.output(
+ u'Found no section that can be preceeded by a new references section.\nPlacing it before interwiki links, categories, and bottom templates.')
+ index = len(tmpText)
+ return self.createReferenceSection(oldText, index)
+
+ def createReferenceSection(self, oldText, index, ident = '=='):
+ if self.site.language() in noTitleRequired:
+ newSection = u'\n%s\n' % (self.referencesText)
+ else:
+ newSection = u'\n%s %s %s\n%s\n' % (ident,
+ pywikibot.translate(
+ self.site,
+ referencesSections)[0],
+ ident, self.referencesText)
+ return oldText[:index] + newSection + oldText[index:]
+
+ def save(self, page, newText):
+ """
+ Saves the page to the wiki, if the user accepts the changes made.
+ """
+ pywikibot.showDiff(page.get(), newText)
+ if not self.always:
+ choice = pywikibot.inputChoice(
+ u'Do you want to accept these changes?',
+ ['Yes', 'No', 'Always yes'], ['y', 'N', 'a'], 'Y')
+ if choice == 'n':
+ return
+ elif choice == 'a':
+ self.always = True
+
+ if self.always:
+ try:
+ page.put(newText)
+ except pywikibot.EditConflict:
+ pywikibot.output(u'Skipping %s because of edit conflict'
+ % (page.title(),))
+ except pywikibot.SpamfilterError, e:
+ pywikibot.output(
+ u'Cannot change %s because of blacklist entry %s'
+ % (page.title(), e.url))
+ except pywikibot.LockedPage:
+ pywikibot.output(u'Skipping %s (locked page)' % (page.title(),))
+ else:
+ # Save the page in the background. No need to catch exceptions.
+ page.put_async(newText)
+ return
+
+ def run(self):
+ comment = i18n.twtranslate(self.site, 'noreferences-add-tag')
+ pywikibot.setAction(comment)
+
+ for page in self.generator:
+ # Show the title of the page we're working on.
+ # Highlight the title in purple.
+ pywikibot.output(u"\n\n>>> \03{lightpurple}%s\03{default} <<<"
+ % page.title())
+ try:
+ text = page.get()
+ except pywikibot.NoPage:
+ pywikibot.output(u"Page %s does not exist?!"
+ % page.title(asLink=True))
+ continue
+ except pywikibot.IsRedirectPage:
+ pywikibot.output(u"Page %s is a redirect; skipping."
+ % page.title(asLink=True))
+ continue
+ except pywikibot.LockedPage:
+ pywikibot.output(u"Page %s is locked?!"
+ % page.title(asLink=True))
+ continue
+ if pywikibot.getSite().sitename() == 'wikipedia:en' and page.isIpEdit():
+ pywikibot.output(
+ u"Page %s is edited by IP. Possible vandalized" % page.title(asLink=True))
+ continue
+ if self.lacksReferences(text):
+ newText = self.addReferences(text)
+ self.save(page, newText)
+
+def main():
+ #page generator
+ gen = None
+ # This temporary array is used to read the page title if one single
+ # page to work on is specified by the arguments.
+ pageTitle = []
+ # Which namespaces should be processed?
+ # default to [] which means all namespaces will be processed
+ namespaces = []
+ # Never ask before changing a page
+ always = False
+ # This factory is responsible for processing command line arguments
+ # that are also used by other scripts and that determine on which pages
+ # to work on.
+ genFactory = pagegenerators.GeneratorFactory()
+
+ for arg in pywikibot.handleArgs():
+ if arg.startswith('-xml'):
+ if len(arg) == 4:
+ xmlFilename = i18n.input('pywikibot-enter-xml-filename')
+ else:
+ xmlFilename = arg[5:]
+ gen = XmlDumpNoReferencesPageGenerator(xmlFilename)
+ elif arg.startswith('-namespace:'):
+ try:
+ namespaces.append(int(arg[11:]))
+ except ValueError:
+ namespaces.append(arg[11:])
+ elif arg == '-always':
+ always = True
+ else:
+ if not genFactory.handleArg(arg):
+ pageTitle.append(arg)
+
+ if pageTitle:
+ page = pywikibot.Page(pywikibot.getSite(), ' '.join(pageTitle))
+ gen = iter([page])
+ if not gen:
+ gen = genFactory.getCombinedGenerator()
+ if not gen:
+ site = pywikibot.getSite()
+ try:
+ cat = maintenance_category[site.family.name][site.lang]
+ except:
+ pass
+ else:
+ import catlib
+ if not namespaces:
+ namespaces = [0]
+ cat = catlib.Category(site, "%s:%s" % (site.category_namespace(),
+ cat))
+ gen = pagegenerators.CategorizedPageGenerator(cat)
+ if not gen:
+ pywikibot.showHelp('noreferences')
+ else:
+ if namespaces:
+ gen = pagegenerators.NamespaceFilterPageGenerator(gen, namespaces)
+ preloadingGen = pagegenerators.PreloadingGenerator(gen)
+ bot = NoReferencesBot(preloadingGen, always)
+ bot.run()
+
+if __name__ == "__main__":
+ try:
+ main()
+ finally:
+ pywikibot.stopme()
+
http://www.mediawiki.org/wiki/Special:Code/pywikipedia/10644
Revision: 10644
Author: xqt
Date: 2012-11-01 14:50:50 +0000 (Thu, 01 Nov 2012)
Log Message:
-----------
minor cosmetics from rewrite
Modified Paths:
--------------
trunk/pywikipedia/wikipedia.py
Modified: trunk/pywikipedia/wikipedia.py
===================================================================
--- trunk/pywikipedia/wikipedia.py 2012-11-01 14:50:11 UTC (rev 10643)
+++ trunk/pywikipedia/wikipedia.py 2012-11-01 14:50:50 UTC (rev 10644)
@@ -4044,8 +4044,8 @@
page.
fileIsOnCommons : Return True if image stored on Wikimedia
Commons.
- fileIsShared : Return True if image stored on Wikitravel
- shared repository.
+ fileIsShared : Return True if image stored on a shared
+ repository like Wikimedia Commons or Wikitravel.
getFileMd5Sum : Return image file's MD5 checksum.
getFileVersionHistory : Return the image file's version history.
getFileVersionHistoryTable: Return the version history in the form of a
@@ -4054,10 +4054,10 @@
globalUsage : Yield Pages on which the image is used globally
"""
- def __init__(self, site, title, insite = None):
+ def __init__(self, site, title, insite=None):
Page.__init__(self, site, title, insite, defaultNamespace=6)
if self.namespace() != 6:
- raise ValueError(u'BUG: %s is not in the image namespace!' % title)
+ raise ValueError(u"'%s' is not in the image namespace!" % title)
self._imagePageHtml = None
self._local = None
self._latestInfo = {}
http://www.mediawiki.org/wiki/Special:Code/pywikipedia/10643
Revision: 10643
Author: xqt
Date: 2012-11-01 14:50:11 +0000 (Thu, 01 Nov 2012)
Log Message:
-----------
mark fileIsOnCommons() as deprecated, update methods and doc strings
Modified Paths:
--------------
branches/rewrite/pywikibot/page.py
Modified: branches/rewrite/pywikibot/page.py
===================================================================
--- branches/rewrite/pywikibot/page.py 2012-11-01 14:13:43 UTC (rev 10642)
+++ branches/rewrite/pywikibot/page.py 2012-11-01 14:50:11 UTC (rev 10643)
@@ -1499,10 +1499,8 @@
getImagePageHtml : Download image page and return raw HTML text.
fileURL : Return the URL for the image described on this
page.
- fileIsOnCommons : Return True if image stored on Wikimedia
- Commons.
- fileIsShared : Return True if image stored on Wikitravel
- shared repository.
+ fileIsShared : Return True if image stored on a shared
+ repository like Wikimedia Commons or Wikitravel.
getFileMd5Sum : Return image file's MD5 checksum.
getFileVersionHistory : Return the image file's version history.
getFileVersionHistoryTable: Return the version history in the form of a
@@ -1536,18 +1534,23 @@
self._imageinfo = self.site.getimageinfo(self) #FIXME
return self._imageinfo['url']
+ @deprecated("fileIsShared")
def fileIsOnCommons(self):
"""Return True if the image is stored on Wikimedia Commons"""
- return self.fileUrl().startswith(
- 'http://upload.wikimedia.org/wikipedia/commons/')
+ return fileIsShared
def fileIsShared(self):
"""Return True if image is stored on any known shared repository."""
# as of now, the only known repositories are commons and wikitravel
- if 'wikitravel_shared' in self.site.shared_image_repository():
+ # TODO: put the URLs to family file
+ if not self.site.has_image_repository:
+ return False
+ elif 'wikitravel_shared' in self.site.shared_image_repository():
return self.fileUrl().startswith(
u'http://wikitravel.org/upload/shared/')
- return self.fileIsOnCommons()
+ else:
+ return self.fileUrl().startswith(
+ 'http://upload.wikimedia.org/wikipedia/commons/')
@deprecated("ImagePage.getFileSHA1Sum()")
def getFileMd5Sum(self):