Revision: 4477
Author: russblau
Date: 2007-10-23 13:43:14 +0000 (Tue, 23 Oct 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/pywikipedia/catlib.py
trunk/pywikipedia/wikipedia.py
Modified: trunk/pywikipedia/catlib.py
===================================================================
--- trunk/pywikipedia/catlib.py 2007-10-23 13:34:30 UTC (rev 4476)
+++ trunk/pywikipedia/catlib.py 2007-10-23 13:43:14 UTC (rev 4477)
@@ -424,24 +424,30 @@
changesMade = False
if inPlace == True:
- text = article.get(nofollow_redirects=True)
- text = wikipedia.replaceCategoryInPlace(text, oldCat, newCat)
+ oldtext = article.get(nofollow_redirects=True)
+ newtext = wikipedia.replaceCategoryInPlace(oldtext, oldCat, newCat)
+ if newtext == oldtext:
+ wikipedia.output(
+ u'No changes in made in page %s.' % article.aslink())
+ return
try:
- article.put(text, comment)
+ article.put(newtext, comment)
except wikipedia.EditConflict:
- wikipedia.output(u'Skipping %s because of edit conflict' %
article.title())
+ wikipedia.output(
+ u'Skipping %s because of edit conflict' % article.aslink())
except wikipedia.LockedPage:
- wikipedia.output(u'Skipping locked page %s' % article.title())
+ wikipedia.output(u'Skipping locked page %s' % article.aslink())
except wikipedia.SpamfilterError, error:
- wikipedia.output(u'Changing page %s blocked by spam filter (URL=%s)'
- % (article.title(), error.url))
+ wikipedia.output(
+ u'Changing page %s blocked by spam filter (URL=%s)'
+ % (article.aslink(), error.url))
except wikipedia.NoUsername:
wikipedia.output(
- u"Page [[%s]] not saved; sysop privileges required."
- % article.title())
+ u"Page %s not saved; sysop privileges required."
+ % article.aslink())
except wikipedia.PageNotSaved, error:
- wikipedia.output(u"Saving page [[%s]] failed: %s"
- % (article.title(), error.message))
+ wikipedia.output(u"Saving page %s failed: %s"
+ % (article.aslink(), error.message))
return
# This loop will replace all occurrences of the category to be changed,
Modified: trunk/pywikipedia/wikipedia.py
===================================================================
--- trunk/pywikipedia/wikipedia.py 2007-10-23 13:34:30 UTC (rev 4476)
+++ trunk/pywikipedia/wikipedia.py 2007-10-23 13:43:14 UTC (rev 4477)
@@ -3106,7 +3106,7 @@
if title[0].isalpha() and not site.nocapitalize:
title = "[%s%s]" % (title[0].upper(), title[0].lower()) + title[1:]
# spaces and underscores in page titles are interchangeable, and collapsible
- title = title.replace(" ", "[ _]+")
+ title = title.replace(r"\ ", "[ _]+").replace(r"\_",
"[ _]+")
categoryR = re.compile(r'\[\[\s*(%s)\s*:\s*%s\s*((?:\|[^]]+)?\]\])'
% (catNamespace, title))
if newcat is None: