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))