summaryrefslogtreecommitdiff
path: root/freebase/api/session.py
diff options
context:
space:
mode:
authoralecflett <alecflett@5914aa95-5b3a-0410-a3b5-7b719e7fe9b2>2009-09-08 16:11:27 +0000
committeralecflett <alecflett@5914aa95-5b3a-0410-a3b5-7b719e7fe9b2>2009-09-08 16:11:27 +0000
commitd494e6402768ca93ce50d5a02d1892d0443ab48d (patch)
tree4961ff2cb60afd90bd8320ae8c1fdcf6ba96011b /freebase/api/session.py
parenta601573915db159ee27a70446600f59b6de9cdbe (diff)
fix some unicode issues, and default to POST for mqlread
git-svn-id: http://freebase-python.googlecode.com/svn/trunk@212 5914aa95-5b3a-0410-a3b5-7b719e7fe9b2
Diffstat (limited to 'freebase/api/session.py')
-rw-r--r--freebase/api/session.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/freebase/api/session.py b/freebase/api/session.py
index 4b8ccfb..5457508 100644
--- a/freebase/api/session.py
+++ b/freebase/api/session.py
@@ -296,7 +296,8 @@ class HTTPMetawebSession(MetawebSession):
assert ct is not None
if form is not None:
- qstr = '&'.join(['%s=%s' % (urlencode_weak(unicode(k)), urlencode_weak(unicode(v)))
+ qstr = '&'.join(['%s=%s' % (urlencode_weak(unicode(k).encode('utf-8')),
+ urlencode_weak(unicode(v).encode('utf-8')))
for k,v in form.items()])
if method == 'POST':
# put the args on the url if we're putting something else
@@ -510,7 +511,7 @@ class HTTPMetawebSession(MetawebSession):
qstr = json.dumps(subq, separators=SEPARATORS)
- r = self._httpreq_json(service, form=dict(query=qstr))
+ r = self._httpreq_json(service, 'POST', form=dict(query=qstr))
for item in self._mqlresult(r):
yield item
@@ -538,7 +539,7 @@ class HTTPMetawebSession(MetawebSession):
Delayed(logformat, sq))
qstr = json.dumps(subq, separators=SEPARATORS)
- r = self._httpreq_json(service, form=dict(query=qstr))
+ r = self._httpreq_json(service, 'POST', form=dict(query=qstr))
return self._mqlresult(r)
@@ -563,7 +564,7 @@ class HTTPMetawebSession(MetawebSession):
Delayed(logformat, envelope))
qstr = json.dumps(envelope, separators=SEPARATORS)
- rs = self._httpreq_json(service, form=dict(queries=qstr))
+ rs = self._httpreq_json(service, 'POST', form=dict(queries=qstr))
self.log.info('%s result: %s',
service,