Add handling for MozillaCookieJar for persistence

diff --git a/simplemediawiki.py b/simplemediawiki.py
index 71bc4fd940f9e5538a28a9dcddc39f9f4666bf0c..99284c74a5994c651e9a549fe8feea829db12890 100644 (file)
--- a/simplemediawiki.py
+++ b/simplemediawiki.py
@@ -46,13 +46,22 @@ class MediaWiki():
 
     api_url: URL to api.php (usually similar to http://example.com/w/api.php)
     """
 
     api_url: URL to api.php (usually similar to http://example.com/w/api.php)
     """

-    _cj = cookielib.CookieJar()

     _high_limits = None
     _namespaces = None
     _psuedo_namespaces = None
 
     _high_limits = None
     _namespaces = None
     _psuedo_namespaces = None
 

-    def __init__(self, api_url):
+    def __init__(self, api_url, cookie_file=None):

         self._api_url = api_url
         self._api_url = api_url

+        if cookie_file:
+            self._cj = cookielib.MozillaCookieJar(cookie_file)
+            try:
+                self._cj.load()
+            except IOError:
+                self._cj.save()
+                self._cj.load()
+        else:
+            self._cj = cookielib.CookieJar()
+        self._opener = urllib2.build_opener(urllib2.HTTPCookieProcessor(self._cj))

 
     def call(self, params):
         """
 
     def call(self, params):
         """


@@ -60,10 +69,11 @@ class MediaWiki():
         returned by the API.
         """
         params['format'] = 'json'
         returned by the API.
         """
         params['format'] = 'json'

-        opener = urllib2.build_opener(urllib2.HTTPCookieProcessor(self._cj))

         request = urllib2.Request(self._api_url, urllib.urlencode(params))
         request.add_header('Accept-encoding', 'gzip')
         request = urllib2.Request(self._api_url, urllib.urlencode(params))
         request.add_header('Accept-encoding', 'gzip')

-        response = opener.open(request)
+        response = self._opener.open(request)
+        if isinstance(self._cj, cookielib.MozillaCookieJar):
+            self._cj.save()

         if response.headers.get('Content-Encoding') == 'gzip':
             compressed = StringIO(response.read())
             gzipper = gzip.GzipFile(fileobj=compressed)
         if response.headers.get('Content-Encoding') == 'gzip':
             compressed = StringIO(response.read())
             gzipper = gzip.GzipFile(fileobj=compressed)