From c21acb6aeb80caab77166c55567da7fe86fbb0e5 Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Fri, 26 May 2006 19:28:55 +0000 Subject: [PATCH] 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 --- django/db/models/loading.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/django/db/models/loading.py b/django/db/models/loading.py index a9e0348f8e9..7f5c97924b3 100644 --- a/django/db/models/loading.py +++ b/django/db/models/loading.py @@ -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):