diff options
| author | Preston Timmons <prestontimmons@gmail.com> | 2013-04-06 19:29:09 -0500 |
|---|---|---|
| committer | Carl Meyer <carl@oddbird.net> | 2013-04-12 15:42:58 -0600 |
| commit | 6d968317698b99115be2652a9e2e41adc3a28e79 (patch) | |
| tree | e72df26cb9e8e03b32ad145d2d04f84799fba7ac | |
| parent | 56e777eba3687bd56b954de4b3dfa44775481b14 (diff) | |
Fixed template_tests so discovery doesn't directly find tests that require setuptools.
| -rw-r--r-- | tests/template_tests/loaders.py (renamed from tests/template_tests/test_loaders.py) | 0 | ||||
| -rw-r--r-- | tests/template_tests/tests.py | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/tests/template_tests/test_loaders.py b/tests/template_tests/loaders.py index b77965203f..b77965203f 100644 --- a/tests/template_tests/test_loaders.py +++ b/tests/template_tests/loaders.py diff --git a/tests/template_tests/tests.py b/tests/template_tests/tests.py index 67839d3ab7..da1562d2d5 100644 --- a/tests/template_tests/tests.py +++ b/tests/template_tests/tests.py @@ -47,7 +47,7 @@ from .test_response import (TemplateResponseTest, CacheMiddlewareTest, SimpleTemplateResponseTest, CustomURLConfTest) try: - from .test_loaders import RenderToStringTest, EggLoaderTest + from .loaders import RenderToStringTest, EggLoaderTest except ImportError as e: if "pkg_resources" in e.args[0]: pass # If setuptools isn't installed, that's fine. Just move on. |