Google API cleanup. Dont use cache due to import error.

googleapis/google-api-python-client#299

main/lib/admin.py

@@ -24,7 +24,7 @@ def __new__(cls):
         if not c:
             return NoopAdminDirectory()
         instance.directory = googleapiclient.discovery.build(
-            'admin', 'directory_v1', credentials=c)
+            'admin', 'directory_v1', credentials=c, cache_discovery=False)
         if not instance.directory:
             return NoopAdminDirectory()
         return instance

main/lib/gcal.py

@@ -1,5 +1,6 @@
 import dateutil.parser
 import googleapiclient.discovery
+import googleapiclient.errors
 from google.auth.exceptions import GoogleAuthError
 from django.conf import settings
 from django.utils import timezone
@@ -71,7 +72,7 @@ def sync_event(self, bamru_event, save=True):
                     body=build_gcal_event(bamru_event),
                 ).execute()
                 bamru_event.gcal_id = new_event['id']
-            except GoogleAuthError as e:
+            except (googleapiclient.errors.HttpError, GoogleAuthError) as e:
                 logger.error("Gcal create error " + str(e))
         else:
             bamru_event.gcal_id = None
@@ -86,7 +87,7 @@ def delete_for_event(self, bamru_event, save=True):
                     calendarId=self.calendar_id,
                     eventId=bamru_event.gcal_id,
                 ).execute()
-            except GoogleAuthError as e:
+            except (googleapiclient.errors.HttpError, GoogleAuthError) as e:
                 logger.error("Gcal delete error " + str(e))
             bamru_event.gcal_id = None
 
@@ -164,5 +165,5 @@ def get_gcal_manager(fallback_manager=NoopGcalManager()):
         return fallback_manager
 
     client = googleapiclient.discovery.build(
-        'calendar', 'v3', credentials=creds)
+        'calendar', 'v3', credentials=creds, cache_discovery=False)
     return GcalManager(client, settings.GOOGLE_CALENDAR_ID)

main/lib/gdrive.py

@@ -27,7 +27,7 @@ def __new__(cls):
         if not c:
             return NoopGoogleDrive()
         instance.drive = googleapiclient.discovery.build(
-            'drive', 'v3', credentials=c)
+            'drive', 'v3', credentials=c, cache_discovery=False)
         if not instance.drive:
             return NoopGoogleDrive()
         return instance

main/lib/groups.py

@@ -35,7 +35,7 @@ def __new__(cls, name):
         if not c:
             return NoopGoogleGroup()
         admin = googleapiclient.discovery.build(
-            'admin', 'directory_v1', credentials=c)
+            'admin', 'directory_v1', credentials=c, cache_discovery=False)
         if not name or not admin:
             return NoopGoogleGroup()
         instance.members = admin.members()

main/models/member.py

@@ -214,6 +214,8 @@ def _google_profile_info(self):
         return data
 
     def profile_email_to_email_set(self):
+        if not self.profile_email:
+            return  # Nothing to do
         email = self.email_set.filter(address__iexact=self.profile_email)
         if email:
             email.pagable = True