Skip to content

Commit 08f3fd5

Browse files
committed
Fix tests run against Django 1.5
1 parent 7475190 commit 08f3fd5

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.travis.yml

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
language: python
22
python:
3-
- "2.5"
43
- "2.6"
54
- "2.7"
65
install: pip install . --use-mirrors

forms_builder/example_project/settings.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22

3-
import os
3+
import os, sys
44

55
DEBUG = True
66
SITE_ID = 1
@@ -13,10 +13,11 @@
1313
ADMIN_MEDIA_PREFIX = STATIC_URL + "admin/"
1414
ROOT_URLCONF = "%s.urls" % PROJECT_DIRNAME
1515
TEMPLATE_DIRS = (os.path.join(PROJECT_ROOT, "templates"),)
16-
SECRET_KEY = ""
16+
SECRET_KEY = "asdfa4wtW#$Gse4aGdfs"
1717
ADMINS = ()
1818
MANAGERS = ADMINS
19-
LOGIN_URL = "/admin/"
19+
if "test" not in sys.argv:
20+
LOGIN_URL = "/admin/"
2021

2122
DATABASES = {
2223
'default': {

forms_builder/example_project/urls.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
from django.conf.urls.defaults import patterns, include, url
2+
from django.conf.urls import patterns, include, url
33
from django.contrib import admin
44
from django.shortcuts import render
55

0 commit comments

Comments
 (0)