summaryrefslogtreecommitdiff
path: root/freebase
diff options
context:
space:
mode:
authoralecflett <alecflett@5914aa95-5b3a-0410-a3b5-7b719e7fe9b2>2010-05-11 23:23:27 +0000
committeralecflett <alecflett@5914aa95-5b3a-0410-a3b5-7b719e7fe9b2>2010-05-11 23:23:27 +0000
commit51b797b8aaebb976499a324b16c404e08590cd46 (patch)
tree61eb46ce339f4c6ced5a8c10139d22f177c6d60f /freebase
parent989509c7f7a17880f714892c40f8ca8c32ad06c7 (diff)
patch to support arbitrary headers from tyler
git-svn-id: http://freebase-python.googlecode.com/svn/trunk@244 5914aa95-5b3a-0410-a3b5-7b719e7fe9b2
Diffstat (limited to 'freebase')
-rw-r--r--freebase/api/session.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/freebase/api/session.py b/freebase/api/session.py
index 48bcdb8..7801e4c 100644
--- a/freebase/api/session.py
+++ b/freebase/api/session.py
@@ -574,7 +574,7 @@ class HTTPMetawebSession(MetawebSession):
return self._httpreq_json(service, 'POST', form=form)
- def mqlreaditer(self, sq, asof=None):
+ def mqlreaditer(self, sq, asof=None, headers=None):
"""read a structure query."""
cursor = True
@@ -592,7 +592,7 @@ class HTTPMetawebSession(MetawebSession):
qstr = json.dumps(subq, separators=SEPARATORS)
- r = self._httpreq_json(service, 'POST', form=dict(query=qstr))
+ r = self._httpreq_json(service, 'POST', form=dict(query=qstr), headers=headers)
for item in self._mqlresult(r):
yield item
@@ -603,7 +603,7 @@ class HTTPMetawebSession(MetawebSession):
else:
return
- def mqlread(self, sq, asof=None):
+ def mqlread(self, sq, asof=None, headers=None):
"""read a structure query. For a more complete description,
see http://www.freebase.com/view/en/api_service_mqlread"""
subq = dict(query=sq, escape=False)
@@ -620,11 +620,11 @@ class HTTPMetawebSession(MetawebSession):
Delayed(logformat, sq))
qstr = json.dumps(subq, separators=SEPARATORS)
- r = self._httpreq_json(service, 'POST', form=dict(query=qstr))
+ r = self._httpreq_json(service, 'POST', form=dict(query=qstr), headers=headers)
return self._mqlresult(r)
- def mqlreadmulti(self, queries, asof=None):
+ def mqlreadmulti(self, queries, asof=None, headers=None):
"""read a structure query"""
keys = [('q%d' % i) for i,v in enumerate(queries)];
envelope = {}
@@ -645,7 +645,7 @@ class HTTPMetawebSession(MetawebSession):
Delayed(logformat, envelope))
qstr = json.dumps(envelope, separators=SEPARATORS)
- rs = self._httpreq_json(service, 'POST', form=dict(queries=qstr))
+ rs = self._httpreq_json(service, 'POST', form=dict(queries=qstr), headers=headers)
self.log.info('%s result: %s',
service,