entrouvert
/
debian-django-oauth2-provider
17
0
Fork 0
Code Issues Pull Requests Releases Activity

Django 1.5 compatibility

This commit is contained in:
Alen Mujezinovic 2013-01-16 13:39:00 +00:00
parent 8e387786f3
commit 550374374e
9 changed files with 16 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
example/__init__.py
View File

14
example/manage.py
View File

@ -1,14 +0,0 @@
#!/usr/bin/env python
from django.core.management import execute_manager
import imp
try:
imp.find_module('settings') # Assumed to be in the same directory.
except ImportError:
import sys
sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n" % __file__)
sys.exit(1)
import settings
if __name__ == "__main__":
execute_manager(settings)

145
example/settings.py
View File

@ -1,145 +0,0 @@
# Django settings for example project.
import os
DEBUG = True
TEMPLATE_DEBUG = DEBUG
ADMINS = (
# ('Your Name', 'your_email@example.com'),
)
MANAGERS = ADMINS
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
'NAME': '%s/db.sqlite' % os.path.dirname(__file__), # Or path to database file if using sqlite3.
'USER': '', # Not used with sqlite3.
'PASSWORD': '', # Not used with sqlite3.
'HOST': '', # Set to empty string for localhost. Not used with sqlite3.
'PORT': '', # Set to empty string for default. Not used with sqlite3.
}
}
# Local time zone for this installation. Choices can be found here:
# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
# although not all choices may be available on all operating systems.
# On Unix systems, a value of None will cause Django to use the same
# timezone as the operating system.
# If running in a Windows environment this must be set to the same as your
# system time zone.
TIME_ZONE = 'America/Chicago'
# Language code for this installation. All choices can be found here:
# http://www.i18nguy.com/unicode/language-identifiers.html
LANGUAGE_CODE = 'en-us'
SITE_ID = 1
# If you set this to False, Django will make some optimizations so as not
# to load the internationalization machinery.
USE_I18N = True
# If you set this to False, Django will not format dates, numbers and
# calendars according to the current locale
USE_L10N = True
# Absolute filesystem path to the directory that will hold user-uploaded files.
# Example: "/home/media/media.lawrence.com/media/"
MEDIA_ROOT = ''
# URL that handles the media served from MEDIA_ROOT. Make sure to use a
# trailing slash.
# Examples: "http://media.lawrence.com/media/", "http://example.com/media/"
MEDIA_URL = ''
# Absolute path to the directory static files should be collected to.
# Don't put anything in this directory yourself; store your static files
# in apps' "static/" subdirectories and in STATICFILES_DIRS.
# Example: "/home/media/media.lawrence.com/static/"
STATIC_ROOT = ''
# URL prefix for static files.
# Example: "http://media.lawrence.com/static/"
STATIC_URL = '/static/'
# URL prefix for admin static files -- CSS, JavaScript and images.
# Make sure to use a trailing slash.
# Examples: "http://foo.com/static/admin/", "/static/admin/".
ADMIN_MEDIA_PREFIX = '/static/admin/'
# Additional locations of static files
STATICFILES_DIRS = (
# Put strings here, like "/home/html/static" or "C:/www/django/static".
# Always use forward slashes, even on Windows.
# Don't forget to use absolute paths, not relative paths.
)
# List of finder classes that know how to find static files in
# various locations.
STATICFILES_FINDERS = (
'django.contrib.staticfiles.finders.FileSystemFinder',
'django.contrib.staticfiles.finders.AppDirectoriesFinder',
# 'django.contrib.staticfiles.finders.DefaultStorageFinder',
)
# Make this unique, and don't share it with anybody.
SECRET_KEY = 'cynrsc!16jpy5gbhni+2vlw&sbbavxxxj0ewxk14u#hrgm+i%l'
# List of callables that know how to import templates from various sources.
TEMPLATE_LOADERS = (
'django.template.loaders.filesystem.Loader',
'django.template.loaders.app_directories.Loader',
# 'django.template.loaders.eggs.Loader',
)
MIDDLEWARE_CLASSES = (
'django.middleware.common.CommonMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
)
ROOT_URLCONF = 'example.urls'
TEMPLATE_DIRS = (
# Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
# Always use forward slashes, even on Windows.
# Don't forget to use absolute paths, not relative paths.
)
INSTALLED_APPS = (
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.sessions',
'django.contrib.sites',
'django.contrib.messages',
'django.contrib.staticfiles',
'django.contrib.admin',
'provider',
'provider.oauth2',
)
# A sample logging configuration. The only tangible logging
# performed by this configuration is to send an email to
# the site admins on every HTTP 500 error.
# See http://docs.djangoproject.com/en/dev/topics/logging for
# more details on how to customize your logging configuration.
LOGGING = {
'version': 1,
'disable_existing_loggers': False,
'handlers': {
'mail_admins': {
'level': 'ERROR',
'class': 'django.utils.log.AdminEmailHandler'
}
},
'loggers': {
'django.request': {
'handlers': ['mail_admins'],
'level': 'ERROR',
'propagate': True,
},
}
}

5
provider/compat/__init__.py Normal file
View File

@ -0,0 +1,5 @@
try:
from django.contrib.auth.tests.utils import skipIfCustomUser
except ImportError:
def skipIfCustomUser(wrapped):
return wrapped

4
provider/compat/urls.py Normal file
View File

@ -0,0 +1,4 @@
try:
from django.conf.urls import patterns, url, include
except ImportError: # django 1.3
from django.conf.urls.defaults import patterns, url, include

8
provider/oauth2/tests.py
View File

@ -4,10 +4,10 @@ from django.http import QueryDict
from django.conf import settings
from django.core.urlresolvers import reverse
from django.utils.html import escape
from django.test import TestCase, SimpleTestCase
from django.test import TestCase
from django.contrib.auth.models import User
from django.contrib.auth.tests.utils import skipIfCustomUser
from .. import constants, scope
from ..compat import skipIfCustomUser
from ..templatetags.scope import scopes
from .forms import ClientForm
from .models import Client, Grant, AccessToken
@ -392,7 +392,7 @@ class EnforceSecureTest(BaseOAuth2TestCase):
self.assertTrue("A secure connection is required." in response.content)
class ClientFormTest(SimpleTestCase):
class ClientFormTest(TestCase):
def test_client_form(self):
form = ClientForm({'name': 'TestName', 'url': 'http://127.0.0.1:8000',
'redirect_uri': 'http://localhost:8000/'})
@ -408,7 +408,7 @@ class ClientFormTest(SimpleTestCase):
form.save()
class ScopeTest(SimpleTestCase):
class ScopeTest(TestCase):
def setUp(self):
self._scopes = constants.SCOPES
constants.SCOPES = constants.DEFAULT_SCOPES

2
provider/oauth2/urls.py
View File

@ -33,9 +33,9 @@ that are meant for client (as defined in :draft:`1`) interaction.
"""
from django.conf.urls.defaults import patterns, url
from django.contrib.auth.decorators import login_required
from django.views.decorators.csrf import csrf_exempt
from ..compat.urls import *
from .views import Authorize, Redirect, Capture, AccessTokenView

1
provider/templates/provider/authorize.html
View File

@ -1,4 +1,5 @@
{% load scope %}
{% load url from future %}
{% block content %}
{% if not error %}
<p>{{ client.name }} would like to access your data with the following permissions:</p>

2
tests/urls.py
View File

@ -1,4 +1,4 @@
from django.conf.urls.defaults import patterns, include, url
from provider.compat.urls import *
from django.contrib import admin
admin.autodiscover()