Merge lp:~nataliabidart/django-oauth-backend/django-1.7-1.8 into lp:django-oauth-backend

[Natalia Bidart]

- Migration to support Django 1.4-1.8.

[lp:~nataliabidart/django-oauth-backend/django-1.7-1.8]

22. By Natalia Bidart on 2015-04-23

Fixed lint issues.

[lp:~nataliabidart/django-oauth-backend/django-1.7-1.8]

23. By Natalia Bidart on 2015-04-24

Applied changes from review.

[Ricardo Kirkner (ricardokirkner)]

Great stuff, thanks!

review: Approve

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2015-04-24 18:37:20 +0000
@@ -0,0 +1,1 @@
+.tox

=== added directory 'demo'
=== added file 'demo/__init__.py'
=== added file 'demo/settings.py'
--- demo/settings.py	1970-01-01 00:00:00 +0000
+++ demo/settings.py	2015-04-24 18:37:20 +0000
@@ -0,0 +1,91 @@
+"""
+Django settings for demo project.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/1.7/topics/settings/
+
+For the full list of settings and their values, see
+https://docs.djangoproject.com/en/1.7/ref/settings/
+"""
+
+# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
+import os
+import django
+
+BASE_DIR = os.path.dirname(os.path.dirname(__file__))
+
+
+# Quick-start development settings - unsuitable for production
+# See https://docs.djangoproject.com/en/1.7/howto/deployment/checklist/
+
+# SECURITY WARNING: keep the secret key used in production secret!
+SECRET_KEY = '5x!r)iz$_*xg$)x=r$!5(%e+cmfe93jcx^k!im6k5(z67nm2l('
+
+# SECURITY WARNING: don't run with debug turned on in production!
+DEBUG = True
+
+TEMPLATE_DEBUG = True
+
+ALLOWED_HOSTS = []
+
+
+# Application definition
+
+INSTALLED_APPS = (
+    'django.contrib.admin',
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.messages',
+    'django.contrib.staticfiles',
+    'oauth_backend',
+)
+
+MIDDLEWARE_CLASSES = [
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.common.CommonMiddleware',
+    'django.middleware.csrf.CsrfViewMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
+    'django.middleware.clickjacking.XFrameOptionsMiddleware',
+]
+
+if django.VERSION < (1, 7):
+    INSTALLED_APPS += ('south',)
+    MIDDLEWARE_CLASSES.remove(
+        'django.contrib.auth.middleware.SessionAuthenticationMiddleware')
+
+ROOT_URLCONF = 'demo.urls'
+
+WSGI_APPLICATION = 'demo.wsgi.application'
+
+
+# Database
+# https://docs.djangoproject.com/en/1.7/ref/settings/#databases
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+    }
+}
+
+# Internationalization
+# https://docs.djangoproject.com/en/1.7/topics/i18n/
+
+LANGUAGE_CODE = 'en-us'
+
+TIME_ZONE = 'UTC'
+
+USE_I18N = True
+
+USE_L10N = True
+
+USE_TZ = True
+
+
+# Static files (CSS, JavaScript, Images)
+# https://docs.djangoproject.com/en/1.7/howto/static-files/
+
+STATIC_URL = '/static/'

=== added file 'demo/urls.py'
--- demo/urls.py	1970-01-01 00:00:00 +0000
+++ demo/urls.py	2015-04-24 18:37:20 +0000
@@ -0,0 +1,11 @@
+from django.conf.urls import patterns, include, url
+from django.contrib import admin
+
+urlpatterns = patterns(
+    '',
+    # Examples:
+    # url(r'^$', 'demo.views.home', name='home'),
+    # url(r'^blog/', include('blog.urls')),
+
+    url(r'^admin/', include(admin.site.urls)),
+)

=== added file 'demo/wsgi.py'
--- demo/wsgi.py	1970-01-01 00:00:00 +0000
+++ demo/wsgi.py	2015-04-24 18:37:20 +0000
@@ -0,0 +1,14 @@
+"""
+WSGI config for demo project.
+
+It exposes the WSGI callable as a module-level variable named ``application``.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/1.7/howto/deployment/wsgi/
+"""
+
+import os
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "demo.settings")
+
+from django.core.wsgi import get_wsgi_application
+application = get_wsgi_application()

