projects
/
mw
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Nix warning on edit collision since we do that now
[mw]
/
src
/
mw
/
api.py
diff --git
a/src/mw/api.py
b/src/mw/api.py
index 59a3947a81f33a45f7c0ac5c494b33473efcca97..6aec91c7b36a72353b328c2872e9da0b4882865b 100644
(file)
--- a/
src/mw/api.py
+++ b/
src/mw/api.py
@@
-19,6
+19,9
@@
import cookielib
import gzip
import json
import cookielib
import gzip
import json
+import mw
+import mw.metadir
+import os
from StringIO import StringIO
import urllib
import urllib2
from StringIO import StringIO
import urllib
import urllib2
@@
-26,18
+29,28
@@
import urllib2
class API(object):
class API(object):
- def __init__(self, api_url):
+ def __init__(self, api_url
, metadir
):
self.api_url = api_url
self.api_url = api_url
- self.cookiejar = cookielib.CookieJar()
+ self.metadir = metadir
+ self.cookiejar = cookielib.MozillaCookieJar(os.path.join(
+ self.metadir.location, 'cookies'))
+ try:
+ self.cookiejar.load()
+ except IOError:
+ self.cookiejar.save()
+ self.cookiejar.load()
self.opener = urllib2.build_opener(
urllib2.HTTPCookieProcessor(self.cookiejar))
self._high_limits = None
def call(self, data):
data['format'] = 'json'
self.opener = urllib2.build_opener(
urllib2.HTTPCookieProcessor(self.cookiejar))
self._high_limits = None
def call(self, data):
data['format'] = 'json'
- request = urllib2.Request(self.api_url, urllib.urlencode(data))
+ user_agent = 'mw/%s +http://github.com/ianweller/mw' % mw.version
+ request = urllib2.Request(self.api_url, urllib.urlencode(data),
+ {'User-Agent': user_agent})
request.add_header('Accept-encoding', 'gzip')
response = self.opener.open(request)
request.add_header('Accept-encoding', 'gzip')
response = self.opener.open(request)
+ self.cookiejar.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)
Benjamin Mako Hill
||
Want to submit a patch?