mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-01-23 16:50:41 +00:00
Code Issues 32 Releases Wiki Activity

Fixed import error that was causing EggLoader tests not to be run

Browse Source 
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
This commit is contained in:
Luke Plant 2011-06-04 14:32:55 +00:00
parent 39005c2b84
commit d41a25ebc6
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/regressiontests/templates/loaders.py
View File

@ -17,7 +17,6 @@ import os.path
import warnings import warnings
from django.template import TemplateDoesNotExist, Context 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.loaders.eggs import Loader as EggLoader
from django.template import loader from django.template import loader
from django.test.utils import get_warnings_state, restore_warnings_state from django.test.utils import get_warnings_state, restore_warnings_state

7
tests/regressiontests/templates/tests.py
View File

@ -37,8 +37,11 @@ from response import *
try: try:
from loaders import * from loaders import *
except ImportError: except ImportError, e:
pass # If setuptools isn't installed, that's fine. Just move on. if "pkg_resources" in e.message:
pass # If setuptools isn't installed, that's fine. Just move on.
else:
raise
import filters import filters