Permalink
Browse files

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
  • Loading branch information...
spookylukey committed Jun 4, 2011
1 parent 39005c2 commit d41a25ebc6f1cc8214989838a5994199e9b152be
Showing with 5 additions and 3 deletions.
  1. +0 −1 tests/regressiontests/templates/loaders.py
  2. +5 −2 tests/regressiontests/templates/tests.py
@@ -17,7 +17,6 @@
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
@@ -37,8 +37,11 @@
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

0 comments on commit d41a25e

Please sign in to comment.