1
0
mirror of https://github.com/django/django.git synced 2025-10-24 06:06:09 +00:00

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
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

View File

@@ -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