Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #1732 -- AttributeErrors in models are no longer ignored by the…

… model validator.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@2995 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit c21acb6aeb80caab77166c55567da7fe86fbb0e5 1 parent dc378e8
Adrian Holovaty adrianholovaty authored
Showing with 9 additions and 3 deletions.
  1. +9 −3 django/db/models/loading.py
12 django/db/models/loading.py
View
@@ -17,9 +17,15 @@ def get_apps():
_app_list = []
for app_name in settings.INSTALLED_APPS:
try:
- _app_list.append(__import__(app_name, '', '', ['models']).models)
- except (ImportError, AttributeError), e:
- pass
+ mod = __import__(app_name, '', '', ['models'])
+ except ImportError:
+ pass # Assume this app doesn't have a models.py in it.
+ # GOTCHA: It may have a models.py that raises ImportError.
+ else:
+ try:
+ _app_list.append(mod.models)
+ except AttributeError:
+ pass # This app doesn't have a models.py in it.
return _app_list
def get_app(app_label):
Please sign in to comment.
Something went wrong with that request. Please try again.