Author: lukeplant
Date: 2011-06-04 07:32:55 -0700 (Sat, 04 Jun 2011)
New Revision: 16323
Modified:
django/trunk/tests/regressiontests/templates/loaders.py
django/trunk/tests/regressiontests/templates/tests.py
Log:
Fixed import error that was causing EggLoader tests not to be run
Also improved ImportError handling that was causing this fact to be missed.
Modified: django/trunk/tests/regressiontests/templates/loaders.py
===================================================================
--- django/trunk/tests/regressiontests/templates/loaders.py 2011-06-03
13:43:23 UTC (rev 16322)
+++ django/trunk/tests/regressiontests/templates/loaders.py 2011-06-04
14:32:55 UTC (rev 16323)
@@ -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
Modified: django/trunk/tests/regressiontests/templates/tests.py
===================================================================
--- django/trunk/tests/regressiontests/templates/tests.py 2011-06-03
13:43:23 UTC (rev 16322)
+++ django/trunk/tests/regressiontests/templates/tests.py 2011-06-04
14:32:55 UTC (rev 16323)
@@ -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
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com.
To unsubscribe from this group, send email to
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
