Merge
This commit is contained in:
commit
8728b6f505
|
@ -90,6 +90,8 @@ class OverExtendsNode(ExtendsNode):
|
||||||
# is requested.
|
# is requested.
|
||||||
for loader in loaders:
|
for loader in loaders:
|
||||||
dirs = context[context_name][name]
|
dirs = context[context_name][name]
|
||||||
|
if not dirs:
|
||||||
|
break
|
||||||
try:
|
try:
|
||||||
source, path = loader.load_template_source(name, dirs)
|
source, path = loader.load_template_source(name, dirs)
|
||||||
except TemplateDoesNotExist:
|
except TemplateDoesNotExist:
|
||||||
|
|
|
@ -6,6 +6,13 @@ PROJECT_ROOT = os.path.dirname(os.path.abspath(__file__))
|
||||||
PROJECT_DIRNAME = PROJECT_ROOT.split(os.sep)[-1]
|
PROJECT_DIRNAME = PROJECT_ROOT.split(os.sep)[-1]
|
||||||
ROOT_URLCONF = "%s.urls" % PROJECT_DIRNAME
|
ROOT_URLCONF = "%s.urls" % PROJECT_DIRNAME
|
||||||
TEMPLATE_DIRS = (os.path.join(PROJECT_ROOT, "templates"),)
|
TEMPLATE_DIRS = (os.path.join(PROJECT_ROOT, "templates"),)
|
||||||
|
|
||||||
|
try:
|
||||||
|
import django.test.runner
|
||||||
|
TEST_RUNNER = "django.test.runner.DiscoverRunner"
|
||||||
|
except ImportError as e:
|
||||||
|
TEST_RUNNER = "django.test.simple.DjangoTestSuiteRunner"
|
||||||
|
|
||||||
SECRET_KEY = "hi mom"
|
SECRET_KEY = "hi mom"
|
||||||
|
|
||||||
DATABASES = {
|
DATABASES = {
|
||||||
|
|
Loading…
Reference in New Issue