Merge f816a34 into cbe87f4

src/commons/config/appinfo.py

@@ -1,5 +1,4 @@
 import googleapiclient.discovery
-import httplib2
 from oauth2client.client import GoogleCredentials
 
 from src.commons.config.configuration import configuration
@@ -9,12 +8,11 @@ class AppInfo(object):
 
     def __init__(self):
         self.app_id = configuration.backup_project_id
-        self.http = self.__create_http()
         self.service = googleapiclient.discovery.build(
             'appengine',
             'v1',
-            credentials=GoogleCredentials.get_application_default(),
-            http=self.http,
+            credentials=self._create_credentials(),
+            http=self._create_http(),
         )
 
     def get_location(self):
@@ -23,5 +21,9 @@ def get_location(self):
         return "EU" if location_id.startswith("europe") else "US"
 
     @staticmethod
-    def __create_http():
-        return httplib2.Http(timeout=60)
+    def _create_credentials():
+        return GoogleCredentials.get_application_default()
+
+    @staticmethod
+    def _create_http():
+        return None