Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion social/strategies/django_strategy.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
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.translation import get_language

from social.strategies.base import BaseStrategy, BaseTemplateStrategy
Expand All @@ -30,7 +31,10 @@ def __init__(self, storage, request=None, tpl=None):
super(DjangoStrategy, self).__init__(storage, tpl)

def get_setting(self, name):
return getattr(settings, name)
value = getattr(settings, name)
if name.endswith('_URL'):
value = force_text(value)
return value

def request_data(self, merge=True):
if not self.request:
Expand Down