From e3f1b7b396ef38fc97df70bd559692f87e3de6cd Mon Sep 17 00:00:00 2001 From: tschmidt Date: Mon, 16 Jan 2012 17:58:29 -0800 Subject: [PATCH] fixed WHITE_LISTED_DOMAINS default setting and exception handling --- social_auth/backends/google.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/social_auth/backends/google.py b/social_auth/backends/google.py index a29ca54..b81acc7 100644 --- 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'] -- 2.39.5