pywikibot December 2008

pywikibot@lists.wikimedia.org

23 participants
115 discussions

[Pywikipedia-l] SVN: [6134] branches/rewrite/pywikibot
by russblau＠svn.wikimedia.org 08 Dec '08

08 Dec '08

Revision: 6134 Author: russblau Date: 2008-12-08 21:41:15 +0000 (Mon, 08 Dec 2008) Log Message: ----------- Interwiki link scraping Modified Paths: -------------- branches/rewrite/pywikibot/data/api.py branches/rewrite/pywikibot/page.py branches/rewrite/pywikibot/site.py branches/rewrite/pywikibot/tests/page_tests.py Modified: branches/rewrite/pywikibot/data/api.py =================================================================== --- branches/rewrite/pywikibot/data/api.py 2008-12-05 22:08:29 UTC (rev 6133) +++ branches/rewrite/pywikibot/data/api.py 2008-12-08 21:41:15 UTC (rev 6134) @@ -184,7 +184,7 @@ self.site.throttle(write=write) uri = self.site.scriptpath() + "/api.php" try: - if write or action == "login": + if write or action in ("login", "expandtemplates", "parse"): # add other actions that require POST requests above rawdata = http.request(self.site, uri, method="POST", headers={'Content-Type': Modified: branches/rewrite/pywikibot/page.py =================================================================== --- branches/rewrite/pywikibot/page.py 2008-12-05 22:08:29 UTC (rev 6133) +++ branches/rewrite/pywikibot/page.py 2008-12-08 21:41:15 UTC (rev 6134) @@ -368,6 +368,15 @@ text = property(_textgetter, _textsetter, _cleartext, "The edited wikitext (unicode) of this Page") + def expand_text(self): + """Return the page text with all templates expanded.""" + req = pywikibot.data.api.Request(action="expandtemplates", + text=self.text, + title=self.title(withSection=False), + site=self.site()) + result = req.submit() + return result["expandtemplates"]["*"] + def userName(self): """Return name or IP address of last user to edit page.""" return self._revisions[self.latestRevision()].user @@ -686,8 +695,8 @@ """Iterate Pages that this Page links to. Only returns pages from "normal" internal links. Image and category - links are omitted unless prefixed with ":"; embedded templates are - omitted (but links within them are returned); all interwiki and + links are omitted unless prefixed with ":". Embedded templates are + omitted (but links within them are returned). All interwiki and external links are omitted. @return: a generator that yields Page objects. @@ -695,20 +704,43 @@ """ return self.site().pagelinks(self) - def interwiki(self): - """Iterate interwiki links in the page text. + def interwiki(self, expand=True): + """Iterate interwiki links in the page text, excluding language links. - @return: a generator that yields Link objects. + @param expand: if True (default), include interwiki links found in + templates transcluded onto this page; if False, only iterate + interwiki links found in this page's own wikitext + @return: a generator that yields Link objects """ - return self.site().pageinterwiki(self) + # This function does not exist in the API, so it has to be + # implemented by screen-scraping + Rlink = re.compile(r'\[\[(?P<title>[^\]|[#<>{}]*)(\|.*?)?\]\]') + if expand: + text = self.expand_text() + else: + text = self.text + for linkmatch in Rlink.finditer( + pywikibot.textlib.removeDisabledParts(text)): + linktitle = linkmatch.group("title") + link = Link(linktitle, self.site()) + # only yield links that are to a different site and that + # are not language links + try: + if link.site != self.site(): + if linktitle.lstrip().startswith(":"): + # initial ":" indicates not a language link + yield link + elif link.site.family != self.site().family: + # link to a different family is not a language link + yield link + except pywikibot.Error: + # ignore any links with invalid contents + continue def langlinks(self): """Iterate all interlanguage links on this page. - Note that the links yielded by this method will be a subset of - the results of self.interwiki(). - @return: a generator that yields Link objects. """ @@ -1729,7 +1761,25 @@ def __str__(self): return self.astext() + def __cmp__(self, other): + """Test for equality and inequality of Link objects. + Link objects are "equal" if and only if they are on the same site + and have the same normalized title, including section if any. + + Link objects are sortable by site, then namespace, then title. + + """ + if not isinstance(other, Link): + # especially, return -1 if other is None + return -1 + if not self.site == other.site: + return cmp(self.site, other.site) + if self.namespace != other.namespace: + return cmp(self.namespace, other.namespace) + return cmp(self.title, other.title) + + # Utility functions for parsing page titles def html2unicode(text, ignore = []): @@ -1794,7 +1844,7 @@ unicodeCodepoint=convertIllegalHtmlEntities[unicodeCodepoint] except KeyError: pass - if unicodeCodepoint and unicodeCodepoint not in ignore and (WIDEBUILD or unicodeCodepoint < 65534): + if unicodeCodepoint and unicodeCodepoint not in ignore: result += unichr(unicodeCodepoint) else: # Leave the entity unchanged Modified: branches/rewrite/pywikibot/site.py =================================================================== --- branches/rewrite/pywikibot/site.py 2008-12-05 22:08:29 UTC (rev 6133) +++ branches/rewrite/pywikibot/site.py 2008-12-08 21:41:15 UTC (rev 6134) @@ -1357,7 +1357,7 @@ api.update_page(page, pagedata) def pageinterwiki(self, page): - # TODO + # No such function in the API (this method isn't called anywhere) raise NotImplementedError def pagelanglinks(self, page): Modified: branches/rewrite/pywikibot/tests/page_tests.py =================================================================== --- branches/rewrite/pywikibot/tests/page_tests.py 2008-12-05 22:08:29 UTC (rev 6133) +++ branches/rewrite/pywikibot/tests/page_tests.py 2008-12-08 21:41:15 UTC (rev 6134) @@ -227,9 +227,12 @@ def testLinks(self): for p in mainpage.linkedPages(): self.assertTrue(isinstance(p, pywikibot.Page)) -## Not implemented: -## for p in mainpage.interwiki(): -## self.assertTrue(isinstance(p, pywikibot.Link)) + iw = list(mainpage.interwiki(expand=True)) + for p in iw: + self.assertTrue(isinstance(p, pywikibot.Link)) + for p2 in mainpage.interwiki(expand=False): + self.assertTrue(isinstance(p2, pywikibot.Link)) + self.assertTrue(p2 in iw) for p in mainpage.langlinks(): self.assertTrue(isinstance(p, pywikibot.Link)) for p in mainpage.imagelinks():

