[Python-modules-commits] [python-social-auth] 100/322: Fix: REQUEST has been deprecated in Django 1.7, so we need to merge dictionaries

[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 e6456416106f3a51555e21b4eb93d2f34e240184
Author: Alejandro Baronetti <baroale at gmail.com>
Date:   Sat Feb 7 12:33:34 2015 +0000

    Fix: REQUEST has been deprecated in Django 1.7, so we need to merge dictionaries
---
 social/strategies/django_strategy.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/social/strategies/django_strategy.py b/social/strategies/django_strategy.py
index 6cc4365..0cc6a04 100644
--- a/social/strategies/django_strategy.py
+++ b/social/strategies/django_strategy.py
@@ -36,7 +36,8 @@ class DjangoStrategy(BaseStrategy):
         if not self.request:
             return {}
         if merge:
-            data = self.request.REQUEST
+            data = self.request.GET
+            data.update(self.request.POST)
         elif self.request.method == 'POST':
             data = self.request.POST
         else:

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