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:
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user