1 0

[Pywikipedia-l] SVN: [6133] branches/rewrite/pywikibot
by russblau＠svn.wikimedia.org 05 Dec '08

05 Dec '08

Revision: 6133 Author: russblau Date: 2008-12-05 22:08:29 +0000 (Fri, 05 Dec 2008) Log Message: ----------- code cleanup Modified Paths: -------------- branches/rewrite/pywikibot/catlib.py branches/rewrite/pywikibot/page.py Modified: branches/rewrite/pywikibot/catlib.py =================================================================== --- branches/rewrite/pywikibot/catlib.py 2008-12-05 16:07:22 UTC (rev 6132) +++ branches/rewrite/pywikibot/catlib.py 2008-12-05 22:08:29 UTC (rev 6133) @@ -13,11 +13,10 @@ # __version__ = '$Id: $' -import pywikibot -import pywikibot.textlib from pywikibot import Category + def change_category(article, oldCat, newCat, comment=None, sortKey=None, inPlace=True): return article.change_category(oldCat, newCat, comment, sortKey, inPlace) Modified: branches/rewrite/pywikibot/page.py =================================================================== --- branches/rewrite/pywikibot/page.py 2008-12-05 16:07:22 UTC (rev 6132) +++ branches/rewrite/pywikibot/page.py 2008-12-05 22:08:29 UTC (rev 6133) @@ -35,8 +35,10 @@ to the Site object. """ - def __init__(self, source, title=u"", ns=0, insite=None, - defaultNamespace=None): + + @deprecate_arg("insite", None) + @deprecate_arg("defaultNamespace", None) + def __init__(self, source, title=u"", ns=0): """Instantiate a Page object. Three calling formats are supported: @@ -65,16 +67,8 @@ @param ns: namespace number; required if source is a Site, ignored otherwise @type ns: int - @param insite: DEPRECATED (use Link instead) - @param defaultNamespace: DEPRECATED (use Link instead) """ - if insite is not None: - logger.debug( - "The 'insite' option in Page constructor is deprecated.") - if defaultNamespace is not None: - logger.debug( - "The 'defaultNamespace' option in Page constructor is deprecated.") if isinstance(source, pywikibot.site.BaseSite): self._site = source if ns not in source.namespaces(): @@ -144,6 +138,7 @@ return self._ns @deprecate_arg("decode", None) + @deprecate_arg("savetitle", "asUrl") def title(self, underscore=False, savetitle=False, withNamespace=True, withSection=True, asUrl=False, asLink=False, allowInterwiki=True, forceInterwiki=False, textlink=False, @@ -151,8 +146,6 @@ """Return the title of this Page, as a Unicode string. @param underscore: if true, replace all ' ' characters with '_' - @param savetitle: if true, try to quote all non-ASCII characters. - (DEPRECATED: use asURL instead) @param withNamespace: if false, omit the namespace prefix @param withSection: if false, omit the section @param asUrl: if true, quote title as if in an URL @@ -174,10 +167,7 @@ title = title.split(u'#', 1)[0] if underscore or asUrl: title = title.replace(u' ', u'_') - if savetitle: - logger.debug( - u"Page.title(savetitle=...) is deprecated.") - if savetitle or asUrl: + if asUrl: encodedTitle = title.encode(self.site().encoding()) title = urllib.quote(encodedTitle) if asLink: @@ -724,20 +714,14 @@ """ return self.site().pagelanglinks(self) + @deprecate_arg("followRedirects", None) + @deprecate_arg("loose", None) def imagelinks(self, followRedirects=None, loose=None): """Iterate ImagePage objects for images displayed on this Page. - @param followRedirects: DEPRECATED and ignored - @param loose: DEPRECATED and ignored @return: a generator that yields ImagePage objects. """ - if followRedirects is not None: - logger.debug( - u"Page.imagelinks(followRedirects) option is deprecated.") - if loose is not None: - logger.debug( - u"Page.imagelinks(loose) option is deprecated.") return self.site().pageimages(self) def templates(self): @@ -780,19 +764,14 @@ positional)) return result - def categories(self, nofollow_redirects=None, withSortKey=False): + @deprecate_arg("nofollow_redirects", None) + def categories(self, withSortKey=False): """Iterate categories that the article is in. - @param nofollow_redirects: DEPRECATED and ignored @param withSortKey: if True, include the sort key in each Category. @return: a generator that yields Category objects. """ - # follow_redirects makes no sense here because category membership - # doesn't follow redirects - if nofollow_redirects is not None: - logger.debug( - u"Page.categories(nofollow_redirects) option is deprecated.") return self.site().pagecategories(self, withSortKey=withSortKey) def extlinks(self): @@ -873,24 +852,21 @@ users = set([edit[2] for edit in edits]) return users + @deprecate_arg("throttle", None) def move(self, newtitle, reason=None, movetalkpage=True, sysop=False, - throttle=None, deleteAndMove=False, safe=True): + deleteAndMove=False, safe=True): """Move this page to a new title. @param newtitle: The new page title. @param reason: The edit summary for the move. @param movetalkpage: If true, move this page's talk page (if it exists) @param sysop: Try to move using sysop account, if available - @param throttle: DEPRECATED @param deleteAndMove: if move succeeds, delete the old page (usually requires sysop privileges, depending on wiki settings) @param safe: If false, attempt to delete existing page at newtitle (if there is one) and then move this page to that title """ - if throttle is not None: - logger.debug( - u"Page.move: throttle option is deprecated.") if reason is None: logger.info(u'Moving %s to [[%s]].' % (self.title(asLink=True), newtitle)) @@ -901,6 +877,7 @@ movetalk=movetalkpage, noredirect=deleteAndMove) + @deprecate_arg("throttle", None) def delete(self, reason=None, prompt=True, throttle=None, mark=False): """Deletes the page from the wiki. Requires administrator status. @@ -910,9 +887,6 @@ speedy-deletion request on the page instead. """ - if throttle is not None: - logger.debug( - u"Page.delete: throttle option is deprecated.") if reason is None: logger.info(u'Deleting %s.' % (self.title(asLink=True))) reason = pywikibot.input(u'Please enter a reason for the deletion:') @@ -967,7 +941,8 @@ self._deletedRevs[timestamp][4] = undelete self._deletedRevsModified = True - def undelete(self, comment=None, throttle=None): + @deprecate_arg("throttle", None) + def undelete(self, comment=None): """Undelete revisions based on the markers set by previous calls. If no calls have been made since loadDeletedRevisions(), everything @@ -985,12 +960,8 @@ pg.undelete('This will restore only selected revisions.') @param comment: The undeletion edit summary. - @param throttle: DEPRECATED """ - if throttle is not None: - logger.debug( - u"Page.undelete: throttle option is deprecated.") if comment is None: logger.info(u'Preparing to undelete %s.' % (self.title(asLink=True))) @@ -998,8 +969,9 @@ u'Please enter a reason for the undeletion:') return self.site().undelete(self, comment) + @deprecate_arg("throttle", None) def protect(self, edit='sysop', move='sysop', unprotect=False, - reason=None, prompt=True, throttle=None): + reason=None, prompt=True): """(Un)protect a wiki page. Requires administrator status. Valid protection levels (in MediaWiki 1.12) are '' (equivalent to @@ -1011,12 +983,8 @@ all protection levels to '') @param reason: Edit summary. @param prompt: If true, ask user for confirmation. - @param throttle: DEPRECATED """ - if throttle is not None: - logger.debug( - u"Page.protect: throttle option is deprecated.") if reason is None: if unprotect: un = u'un' @@ -1294,38 +1262,30 @@ class Category(Page): """A page in the Category: namespace""" - def __init__(self, source, title=u"", insite=None, sortKey=None): - """All parameters are the same as for Page() constructor, except: + @deprecate_arg("sortKey", None) + def __init__(self, source, title=u"", insite=None): + """All parameters are the same as for Page() constructor. - @param sortKey: DEPRECATED (use .aslink() method instead) - """ - if sortKey is not None: - logger.debug( - "The 'sortKey' option in Category constructor is deprecated.") Page.__init__(self, source, title, 14) if self.namespace() != 14: raise ValueError(u"'%s' is not in the category namespace!" % title) - def aslink(self, sortKey=u'', forceInterwiki=None, textlink=None, - noInterwiki=None): + @deprecate_arg("forceInterwiki", None) + @deprecate_arg("textlink", None) + @deprecate_arg("noInterwiki", None) + def aslink(self, sortKey=u''): """Return a link to place a page in this Category. Use this only to generate a "true" category link, not for interwikis or text links to category pages. - Parameters are deprecated and preserved for backwards-compatibility, - except: - @param sortKey: The sort key for the article to be placed in this Category; if omitted, default sort key is used. @type sortKey: (optional) unicode """ - if forceInterwiki is not None \ - or textlink is not None or noInterwiki is not None: - logger.debug("All arguments to Category.aslink() are deprecated.") if sortKey: titleWithSortKey = '%s|%s' % (self.title(withSection=False), self.sortKey)

