From: Ross Jones <ross@servercode.co.uk>
Date: Fri, 11 Oct 2013 15:02:13 +0000
Subject: Tidy up
X-Git-Url: http://maxious.lambdacomplex.org/git/?p=ckanext-ga-report.git&a=commitdiff&h=468c6046de585364e0e567316f5bdf1f193b2b9f
---
Tidy up
---


--- a/ckanext/ga_report/download_analytics.py
+++ b/ckanext/ga_report/download_analytics.py
@@ -264,8 +264,8 @@
                 'Google Analytics token file under key: googleanalytics.token.filepath'
             return
 
-        try:
-            log.info("Trying to refresh our OAuth token")
+        log.info("Trying to refresh our OAuth token")
+        try:
             self.token, svc = init_service(ga_token_filepath, None)
             log.info("OAuth token refreshed")
         except Exception, auth_exception:
@@ -277,9 +277,9 @@
             headers = {'authorization': 'Bearer ' + self.token}
             r = requests.get("https://www.googleapis.com/analytics/v3/data/ga", params=params, headers=headers)
             if r.status_code != 200:
-              log.info("STATUS: %s" % (r.status_code,))
-              log.info("CONTENT: %s" % (r.content,))
-              raise Exception("Request with params: %s failed" % params)
+                log.info("STATUS: %s" % (r.status_code,))
+                log.info("CONTENT: %s" % (r.content,))
+                raise Exception("Request with params: %s failed" % params)
 
             return json.loads(r.content)
         except Exception, e: