summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2014-03-02 14:55:37 +0100
committerAymeric Augustin <aymeric.augustin@m4x.org>2014-03-09 11:07:21 +0100
commit3a34f71d4dcadae3d8e6c1c603b47e603f0dada3 (patch)
tree3804fcff7b3859efd3ed7ca6cce4610d3ae5d201
parent06615d0d6e75b537291ea6be74a973a8b6160211 (diff)
Removed obsolete hack to run template tests.
-rw-r--r--tests/template_tests/tests.py8
1 files changed, 1 insertions, 7 deletions
diff --git a/tests/template_tests/tests.py b/tests/template_tests/tests.py
index d8aab34571..c277fcc036 100644
--- a/tests/template_tests/tests.py
+++ b/tests/template_tests/tests.py
@@ -1,13 +1,6 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
-from django.conf import settings
-
-if __name__ == '__main__':
- # When running this file in isolation, we need to set up the configuration
- # before importing 'template'.
- settings.configure()
-
from datetime import date, datetime
import os
import sys
@@ -16,6 +9,7 @@ import unittest
import warnings
from django import template
+from django.conf import settings
from django.core import urlresolvers
from django.template import (base as template_base, loader, Context,
RequestContext, Template, TemplateSyntaxError)