add permission_of to upload, and fix a bug with error handling

git-svn-id: http://freebase-python.googlecode.com/svn/trunk@51 5914aa95-5b3a-0410-a3b5-7b719e7fe9b2

1 files changed, 7 insertions, 2 deletions

diff --git a/freebase-api/freebase/api/session.py b/freebase-api/freebase/api/session.py
index 3d96ddd..1492f7c 100644
--- a/freebase-api/freebase/api/session.py
+++ b/freebase-api/freebase/api/session.py
@@ -214,7 +214,7 @@ class HTTPMetawebSession(MetawebSession):
         else:
             self.cookiejar = self._default_cookiejar
 
-        self._http_request = http_client(self.cookiejar)
+        self._http_request = http_client(self.cookiejar, self._raise_service_error)
 
 
     def open_cookie_file(self, cookiefile=None):
@@ -529,7 +529,7 @@ class HTTPMetawebSession(MetawebSession):
     def touch(self):
         return self.mqlflush()
 
-    def upload(self, body, content_type, document_id=False):
+    def upload(self, body, content_type, document_id=False, permission_of=False):
         """upload to the metaweb"""
 
         service = '/api/service/upload'
@@ -548,6 +548,11 @@ class HTTPMetawebSession(MetawebSession):
                 form = { 'document': '' }
             else:
                 form = { 'document': document_id }
+        if permission_of is not False:
+            if form:
+                form['permission_of'] = permission_of
+            else:
+                form = { 'permission_of' : permission_of }
 
         # note the use of both body and form.
         #  form parameters get encoded into the URL in this case