From d41a25ebc6f1cc8214989838a5994199e9b152be Mon Sep 17 00:00:00 2001 From: Luke Plant Date: Sat, 4 Jun 2011 14:32:55 +0000 Subject: [PATCH] Fixed import error that was causing EggLoader tests not to be run Also improved ImportError handling that was causing this fact to be missed. git-svn-id: http://code.djangoproject.com/svn/django/trunk@16323 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- tests/regressiontests/templates/loaders.py | 1 - tests/regressiontests/templates/tests.py | 7 +++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/regressiontests/templates/loaders.py b/tests/regressiontests/templates/loaders.py index 301aab4408..1773592521 100644 --- a/tests/regressiontests/templates/loaders.py +++ b/tests/regressiontests/templates/loaders.py @@ -17,7 +17,6 @@ import os.path import warnings from django.template import TemplateDoesNotExist, Context -from django.template.loaders.eggs import load_template_source as lts_egg from django.template.loaders.eggs import Loader as EggLoader from django.template import loader from django.test.utils import get_warnings_state, restore_warnings_state diff --git a/tests/regressiontests/templates/tests.py b/tests/regressiontests/templates/tests.py index 5237bb6ba0..f096042af0 100644 --- a/tests/regressiontests/templates/tests.py +++ b/tests/regressiontests/templates/tests.py @@ -37,8 +37,11 @@ from response import * try: from loaders import * -except ImportError: - pass # If setuptools isn't installed, that's fine. Just move on. +except ImportError, e: + if "pkg_resources" in e.message: + pass # If setuptools isn't installed, that's fine. Just move on. + else: + raise import filters