Skip to content
Snippets Groups Projects
Commit 700aa200 authored by Ben Adida's avatar Ben Adida
Browse files

started work on upgrading to django 1.4

parent caf43ffb
No related branches found
No related tags found
No related merge requests found
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
"name" : "Test Election", "name" : "Test Election",
"election_type" : "election", "election_type" : "election",
"use_advanced_audit_features" : true, "use_advanced_audit_features" : true,
"created_at" : "2013-02-22 12:00:00",
"modified_at" : "2013-02-22 12:00:00",
"private_p" : false, "private_p" : false,
"description" : "test description", "description" : "test description",
"public_key" : null, "public_key" : null,
......
...@@ -267,7 +267,7 @@ class CastVoteModelTests(TestCase): ...@@ -267,7 +267,7 @@ class CastVoteModelTests(TestCase):
pass pass
class DatatypeTests(TestCase): class DatatypeTests(TestCase):
fixtures = ['election.json'] fixtures = ['users.json', 'election.json']
def setUp(self): def setUp(self):
self.election = models.Election.objects.all()[0] self.election = models.Election.objects.all()[0]
......
...@@ -41,7 +41,7 @@ def getOpenIDStore(filestore_path, table_prefix): ...@@ -41,7 +41,7 @@ def getOpenIDStore(filestore_path, table_prefix):
The result of this function should be passed to the Consumer The result of this function should be passed to the Consumer
constructor as the store parameter. constructor as the store parameter.
""" """
if not settings.DATABASE_ENGINE: if not settings.DATABASES['default'].ENGINE:
return FileOpenIDStore(filestore_path) return FileOpenIDStore(filestore_path)
# Possible side-effect: create a database connection if one isn't # Possible side-effect: create a database connection if one isn't
......
Django==1.3.7 Django==1.4.5
South==0.7.3 South==0.7.3
amqplib==1.0.2 amqplib==1.0.2
anyjson==0.3.1 anyjson==0.3.1
......
...@@ -53,16 +53,15 @@ MEDIA_URL = '' ...@@ -53,16 +53,15 @@ MEDIA_URL = ''
# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
# trailing slash. # trailing slash.
# Examples: "http://foo.com/media/", "/media/". # Examples: "http://foo.com/media/", "/media/".
ADMIN_MEDIA_PREFIX = '/media/' STATIC_URL = '/media/'
# Make this unique, and don't share it with anybody. # Make this unique, and don't share it with anybody.
SECRET_KEY = get_from_env('SECRET_KEY', 'replaceme') SECRET_KEY = get_from_env('SECRET_KEY', 'replaceme')
# List of callables that know how to import templates from various sources. # List of callables that know how to import templates from various sources.
TEMPLATE_LOADERS = ( TEMPLATE_LOADERS = (
'django.template.loaders.filesystem.load_template_source', 'django.template.loaders.filesystem.Loader',
'django.template.loaders.app_directories.load_template_source', 'django.template.loaders.app_directories.Loader'
# 'django.template.loaders.eggs.load_template_source',
) )
MIDDLEWARE_CLASSES = ( MIDDLEWARE_CLASSES = (
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment