[Python-modules-commits] [python-social-auth] 181/322: Start pipeline with default details arg

[Wolfgang Borgert]

This is an automated email from the git hooks/post-receive script.

debacle pushed a commit to tag v0.2.10
in repository python-social-auth.

commit 1208387d7e6e24172a175f28299380916b275f91
Author: Johannes <johtso at gmail.com>
Date:   Thu Mar 19 19:01:30 2015 +0000

    Start pipeline with default details arg
    
    Fixes #555
---
 social/backends/base.py        | 1 +
 social/pipeline/social_auth.py | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/social/backends/base.py b/social/backends/base.py
index 4b5c666..bceebb6 100644
--- a/social/backends/base.py
+++ b/social/backends/base.py
@@ -103,6 +103,7 @@ class BaseAuth(object):
         out.setdefault('strategy', self.strategy)
         out.setdefault('backend', out.pop(self.name, None) or self)
         out.setdefault('request', self.strategy.request_data())
+        out.setdefault('details', {})
 
         for idx, name in enumerate(pipeline):
             out['pipeline_index'] = pipeline_index + idx
diff --git a/social/pipeline/social_auth.py b/social/pipeline/social_auth.py
index 90aae64..b790870 100644
--- a/social/pipeline/social_auth.py
+++ b/social/pipeline/social_auth.py
@@ -2,8 +2,8 @@ from social.exceptions import AuthAlreadyAssociated, AuthException, \
                               AuthForbidden
 
 
-def social_details(backend, response, *args, **kwargs):
-    return {'details': backend.get_user_details(response)}
+def social_details(backend, details, response, *args, **kwargs):
+    return {'details': dict(backend.get_user_details(response), **details)}
 
 
 def social_uid(backend, details, response, *args, **kwargs):

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-social-auth.git