Fix Flickr attribute getter

diff --git a/example/settings.py b/example/settings.py
index 9a42bd2a3664348ab51927d6411ef93c9d59ecf6..70cf2ac48ed85ee4b4fd117d45196d4148553397 100644 (file)
--- a/example/settings.py
+++ b/example/settings.py
@@ -69,6 +69,7 @@ AUTHENTICATION_BACKENDS = (
     'social_auth.backends.google.GoogleBackend',
     'social_auth.backends.yahoo.YahooBackend',
     'social_auth.backends.contrib.linkedin.LinkedinBackend',
+    'social_auth.backends.contrib.flickr.FlickrBackend',
     'social_auth.backends.OpenIDBackend',
     'social_auth.backends.contrib.livejournal.LiveJournalBackend',
     'django.contrib.auth.backends.ModelBackend',

diff --git a/social_auth/backends/contrib/flickr.py b/social_auth/backends/contrib/flickr.py
index a7079ebf319b3311ba5bfd75dcd867923b5da0f0..e221bb426d4d9c064b9ae8efba50e35436d33889 100644 (file)
--- a/social_auth/backends/contrib/flickr.py
+++ b/social_auth/backends/contrib/flickr.py
@@ -39,7 +39,6 @@ class FlickrBackend(OAuthBackend):
 
     def get_user_details(self, response):
         """Return user details from Flickr account"""
-        print response
         return {USERNAME: response.get('id'),
                 'email': '',
                 'first_name': response.get('fullname')}
@@ -64,9 +63,13 @@ class FlickrAuth(ConsumerBasedOAuth):
         response = self.fetch_response(request)
         token = Token.from_string(response)
         params = parse_qs(response)
-        token.user_nsid = params['user_nsid'][0]
-        token.fullname = params['fullname'][0]
-        token.username = params['username'][0]
+
+        token.user_nsid = params['user_nsid'][0] if 'user_nsid' in params \
+                                                 else None
+        token.fullname = params['fullname'][0] if 'fullname' in params \
+                                               else None
+        token.username = params['username'][0] if 'username' in params \
+                                               else None
         return token
 
     def user_data(self, access_token):