Revision: 6052
Author: a_engels
Date: 2008-11-03 07:39:18 +0000 (Mon, 03 Nov 2008)
Log Message:
-----------
fixing [ 2208999 ] yo.wiki incorrectly throws NoPage errors
Modified Paths:
--------------
trunk/pywikipedia/wikipedia.py
Modified: trunk/pywikipedia/wikipedia.py
===================================================================
--- trunk/pywikipedia/wikipedia.py 2008-11-03 06:59:10 UTC (rev 6051)
+++ trunk/pywikipedia/wikipedia.py 2008-11-03 07:39:18 UTC (rev 6052)
@@ -792,7 +792,7 @@
# another form
RversionTab = re.compile(self.site().family.RversionTab(self.site().language()))
else:
- RversionTab = re.compile(r'<li id="ca-history"><a href=".*?title=.*?&action=history".*?>.*?</a></li>')
+ RversionTab = re.compile(r'<li id="ca-history"><a href=".*?title=.*?&action=history".*?>.*?</a></li>', re.DOTALL)
matchVersionTab = RversionTab.search(text)
if not matchVersionTab:
raise NoPage(self.site(), self.aslink(forceInterwiki = True))
@@ -5264,13 +5264,18 @@
while True:
api_url = self.api_address()
startEncoded = urllib.quote(start.encode(self.encoding()))
- api_url += 'action=query&format=xml&list=allpages&apfrom=%s&aplimit=%i&apnamespace=%i' % (startEncoded, config.special_page_limit, namespace)
+ api_url += 'action=query&format=xml&list=allpages&apfrom=%s&aplimit=%i&apnamespace=%i' % (startEncoded, 10, namespace)
+ #api_url += 'action=query&format=xml&list=allpages&apfrom=%s&aplimit=%i&apnamespace=%i' % (startEncoded, config.special_page_limit, namespace)
# TODO: support includeredirects="only" like in the old method
if not includeredirects:
api_url += '&apfilterredir=nonredirects'
if throttle:
get_throttle()
+ f = codecs.open('url.txt', 'w', 'utf-8')
+ f.write(api_url)
+ f.close()
+ output(api_url)
text = self.getUrl(api_url)
soup = BeautifulSoup(text,