CLOUDSTACK-2652: requests module differs on Python 2.6

Prasanna Santhanam · Prasanna Santhanam · commit ed2ce2737133 · 2013-05-24T19:22:49.000+05:30
On 2.6 response.json returns the JSOn in the response while on 2.7
response.json() is a method. Since Marvin installs on both platforms
fixing the error appropriately

Signed-off-by: Prasanna Santhanam &lt;tsp@apache.org&gt;
diff --git a/tools/marvin/marvin/cloudstackConnection.py b/tools/marvin/marvin/cloudstackConnection.py
@@ -219,7 +219,10 @@ def marvin_request(self, cmd, response_type=None, method='GET'):
             cmdname, self.auth, payload=payload, method=method)
         self.logging.debug("Request: %s Response: %s" %
                            (response.url, response.text))
-        response = jsonHelper.getResultObj(response.json(), response_type)
+        try:
+            response = jsonHelper.getResultObj(response.json(), response_type)
+        except TypeError:
+            response = jsonHelper.getResultObj(response.json, response_type)
 
         if isAsync == "false":
             return response
