p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed template_tests so discovery doesn't directly find tests that require setuptools.

This commit is contained in:
Preston Timmons 2013-04-06 19:29:09 -05:00 committed by Carl Meyer
parent 56e777eba3
commit 6d96831769
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
tests/template_tests/test_loaders.py → tests/template_tests/loaders.py
View File

2
tests/template_tests/tests.py
View File

@ -47,7 +47,7 @@ from .test_response import (TemplateResponseTest, CacheMiddlewareTest,
SimpleTemplateResponseTest, CustomURLConfTest) SimpleTemplateResponseTest, CustomURLConfTest)
try: try:
from .test_loaders import RenderToStringTest, EggLoaderTest from .loaders import RenderToStringTest, EggLoaderTest
except ImportError as e: except ImportError as e:
if "pkg_resources" in e.args[0]: if "pkg_resources" in e.args[0]:
pass # If setuptools isn't installed, that's fine. Just move on. pass # If setuptools isn't installed, that's fine. Just move on.