1 0

[Pywikipedia-l] SVN: [6132] trunk/pywikipedia/imageuncat.py
by multichill＠svn.wikimedia.org 05 Dec '08

05 Dec '08

Revision: 6132 Author: multichill Date: 2008-12-05 16:07:22 +0000 (Fri, 05 Dec 2008) Log Message: ----------- Recentchanges now also include log events (like uploads). Modified Paths: -------------- trunk/pywikipedia/imageuncat.py Modified: trunk/pywikipedia/imageuncat.py =================================================================== --- trunk/pywikipedia/imageuncat.py 2008-12-05 14:12:31 UTC (rev 6131) +++ trunk/pywikipedia/imageuncat.py 2008-12-05 16:07:22 UTC (rev 6132) @@ -1270,7 +1270,7 @@ 'rcprop' :'title', 'rcshow' :'!bot', 'rclimit' :'5000', - 'rctype' :'edit', + 'rctype' :'edit|log', } data = query.GetData(params, site, useAPI = True, encodeTitle = False)

1 0

[Pywikipedia-l] SVN: [6131] trunk/pywikipedia/wikipedia.py
by russblau＠svn.wikimedia.org 05 Dec '08

05 Dec '08

Revision: 6131 Author: russblau Date: 2008-12-05 14:12:31 +0000 (Fri, 05 Dec 2008) Log Message: ----------- Better checks for validity of wikilinks; also minor cosmetic changes on output Modified Paths: -------------- trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2008-12-04 21:13:11 UTC (rev 6130) +++ trunk/pywikipedia/wikipedia.py 2008-12-05 14:12:31 UTC (rev 6131) @@ -585,7 +585,7 @@ return u'[[%s:%s]]' % (self.site().lang, self.title(savetitle=True,decode=True)) elif textlink and (self.isImage() or self.isCategory()): - return u'[[:%s]]' % self.title(savetitle=True,decode=True) + return u'[[:%s]]' % self.title(savetitle=True, decode=True) else: return u'[[%s]]' % self.title(savetitle=True, decode=True) @@ -1450,9 +1450,9 @@ put_throttle() # Which web-site host are we submitting to? if newPage: - output(u'Creating page %s' % self.aslink(forceInterwiki=True)) + output(u'Creating page %s' % self.aslink()) else: - output(u'Changing page %s' % self.aslink(forceInterwiki=True)) + output(u'Changing page %s' % self.aslink()) # Submit the prepared information if self.site().hostname() in config.authenticate.keys(): predata["Content-type"] = "application/x-www-form-urlencoded" @@ -1775,7 +1775,12 @@ if not self.site().isInterwikiLink(title): try: page = Page(self.site(), title) - except InvalidTitle: + try: + hash(str(page)) + except Exception: + raise Error(u"Page %s contains invalid link to [[%s]]." + % (self.title(), title)) + except Error: if verbose: output(u"Page %s contains invalid link to [[%s]]." % (self.title(), title))