=== added file 'manage.py'
--- manage.py	1970-01-01 00:00:00 +0000
+++ manage.py	2015-04-24 18:37:20 +0000
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+import os
+import sys
+
+if __name__ == "__main__":
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "demo.settings")
+
+    from django.core.management import execute_from_command_line
+
+    execute_from_command_line(sys.argv)

=== added directory 'oauth_backend/migrations'
=== added file 'oauth_backend/migrations/0001_initial.py'
--- oauth_backend/migrations/0001_initial.py	1970-01-01 00:00:00 +0000
+++ oauth_backend/migrations/0001_initial.py	2015-04-24 18:37:20 +0000
@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+import oauth_backend.models
+import django.utils.timezone
+from django.conf import settings
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Consumer',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('secret', models.CharField(default=oauth_backend.models.generate_random_string_secret, max_length=255, blank=True)),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('user', models.OneToOneField(related_name='oauth_consumer', to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'db_table': 'oauth_consumer',
+            },
+            bases=(models.Model,),
+        ),
+        migrations.CreateModel(
+            name='Nonce',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('nonce', models.CharField(max_length=255, editable=False)),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('consumer', models.ForeignKey(to='oauth_backend.Consumer')),
+            ],
+            options={
+                'db_table': 'oauth_nonce',
+            },
+            bases=(models.Model,),
+        ),
+        migrations.CreateModel(
+            name='Token',
+            fields=[
+                ('token', models.CharField(default=oauth_backend.models.generate_random_string_token, max_length=50, serialize=False, primary_key=True)),
+                ('token_secret', models.CharField(default=oauth_backend.models.generate_random_string_secret, max_length=50)),
+                ('name', models.CharField(max_length=255, blank=True)),
+                ('created_at', models.DateTimeField(default=django.utils.timezone.now)),
+                ('updated_at', models.DateTimeField(default=django.utils.timezone.now)),
+                ('consumer', models.ForeignKey(to='oauth_backend.Consumer')),
+            ],
+            options={
+                'db_table': 'oauth_token',
+            },
+            bases=(models.Model,),
+        ),
+        migrations.AddField(
+            model_name='nonce',
+            name='token',
+            field=models.ForeignKey(to='oauth_backend.Token'),
+            preserve_default=True,
+        ),
+        migrations.AlterUniqueTogether(
+            name='nonce',
+            unique_together=set([('nonce', 'token', 'consumer')]),
+        ),
+    ]

=== added file 'oauth_backend/migrations/__init__.py'
=== modified file 'oauth_backend/models.py'
--- oauth_backend/models.py	2014-01-27 18:36:44 +0000
+++ oauth_backend/models.py	2015-04-24 18:37:20 +0000
@@ -6,15 +6,13 @@
 import string
 import struct
 
-from datetime import datetime
-from functools import partial
-
 from oauth.oauth import OAuthToken, OAuthDataStore, OAuthConsumer
 
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.core.cache import cache
 from django.db import models
+from django.utils.timezone import now
 
 
 __all__ = [
@@ -31,9 +29,7 @@
 
 
 def _set_seed():
-    if (not hasattr(_set_seed, 'seed') and
-        os.path.exists("/dev/random")):
-
+    if (not hasattr(_set_seed, 'seed') and os.path.exists("/dev/random")):
         data = open("/dev/random").read(struct.calcsize('Q'))
         random.seed(struct.unpack('Q', data))
         _set_seed.seed = True
@@ -45,14 +41,21 @@
                    for x in range(length))
 
 
+def generate_random_string_secret():
+    return generate_random_string(CONSUMER_SECRET_LENGTH)
+
+
+def generate_random_string_token():
+    return generate_random_string(TOKEN_LENGTH)
+
+
 class Consumer(models.Model):
     """An OAuth consumer (client)."""
 
     user = models.OneToOneField(User, related_name='oauth_consumer')
 
     secret = models.CharField(
-        max_length=255, blank=True,
-        default=partial(generate_random_string, CONSUMER_SECRET_LENGTH)
+        max_length=255, blank=True, default=generate_random_string_secret,
     )
 
     created_at = models.DateTimeField(auto_now_add=True)
