Added version-safe method for getting json from responses

Author: Mark Johnson

btsyncindicator.py

@@ -251,7 +251,7 @@ def setup_session(self):
                params = {'token': self.token, 'action': a}
                response = requests.get(self.urlroot, params=params, cookies=self.cookies, auth=self.auth)
                response.raise_for_status()
-               self.info[a] = response.json()
+               self.info[a] = self.get_response_json(response)
 
             self.clear_error()
 
@@ -309,7 +309,7 @@ def check_status(self):
 
             self.clear_error()
 
-            status = response.json()
+            status = self.get_response_json(response)
 
             for folder in status['folders']:
                folder['name'] = self.fix_encoding(folder['name'])
@@ -641,6 +641,17 @@ def get_response_text(self, response):
         """
         return response.text if hasattr(response, "text") else response.content
 
+    def get_response_json(self, response):
+	"""
+	Version-safe way to parse json from request module response object
+	The version in the Ubuntu 12.04 LTS repositories doesnt have .json() 
+	"""
+	try:
+	    response_json = response.json()
+	except AttributeError:
+	    response_json = json.loads(self.get_response_text(response))
+	return response_json
+
     def fix_encoding(self, text):
         return text.encode('latin-1').decode('utf-8')