fixed WHITE_LISTED_DOMAINS default setting and exception handling

diff --git a/social_auth/backends/google.py b/social_auth/backends/google.py
index a29ca54bbbcaf9e94a00534015b031b70ea67fb4..b81acc7c5dcac35b977eed4978b569b0b204ada9 100644 (file)
--- a/social_auth/backends/google.py
+++ b/social_auth/backends/google.py
@@ -47,7 +47,7 @@ GOOGLE_OPENID_URL = 'https://www.google.com/accounts/o8/id'
 EXPIRES_NAME = getattr(settings, 'SOCIAL_AUTH_EXPIRATION', 'expires')
 
 # white-listed domains (else accept all)
-WHITE_LISTED_DOMAINS = getattr(settings, 'WHITE_LISTED_DOMAINS', None)
+WHITE_LISTED_DOMAINS = getattr(settings, 'WHITE_LISTED_DOMAINS', [])
 
 # Backends
 class GoogleOAuthBackend(OAuthBackend):
@@ -87,7 +87,7 @@ class GoogleBackend(OpenIDBackend):
         import re
         for domain in WHITE_LISTED_DOMAINS: 
             if not re.search(domain, details['email']):
-                raise Exception, 'INVALID DOMAIN'
+                raise ValueError('INVALID DOMAIN')
 
         return details['email']