Revision: 7797
Author: xqt
Date: 2009-12-18 17:24:46 +0000 (Fri, 18 Dec 2009)
Log Message:
-----------
use wikipedia.output() and fetch it from the log
Modified Paths:
--------------
trunk/pywikipedia/maintenance/wikimedia_sites.py
Modified: trunk/pywikipedia/maintenance/wikimedia_sites.py
===================================================================
--- trunk/pywikipedia/maintenance/wikimedia_sites.py 2009-12-18 13:17:47 UTC (rev 7796)
+++ trunk/pywikipedia/maintenance/wikimedia_sites.py 2009-12-18 17:24:46 UTC (rev 7797)
@@ -42,10 +42,10 @@
new.append(lang)
if original == new:
- print 'The lists match!'
+ wikipedia.output(u'The lists match!')
else:
- print "The lists don't match, the new list is:"
- print ' self.languages_by_size = ['
+ wikipedia.output(u"The lists don't match, the new list is:")
+ wikipedia.output(u' self.languages_by_size = [')
line = ' '
index = 0
for lang in new:
@@ -54,9 +54,9 @@
line += u' '
line += u"'%s'," % lang
if index == 10:
- print line
+ wikipedia.output(u'%s' % line)
line = ' '
index = 0
if index > 0:
- print line
- print ' ]'
+ wikipedia.output(u'%s' % line)
+ wikipedia.output(u' ]')
Revision: 7795
Author: xqt
Date: 2009-12-18 12:04:54 +0000 (Fri, 18 Dec 2009)
Log Message:
-----------
increase idle time for gateway timeouts
Modified Paths:
--------------
trunk/pywikipedia/wikipedia.py
Modified: trunk/pywikipedia/wikipedia.py
===================================================================
--- trunk/pywikipedia/wikipedia.py 2009-12-18 11:24:00 UTC (rev 7794)
+++ trunk/pywikipedia/wikipedia.py 2009-12-18 12:04:54 UTC (rev 7795)
@@ -5810,6 +5810,7 @@
% (url, retry_idle_time))
time.sleep(retry_idle_time * 60)
# Next time wait longer, but not longer than half an hour
+ retry_idle_time *= 2
if retry_idle_time > 30:
retry_idle_time = 30
continue
@@ -5823,7 +5824,6 @@
output(u"""WARNING: Could not open '%s'. Maybe the server or\n your connection is down. Retrying in %i minutes..."""
% (url, retry_idle_time))
time.sleep(retry_idle_time * 60)
- # Next time wait longer, but not longer than half an hour
retry_idle_time *= 2
if retry_idle_time > 30:
retry_idle_time = 30
@@ -5953,6 +5953,7 @@
% (url, retry_idle_time))
time.sleep(retry_idle_time * 60)
# Next time wait longer, but not longer than half an hour
+ retry_idle_time *= 2
if retry_idle_time > 30:
retry_idle_time = 30
continue