[Python-modules-commits] [python-social-auth] 215/322: Merge branch 'django_reverse_lazy_settings' of https://github.com/frankier/python-social-auth into frankier-django_reverse_lazy_settings

[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 727b713b3770212b7bb745fb9668b6464767b4af
Merge: 84d72fa fc949b7
Author: Matías Aguirre <matiasaguirre at gmail.com>
Date:   Thu Apr 2 20:25:08 2015 -0300

    Merge branch 'django_reverse_lazy_settings' of https://github.com/frankier/python-social-auth into frankier-django_reverse_lazy_settings
    
    Conflicts:
    	social/strategies/django_strategy.py

 social/strategies/django_strategy.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --cc social/strategies/django_strategy.py
index 0f48368,c738dd5..7e80f03
--- a/social/strategies/django_strategy.py
+++ b/social/strategies/django_strategy.py
@@@ -5,6 -5,8 +5,8 @@@ from django.contrib.contenttypes.model
  from django.contrib.auth import authenticate
  from django.shortcuts import redirect
  from django.template import TemplateDoesNotExist, RequestContext, loader
 -from django.utils.datastructures import MergeDict
+ from django.utils.encoding import force_text
++from django.utils.functional import Promise
  from django.utils.translation import get_language
  
  from social.strategies.base import BaseStrategy, BaseTemplateStrategy
@@@ -29,7 -31,10 +31,11 @@@ class DjangoStrategy(BaseStrategy)
          super(DjangoStrategy, self).__init__(storage, tpl)
  
      def get_setting(self, name):
-         return getattr(settings, name)
+         value = getattr(settings, name)
 -        if name.endswith('_URL'):
++        # Force text on URL named settings that are instance of Promise
++        if name.endswith('_URL') and isinstance(value, Promise):
+             value = force_text(value)
+         return value
  
      def request_data(self, merge=True):
          if not self.request:

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