1 0

[Pywikipedia-l] SVN: [6130] branches/rewrite/pywikibot
by russblau＠svn.wikimedia.org 04 Dec '08

04 Dec '08

Revision: 6130 Author: russblau Date: 2008-12-04 21:13:11 +0000 (Thu, 04 Dec 2008) Log Message: ----------- More consistent use of pywikibot.config2 module Modified Paths: -------------- branches/rewrite/pywikibot/__init__.py branches/rewrite/pywikibot/comms/http.py branches/rewrite/pywikibot/login.py branches/rewrite/pywikibot/page.py branches/rewrite/pywikibot/site.py Modified: branches/rewrite/pywikibot/__init__.py =================================================================== --- branches/rewrite/pywikibot/__init__.py 2008-12-04 20:39:59 UTC (rev 6129) +++ branches/rewrite/pywikibot/__init__.py 2008-12-04 21:13:11 UTC (rev 6130) @@ -13,7 +13,7 @@ import logging from exceptions import * -import config2 +import config2 as config import textlib @@ -47,10 +47,7 @@ _sites = {} -default_family = config2.family -default_code = config2.mylang - @deprecate_arg("persistent_http", None) def Site(code=None, fam=None, user=None, sysop=None, interface=None): """Return the specified Site object. @@ -68,21 +65,21 @@ logger = logging.getLogger("wiki") if code is None: - code = default_code + code = config.mylang if fam is None: - fam = default_family + fam = config.family if user is None: try: - user = config2.usernames[fam][code] + user = config.usernames[fam][code] except KeyError: user = None if sysop is None: try: - sysop = config2.sysopnames[fam][code] + sysop = config.sysopnames[fam][code] except KeyError: sysop = None if interface is None: - interface = config2.site_interface + interface = config.site_interface try: exec "from site import %s as __Site" % interface except ImportError: @@ -96,6 +93,7 @@ getSite = Site # alias for backwards-compability + from page import Page, ImagePage, Category, Link Modified: branches/rewrite/pywikibot/comms/http.py =================================================================== --- branches/rewrite/pywikibot/comms/http.py 2008-12-04 20:39:59 UTC (rev 6129) +++ branches/rewrite/pywikibot/comms/http.py 2008-12-04 21:13:11 UTC (rev 6130) @@ -27,7 +27,7 @@ import logging import atexit -from pywikibot import config2 +from pywikibot import config import cookielib import threadedhttp @@ -44,10 +44,10 @@ http_queue = Queue.Queue() cookie_jar = threadedhttp.LockableCookieJar( - config2.datafilepath("%s-%s-%s.lwp" - % (config2.family, - config2.mylang, - config2.usernames[config2.family][config2.mylang]))) + config.datafilepath("%s-%s-%s.lwp" + % (config.family, + config.mylang, + config.usernames[config.family][config.mylang]))) try: cookie_jar.load() except (IOError, cookielib.LoadError): Modified: branches/rewrite/pywikibot/login.py =================================================================== --- branches/rewrite/pywikibot/login.py 2008-12-04 20:39:59 UTC (rev 6129) +++ branches/rewrite/pywikibot/login.py 2008-12-04 21:13:11 UTC (rev 6130) @@ -47,6 +47,7 @@ import re import urllib2 import pywikibot +from pywikibot import config from pywikibot.exceptions import * logger = logging.getLogger("wiki") @@ -77,7 +78,7 @@ self.username = user elif sysop: try: - self.username = pywikibot.config2.sysopnames\ + self.username = config.sysopnames\ [self.site.family.name][self.site.code] except KeyError: raise NoUsername( @@ -89,7 +90,7 @@ 'wiki_code': self.site.code}) else: try: - self.username = pywikibot.config2.usernames\ + self.username = config.usernames\ [self.site.family.name][self.site.code] except: raise NoUsername( @@ -100,7 +101,7 @@ % {'fam_name': self.site.family.name, 'wiki_code': self.site.code}) self.password = password - if getattr(pywikibot.config2, 'password_file', ''): + if getattr(config, 'password_file', ''): self.readPassword() def botAllowed(self): @@ -140,7 +141,7 @@ The argument data is the raw data, as returned by getCookie(). """ - filename = pywikibot.config2.datafilepath('%s-%s-%s-login.data' + filename = config.datafilepath('%s-%s-%s-login.data' % (self.site.family.name, self.site.code, self.username)) f = open(filename, 'w') @@ -163,7 +164,7 @@ ("en", "wikipedia", "my_en_user", "my_en_pass") """ - file = open(pywikibot.config2.password_file) + file = open(config.password_file) for line in file: if not line.strip(): continue entry = eval(line) @@ -238,9 +239,9 @@ return if logall: if sysop: - namedict = pywikibot.config2.sysopnames + namedict = config.sysopnames else: - namedict = pywikibot.config2.usernames + namedict = config.usernames for familyName in namedict.iterkeys(): for lang in namedict[familyName].iterkeys(): try: Modified: branches/rewrite/pywikibot/page.py =================================================================== --- branches/rewrite/pywikibot/page.py 2008-12-04 20:39:59 UTC (rev 6129) +++ branches/rewrite/pywikibot/page.py 2008-12-04 21:13:11 UTC (rev 6130) @@ -11,6 +11,7 @@ import pywikibot from pywikibot import deprecate_arg +from pywikibot import config import pywikibot.textlib import htmlentitydefs @@ -181,9 +182,9 @@ title = urllib.quote(encodedTitle) if asLink: if forceInterwiki or (allowInterwiki and - (self.site().family.name != pywikibot.default_family - or self.site().code != pywikibot.default_code)): - if self.site().family.name != pywikibot.default_family \ + (self.site().family.name != config.family + or self.site().code != config.mylang)): + if self.site().family.name != config.family \ and self.site().family.name != self.site().code: return u'[[%s:%s:%s]]' % (self.site().family.name, self.site().code, @@ -572,7 +573,7 @@ user_config.py, or using page.put(force=True). """ # TODO: move this to Site object? - if pywikibot.config2.ignore_bot_templates: #Check the "master ignore switch" + if config.ignore_bot_templates: #Check the "master ignore switch" return True try: templates = self.templatesWithParams(); Modified: branches/rewrite/pywikibot/site.py =================================================================== --- branches/rewrite/pywikibot/site.py 2008-12-04 20:39:59 UTC (rev 6129) +++ branches/rewrite/pywikibot/site.py 2008-12-04 21:13:11 UTC (rev 6130) @@ -12,6 +12,7 @@ import pywikibot from pywikibot import deprecate_arg +from pywikibot import config from pywikibot.throttle import Throttle from pywikibot.data import api from pywikibot.exceptions import * @@ -45,14 +46,14 @@ """ if fam == None: - fam = pywikibot.default_family + fam = config.family try: # first try the built-in families exec "import pywikibot.families.%s_family as myfamily" % fam except ImportError: # next see if user has defined a local family module try: - sys.path.append(pywikibot.config2.datafilepath('families')) + sys.path.append(config.datafilepath('families')) exec "import %s_family as myfamily" % fam except ImportError: if fatal: @@ -2485,7 +2486,7 @@ try: if sysop: try: - username = pywikibot.config2.sysopnames[self.family.name + username = config.sysopnames[self.family.name ][self.code] except KeyError: raise NoUsername("""\ @@ -2502,7 +2503,7 @@ else: tmp = '%s-%s-%s-login.data' % ( self.family.name, self.code, username) - fn = pywikibot.config2.datafilepath('login-data', tmp) + fn = config.datafilepath('login-data', tmp) if not os.path.exists(fn): self._cookies[index] = None self._isLoggedIn[index] = False

1 0

[Pywikipedia-l] SVN: [6129] branches/rewrite/pywikibot
by russblau＠svn.wikimedia.org 04 Dec '08

04 Dec '08

Revision: 6129 Author: russblau Date: 2008-12-04 20:39:59 +0000 (Thu, 04 Dec 2008) Log Message: ----------- Backwards-compatibility for catlib.py contents. Note that I changed the default on "inPlace" to True, on the principle of least astonishment. If the user wants to rearrange the category links, they should have to say so explicitly. Modified Paths: -------------- branches/rewrite/pywikibot/page.py Added Paths: ----------- branches/rewrite/pywikibot/catlib.py Added: branches/rewrite/pywikibot/catlib.py =================================================================== --- branches/rewrite/pywikibot/catlib.py (rev 0) +++ branches/rewrite/pywikibot/catlib.py 2008-12-04 20:39:59 UTC (rev 6129) @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- +""" +WARNING: THIS MODULE EXISTS SOLELY TO PROVIDE BACKWARDS-COMPATIBILITY. + +Do not use in new scripts; use the source to find the appropriate +function/method instead. + +""" +# +# (C) Pywikipedia bot team, 2008 +# +# Distributed under the terms of the MIT license. +# +__version__ = '$Id: $' + +import pywikibot +import pywikibot.textlib + +from pywikibot import Category + +def change_category(article, oldCat, newCat, comment=None, sortKey=None, + inPlace=True): + return article.change_category(oldCat, newCat, comment, sortKey, inPlace) Modified: branches/rewrite/pywikibot/page.py =================================================================== --- branches/rewrite/pywikibot/page.py 2008-12-03 21:29:38 UTC (rev 6128) +++ branches/rewrite/pywikibot/page.py 2008-12-04 20:39:59 UTC (rev 6129) @@ -11,6 +11,7 @@ import pywikibot from pywikibot import deprecate_arg +import pywikibot.textlib import htmlentitydefs import logging @@ -1037,6 +1038,101 @@ if answer in ['y', 'Y']: return self.site().protect(self, edit, move, reason) + def change_category(article, oldCat, newCat, comment=None, sortKey=None, + inPlace=True): + """Remove page from oldCat and add it to newCat. + + oldCat and newCat should be Category objects. + If newCat is None, the category will be removed. + + """ # TODO: document remaining arguments + cats = self.categories(get_redirect=True) + site = self.site() + changesMade = False + + if not self.canBeEdited(): + pywikibot.output(u"Can't edit %s, skipping it..." + % self.title(asLink=True)) + return False + if inPlace == True: + newtext = pywikibot.textlib.replaceCategoryInPlace( + self.text, oldCat, newCat) + if newtext == self.text: + pywikibot.output( + u'No changes in made in page %s.' + % self.title(asLink=True)) + return False + try: + self.put(newtext, comment) + return True + except pywikibot.EditConflict: + pywikibot.output( + u'Skipping %s because of edit conflict' + % self.title(asLink=True)) + except pywikibot.LockedPage: + pywikibot.output(u'Skipping locked page %s' + % self.title(asLink=True)) + except pywikibot.SpamfilterError, error: + pywikibot.output( + u'Changing page %s blocked by spam filter (URL=%s)' + % (self.title(asLink=True), error.url)) + except pywikibot.NoUsername: + pywikibot.output( + u"Page %s not saved; sysop privileges required." + % self.title(asLink=True)) + except pywikibot.PageNotSaved, error: + pywikibot.output(u"Saving page %s failed: %s" + % (self.title(asLink=True), error.message)) + return False + + # This loop will replace all occurrences of the category to be changed, + # and remove duplicates. + newCatList = [] + newCatSet = set() + for i in range(len(cats)): + cat = cats[i] + if cat == oldCat: + changesMade = True + if not sortKey: + sortKey = cat.sortKey + if newCat: + if newCat.title() not in newCatSet: + newCategory = Category(site, newCat.title(), + sortKey=sortKey) + newCatSet.add(newCat.title()) + newCatList.append(newCategory) + elif cat.title() not in newCatSet: + newCatSet.add(cat.title()) + newCatList.append(cat) + + if not changesMade: + pywikibot.output(u'ERROR: %s is not in category %s!' + % (self.title(asLink=True), oldCat.title())) + else: + try: + text = pywikibot.textlib.replaceCategoryLinks(self.text, + newCatList) + except ValueError: + # Make sure that the only way replaceCategoryLinks() can return + # a ValueError is in the case of interwiki links to self. + pywikibot.output( + u'Skipping %s because of interwiki link to self' % self) + try: + self.put(text, comment) + except pywikibot.EditConflict: + pywikibot.output( + u'Skipping %s because of edit conflict' % self.title()) + except pywikibot.SpamfilterError, e: + pywikibot.output( + u'Skipping %s because of blacklist entry %s' + % (self.title(), e.url)) + except pywikibot.LockedPage: + pywikibot.output( + u'Skipping %s because page is locked' % self.title()) + except pywikibot.PageNotSaved, error: + pywikibot.output(u"Saving page %s failed: %s" + % (self.title(asLink=True), error.message)) + ######## DEPRECATED METHODS ######## def encoding(self):

1 0

[Pywikipedia-l] SVN: [6128] trunk/pywikipedia/families/commons_family.py
by russblau＠svn.wikimedia.org 03 Dec '08

03 Dec '08

Revision: 6128 Author: russblau Date: 2008-12-03 21:29:38 +0000 (Wed, 03 Dec 2008) Log Message: ----------- new disambig template Modified Paths: -------------- trunk/pywikipedia/families/commons_family.py Modified: trunk/pywikipedia/families/commons_family.py =================================================================== --- trunk/pywikipedia/families/commons_family.py 2008-12-03 20:02:17 UTC (rev 6127) +++ trunk/pywikipedia/families/commons_family.py 2008-12-03 21:29:38 UTC (rev 6128) @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# -*- coding: utf-8 -*- __version__ = '$Id$' @@ -29,8 +29,8 @@ self.interwiki_forward = 'wikipedia' self.disambiguationTemplates = { - - 'commons': [u'Disambig', u'Disambiguation', u'Razločitev'] + 'commons': [u'Disambig', u'Disambiguation', u'Razločitev', + u'Begriffsklärung'] } self.disambcatname = { 'commons': u'Disambiguation'

1 0

[Pywikipedia-l] SVN: [6127] branches/rewrite/pywikibot/tests/site_tests.py
by russblau＠svn.wikimedia.org 03 Dec '08

03 Dec '08

Revision: 6127 Author: russblau Date: 2008-12-03 20:02:17 +0000 (Wed, 03 Dec 2008) Log Message: ----------- update backlink tests; langlinks commented out temporarily due to performance issues Modified Paths: -------------- branches/rewrite/pywikibot/tests/site_tests.py Modified: branches/rewrite/pywikibot/tests/site_tests.py =================================================================== --- branches/rewrite/pywikibot/tests/site_tests.py 2008-12-03 20:01:23 UTC (rev 6126) +++ branches/rewrite/pywikibot/tests/site_tests.py 2008-12-03 20:02:17 UTC (rev 6127) @@ -14,6 +14,8 @@ import pywikibot import warnings +logger = pywikibot.logging.getLogger("wiki.site.tests") + mysite = pywikibot.Site() mainpage = pywikibot.Page(pywikibot.Link("Main Page", mysite)) imagepage = iter(mainpage.imagelinks()).next() # 1st image on main page @@ -127,7 +129,7 @@ self.assertType(mysite.has_group("bots", True), bool) self.assertFalse(mysite.has_group("nonexistent_group", True)) except pywikibot.NoUsername: - warnings.warn( + logger.warn( "Cannot test Site methods for sysop; no sysop account configured.") for msg in ("1movedto2", "about", "aboutpage", "aboutsite", "accesskey-n-portal"): @@ -184,8 +186,28 @@ """Test site methods for getting links to and from a page""" backlinks = set(mysite.pagebacklinks(mainpage, namespaces=[0])) + # only non-redirects: + filtered = set(mysite.pagebacklinks(mainpage, namespaces=0, + filterRedirects=False)) + # only redirects: + redirs = set(mysite.pagebacklinks(mainpage, namespaces=0, + filterRedirects=True)) + # including links to redirect pages (but not the redirects): + indirect = set(mysite.pagebacklinks(mainpage, namespaces=[0], + followRedirects=True)) + self.assertEqual(filtered & redirs, set([])) + self.assertEqual(indirect & redirs, set([])) + self.assertTrue(filtered.issubset(indirect)) + self.assertTrue(filtered.issubset(backlinks)) + self.assertTrue(redirs.issubset(backlinks)) + self.assertTrue(backlinks.issubset( + set(mysite.pagebacklinks(mainpage, namespaces=[0, 2])))) + + # pagereferences includes both backlinks and embeddedin embedded = set(mysite.page_embeddedin(mainpage, namespaces=[0])) refs = set(mysite.pagereferences(mainpage, namespaces=[0])) + self.assertTrue(backlinks.issubset(refs)) + self.assertTrue(embedded.issubset(refs)) for bl in backlinks: self.assertType(bl, pywikibot.Page) self.assertTrue(bl in refs) @@ -194,21 +216,6 @@ self.assertTrue(ei in refs) for ref in refs: self.assertTrue(ref in backlinks or ref in embedded) - # test backlinks arguments - self.assertTrue(backlinks.issubset( - set(mysite.pagebacklinks(mainpage, - followRedirects=True, - namespaces=[0])))) - self.assertTrue(backlinks.issuperset( - set(mysite.pagebacklinks(mainpage, - filterRedirects=True, - namespaces=[0])))) - self.assertTrue(backlinks.issuperset( - set(mysite.pagebacklinks(mainpage, - filterRedirects=False, - namespaces=[0])))) - self.assertTrue(backlinks.issubset( - set(mysite.pagebacklinks(mainpage, namespaces=[0, 2])))) # test embeddedin arguments self.assertTrue(embedded.issuperset( set(mysite.page_embeddedin(mainpage, filterRedirects=True, @@ -298,14 +305,14 @@ self.assertTrue(mysite.page_exists(page)) self.assertEqual(page.namespace(), 0) self.assertFalse(page.isRedirectPage()) - for page in mysite.allpages(filterlanglinks=True, limit=5): - self.assertType(page, pywikibot.Page) - self.assertTrue(mysite.page_exists(page)) - self.assertEqual(page.namespace(), 0) - for page in mysite.allpages(filterlanglinks=False, limit=5): - self.assertType(page, pywikibot.Page) - self.assertTrue(mysite.page_exists(page)) - self.assertEqual(page.namespace(), 0) +## for page in mysite.allpages(filterlanglinks=True, limit=5): +## self.assertType(page, pywikibot.Page) +## self.assertTrue(mysite.page_exists(page)) +## self.assertEqual(page.namespace(), 0) +## for page in mysite.allpages(filterlanglinks=False, limit=5): +## self.assertType(page, pywikibot.Page) +## self.assertTrue(mysite.page_exists(page)) +## self.assertEqual(page.namespace(), 0) for page in mysite.allpages(minsize=100, limit=5): self.assertType(page, pywikibot.Page) self.assertTrue(mysite.page_exists(page)) @@ -821,7 +828,7 @@ try: mysite.login(True) except pywikibot.NoUsername: - warnings.warn( + logger.warn( "Cannot test Site.deleted_revs; no sysop account configured.") return dr = list(mysite.deletedrevs(limit=10, page=mainpage)) @@ -902,7 +909,7 @@ if __name__ == '__main__': -# pywikibot.logging.getLogger().setLevel(pywikibot.logging.DEBUG) +# pywikibot.logging.getLogger("").setLevel(pywikibot.logging.DEBUG) try: try: unittest.main()

1 0

[Pywikipedia-l] SVN: [6126] branches/rewrite/pywikibot/tests/page_tests.py
by russblau＠svn.wikimedia.org 03 Dec '08

03 Dec '08

Revision: 6126 Author: russblau Date: 2008-12-03 20:01:23 +0000 (Wed, 03 Dec 2008) Log Message: ----------- update page tests Modified Paths: -------------- branches/rewrite/pywikibot/tests/page_tests.py Modified: branches/rewrite/pywikibot/tests/page_tests.py =================================================================== --- branches/rewrite/pywikibot/tests/page_tests.py 2008-12-03 20:00:42 UTC (rev 6125) +++ branches/rewrite/pywikibot/tests/page_tests.py 2008-12-03 20:01:23 UTC (rev 6126) @@ -205,7 +205,6 @@ self.assertTrue(isinstance(mainpage.permalink(), basestring)) def testReferences(self): - pywikibot.set_debug("comm") count = 0 for p in mainpage.getReferences(): count += 1

1 0

[Pywikipedia-l] SVN: [6125] branches/rewrite/pywikibot/site.py
by russblau＠svn.wikimedia.org 03 Dec '08

03 Dec '08

Revision: 6125 Author: russblau Date: 2008-12-03 20:00:42 +0000 (Wed, 03 Dec 2008) Log Message: ----------- fix nagging problem with links to redirect pages Modified Paths: -------------- branches/rewrite/pywikibot/site.py Modified: branches/rewrite/pywikibot/site.py =================================================================== --- branches/rewrite/pywikibot/site.py 2008-12-03 18:09:30 UTC (rev 6124) +++ branches/rewrite/pywikibot/site.py 2008-12-03 20:00:42 UTC (rev 6125) @@ -1080,8 +1080,24 @@ if filterRedirects is not None: blgen.request["gblfilterredir"] = filterRedirects and "redirects"\ or "nonredirects" - if followRedirects: #FIXME This doesn't work correctly - blgen.request["gblredirect"] = "" + if followRedirects: + # bug: see http://bugzilla.wikimedia.org/show_bug.cgi?id=16218 + # links identified by MediaWiki as redirects may not really be, + # so we have to check each "redirect" page and see if it + # really redirects to this page + blgen.request["gblfilterredir"] = "nonredirects" + redirgen = api.PageGenerator("backlinks", gbltitle=bltitle, + site=self, gblfilterredir="redirects") + if "gblnamespace" in blgen.request: + redirgen.request["gblnamespace"] = blgen.request["gblnamespace"] + genlist = [blgen] + for redir in redirgen: + if redir.getRedirectTarget() == page: + genlist.append( + self.pagebacklinks( + redir, True, None, namespaces)) + import itertools + return itertools.chain(*genlist) return blgen def page_embeddedin(self, page, filterRedirects=None, namespaces=None):

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

pywikibot December 2008