@@ -79,18 +82,16 @@
     consumer = models.ForeignKey(Consumer)
 
     token = models.CharField(
-        max_length=TOKEN_LENGTH,
-        default=partial(generate_random_string, TOKEN_LENGTH),
+        max_length=TOKEN_LENGTH, default=generate_random_string_token,
         primary_key=True)
 
     token_secret = models.CharField(
-        max_length=TOKEN_SECRET_LENGTH,
-        default=partial(generate_random_string, TOKEN_SECRET_LENGTH))
+        max_length=TOKEN_SECRET_LENGTH, default=generate_random_string_secret)
 
     name = models.CharField(max_length=255, blank=True)
 
-    created_at = models.DateTimeField(default=datetime.utcnow)
-    updated_at = models.DateTimeField(default=datetime.utcnow)
+    created_at = models.DateTimeField(default=now)
+    updated_at = models.DateTimeField(default=now)
 
     class Meta:
         db_table = 'oauth_token'

=== renamed directory 'oauth_backend/migrations' => 'oauth_backend/south_migrations'
=== removed file 'requirements.txt'
--- requirements.txt	2014-01-22 19:53:25 +0000
+++ requirements.txt	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-django<1.6
-django-discover-runner==0.4
-oauth

=== modified file 'setup.py'
--- setup.py	2013-02-07 12:45:52 +0000
+++ setup.py	2015-04-24 18:37:20 +0000
@@ -1,17 +1,19 @@
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-from setuptools import setup
+from setuptools import setup, find_packages
 
 from oauth_backend import __version__
 
 
 setup(
-    name = "django-oauth-backend",
-    version = __version__,
-    author = "Canonical ISD Hackers",
-    author_email = "[e-mail]",
-    license = "AGPLv3",
-    packages = ['oauth_backend', 'oauth_backend.migrations'],
+    name="django-oauth-backend",
+    version=__version__,
+    author='Canonical Ltd',
+    author_email="[e-mail]",
+    license="AGPLv3",
+    platforms=['any'],
+    packages=find_packages(),
+    url='https://launchpad.net/django-oauth-backend',
     zip_safe = True,
 )

=== removed file 'testmanage.py'
--- testmanage.py	2014-01-22 19:53:25 +0000
+++ testmanage.py	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-#!/usr/bin/env python
-
-import sys
-
-from django.conf import settings
-from django.core.management import execute_from_command_line
-
-
-if not settings.configured:
-    settings.configure(
-        DATABASES={
-            'default': {
-                'ENGINE': 'django.db.backends.sqlite3',
-                'NAME': ':memory:',
-            },
-        },
-        INSTALLED_APPS=(
-            'django.contrib.auth',
-            'django.contrib.contenttypes',
-            'oauth_backend',
-        ),
-        ROOT_URLCONF=None,
-        USE_TZ=False,
-        SECRET_KEY='foobar',
-        TEST_RUNNER='discover_runner.DiscoverRunner',
-    )
-
-
-if __name__ == '__main__':
-    execute_from_command_line(sys.argv)

=== added file 'tox.ini'
--- tox.ini	1970-01-01 00:00:00 +0000
+++ tox.ini	2015-04-24 18:37:20 +0000
@@ -0,0 +1,41 @@
+[tox]
+envlist =
+    py2.7-django1.4, py2.7-django1.5, py2.7-django1.6, py2.7-django1.7, py2.7-django1.8
+
+[testenv]
+commands = python manage.py test oauth_backend
+deps=
+    oauth
+
+[testenv:py2.7-django1.4]
+basepython = python2.7
+deps =
+    django >= 1.4, < 1.5
+    {[testenv]deps}
+    south==1.0
+
+[testenv:py2.7-django1.5]
+basepython = python2.7
+deps =
+    django >= 1.5, < 1.6
+    {[testenv]deps}
+    south==1.0
+
+[testenv:py2.7-django1.6]
+basepython = python2.7
+deps =
+    django >= 1.6, < 1.7
+    {[testenv]deps}
+    south==1.0
+
+[testenv:py2.7-django1.7]
+basepython = python2.7
+deps =
+    django >= 1.7, < 1.8
+    {[testenv]deps}
+
+[testenv:py2.7-django1.8]
+basepython = python2.7
+deps =
+    django >= 1.8, < 1.9
+    {[testenv]deps}