Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Use Django 1.3

  • Loading branch information...
commit 0d2c243af3231d75f831ae442d807df10788ab50 1 parent 388b1fd
@tomchristie tomchristie authored
Showing with 2 additions and 32 deletions.
  1. +1 −1  requirements.txt
  2. +0 −30 testproject/settings.py
  3. +1 −1  userroles/tests.py
View
2  requirements.txt
@@ -1,2 +1,2 @@
-http://www.djangoproject.com/download/1.4-alpha-1/tarball/
+Django
milkman
View
30 testproject/settings.py
@@ -1,4 +1,3 @@
-# Django settings for testproject project.
import os
DEBUG = True
@@ -125,35 +124,6 @@
'userroles',
)
-# 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 when DEBUG=False.
-# 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,
- 'filters': {
- 'require_debug_false': {
- '()': 'django.utils.log.RequireDebugFalse'
- }
- },
- 'handlers': {
- 'mail_admins': {
- 'level': 'ERROR',
- 'filters': ['require_debug_false'],
- 'class': 'django.utils.log.AdminEmailHandler'
- }
- },
- 'loggers': {
- 'django.request': {
- 'handlers': ['mail_admins'],
- 'level': 'ERROR',
- 'propagate': True,
- },
- }
-}
-
USER_ROLES = (
('manager', 'userroles.tests.ManagerRole'),
('moderator', ''),
View
2  userroles/tests.py
@@ -2,7 +2,7 @@
"""
from django.conf import settings
-from django.conf.urls import patterns
+from django.conf.urls.defaults import patterns
from django.contrib.auth.models import User
from django.http import HttpResponse
from django.test import TestCase
Please sign in to comment.
Something went wrong with that request. Please try again.