From 6d968317698b99115be2652a9e2e41adc3a28e79 Mon Sep 17 00:00:00 2001 From: Preston Timmons Date: Sat, 6 Apr 2013 19:29:09 -0500 Subject: [PATCH] Fixed template_tests so discovery doesn't directly find tests that require setuptools. --- tests/template_tests/{test_loaders.py => loaders.py} | 0 tests/template_tests/tests.py | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename tests/template_tests/{test_loaders.py => loaders.py} (100%) diff --git a/tests/template_tests/test_loaders.py b/tests/template_tests/loaders.py similarity index 100% rename from tests/template_tests/test_loaders.py rename to 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.