Changeset 5445 for ndgCommon/trunk/ndg/common/src/clients/http/generichttpclient.py

Timestamp:

01/07/09 16:06:34 (12 years ago)

Author:

cbyrom

Message:

Extend generichttpclient to allow http method to be set on request +
update vocabserverclient to do a PUT request following a POST one
should an update already have been ran on a particular term - to allow
this update to be overwritten.

File:

• ndgCommon/trunk/ndg/common/src/clients/http/generichttpclient.py (modified) (4 diffs)

ndgCommon/trunk/ndg/common/src/clients/http/generichttpclient.py

@@ -8 +8 @@
 from ndg.common.src.lib.utilities import httpify
             
+VALID_HTTP_METHODS = ['POST', 'PUT', 'GET', 'DELETE']            
 class GenericHTTPClient(object):
     ''' 
@@ -30 +31 @@
 
         
-    def readURL(self, url, payload = None, headersDict = None):
+    def readURL(self, url, payload = None, headersDict = None, httpMethod = 'GET'):
         '''
         Retrieve contents of url - or raise IOError if a problem is found
@@ -36 +37 @@
         @keyword payload: data to POST in the request 
         @keyword headersDict: dict with headers info to use in the request 
+        @keyword httpMethod: method to use with http - either GET, PUT, POST or DELETE.  
+        Default = 'GET' 
         @raise IOError if problem experienced whilst opening url
         @return contents of url 
@@ -49 +52 @@
             
         request=urllib2.Request(url, **inputs)
+        
+        if httpMethod not in VALID_HTTP_METHODS:
+            raise ValueError("Unrecognised http method, '%s'" %httpMethod)
+            
+        request.get_method = lambda: httpMethod
+        
         response='Cannot obtain remote file: '
         try: