Revision: 7645
Author: misza13
Date: 2009-11-14 07:52:27 +0000 (Sat, 14 Nov 2009)
Log Message:
-----------
Revert of r7643 - causes "TypeError: argument of type 'NoneType' is not
iterable" in the "if k not in self._cookies" line.
Modified Paths:
--------------
trunk/pywikipedia/wikipedia.py
Modified: trunk/pywikipedia/wikipedia.py
===================================================================
--- trunk/pywikipedia/wikipedia.py 2009-11-13 17:06:59 UTC (rev 7644)
+++ trunk/pywikipedia/wikipedia.py 2009-11-14 07:52:27 UTC (rev 7645)
@@ -5237,10 +5237,7 @@
if os.path.exists(localPa):
#read and dump local logindata into self._cookies[index]
- for k, v in self._readCookies(localFn).iteritems():
- if k not in self._cookies[index]:
- self._cookies[index][k] = v
-
+ self._cookies[index] =
query.CombineParams(self._cookies[index], self._readCookies(localFn))
elif not os.path.exists(localPa) and not
self.family.cross_projects:
#keep anonymous mode if not login and centralauth not enable
self._cookies[index] = None
_______________________________________________
Pywikipedia-svn mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/pywikipedia-svn
