Permalink
Browse files

Merge remote branch 'upstream/master'

  • Loading branch information...
Stas Kravets
Stas Kravets committed Apr 30, 2011
2 parents aabb618 + 1de2915 commit 23bc1e2a726088124c96833ceb49d048fc35fcc0
Showing with 5 additions and 5 deletions.
  1. +2 −2 setup.py
  2. +1 −1 social_auth/__init__.py
  3. +2 −2 social_auth/backends/__init__.py
@@ -29,7 +29,7 @@ def long_description():
author='Matías Aguirre',
author_email='matiasaguirre@gmail.com',
description='Django social authentication made simple.',
license='GPL',
license='BSD',
keywords='django, openid, oauth, social auth, application',
url='https://github.com/omab/django-social-auth',
packages=['social_auth',
@@ -41,7 +41,7 @@ def long_description():
classifiers=['Framework :: Django',
'Development Status :: 4 - Beta',
'Topic :: Internet',
'License :: OSI Approved :: GNU General Public License (GPL)',
'License :: OSI Approved :: BSD License',
'Intended Audience :: Developers',
'Environment :: Web Environment',
'Programming Language :: Python :: 2.5',
@@ -2,5 +2,5 @@
Django-social-auth application, allows OpenId or OAuth user
registration/authentication just adding a few configurations.
"""
version = (0, 3, 14)
version = (0, 3, 15)
__version__ = '.'.join(map(str, version))
@@ -138,7 +138,7 @@ def authenticate(self, *args, **kwargs):
# would imply update user references on other apps, that's too
# much intrusive
if 'user' in kwargs and kwargs['user'] != social_user.user:
raise ValueError('Account already in use.')
raise ValueError('Account already in use.', social_user)
user = social_user.user

# Update user account data.
@@ -292,7 +292,7 @@ def extra_data(self, user, uid, response, details):
extra_data field"""
data = {'access_token': response.get('access_token', '')}
name = self.name.replace('-', '_').upper()
names = self.EXTRA_DATA or [] + _setting(name + '_EXTRA_DATA', [])
names = (self.EXTRA_DATA or []) + _setting(name + '_EXTRA_DATA', [])
data.update((alias, response.get(name)) for name, alias in names)
return data

0 comments on commit 23bc1e2

Please sign in to comment.