Revision: 8024
Author: xqt
Date: 2010-03-18 14:27:48 +0000 (Thu, 18 Mar 2010)
Log Message:
-----------
Do not yield a page in logpages() if
result['query']['logevents'][index].has_key('actionhidden')
Modified Paths:
--------------
trunk/pywikipedia/wikipedia.py
Modified: trunk/pywikipedia/wikipedia.py
===================================================================
--- trunk/pywikipedia/wikipedia.py 2010-03-18 07:16:02 UTC (rev 8023)
+++ trunk/pywikipedia/wikipedia.py 2010-03-18 14:27:48 UTC (rev 8024)
@@ -4027,8 +4027,8 @@
# TODO: why isn't this a Site method?
pages = list(pages) # if pages is an iterator, we need to make it a list
output(u'Getting %d pages from %s' % (len(pages), site), newline=False)
- #if site.has_api():
- # output(u' via API', newline=False)
+ if site.has_api() and debug:
+ output(u' via API', newline=False)
output(u'...')
limit = config.special_page_limit / 4 # default is 500/4, but It might have good
point for server.
if len(pages) > limit:
@@ -4935,7 +4935,7 @@
if config.retry_on_fail:
retry_attempt += 1
if retry_attempt > config.maxretries:
- raise ServerError()
+ raise MaxTriesExceededError()
output(u"""WARNING: Could not open
'%s'.\nMaybe the server is down. Retrying in %i minutes..."""
% (url, retry_idle_time))
time.sleep(retry_idle_time * 60)
@@ -5703,7 +5703,8 @@
output('%s' % result)
raise Error
for c in result['query']['logevents']:
- if not namespace or c['ns'] in namespace:
+ if (not namespace or c['ns'] in namespace) and \
+ not c.has_key('actionhidden'):
yield (Page(self, c['title'],
defaultNamespace=c['ns']),
c['user'],
parsetime2stamp(c['timestamp']),
Show replies by date