Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

2012-08-08 11:47:08 -04:00 · 2012-08-08 11:47:08 -04:00 · aacf65cca6
commit aacf65cca6
parent 61e38381af 9510c1a295
1 changed files with 0 additions and 1 deletions
--- a/python_apps/api_clients/api_client.py
+++ b/python_apps/api_clients/api_client.py
@ -345,7 +345,6 @@ class AirtimeApiClient():

            response = self.get_response_from_server(req)
            logger.info("update media %s, filepath: %s, mode: %s", response, md['MDATA_KEY_FILEPATH'], mode)
-            response = json.loads(response)
            try: response = json.loads(response)
            except ValueError:
                logger.info("Could not parse json from response: '%s'" % response)