p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Adrian Holovaty 2006-05-26 19:28:55 +00:00
parent dc378e8ca7
commit c21acb6aeb
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
django/db/models/loading.py
View File

@ -17,9 +17,15 @@ def get_apps():
_app_list = [] _app_list = []
for app_name in settings.INSTALLED_APPS: for app_name in settings.INSTALLED_APPS:
try: try:
_app_list.append(__import__(app_name, '', '', ['models']).models) mod = __import__(app_name, '', '', ['models'])
except (ImportError, AttributeError), e: except ImportError:
pass 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 return _app_list
def get_app(app_label): def get_app(app_label):