Django

Code

Changeset 2995

Show
Ignore:
Timestamp:
05/26/06 14:28:55 (2 years ago)
Author:
adrian
Message:

Fixed #1732 -- AttributeErrors? in models are no longer ignored by the model validator.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/db/models/loading.py

    r2809 r2995  
    1818    for app_name in settings.INSTALLED_APPS: 
    1919        try: 
    20             _app_list.append(__import__(app_name, '', '', ['models']).models) 
    21         except (ImportError, AttributeError), e: 
    22             pass 
     20            mod = __import__(app_name, '', '', ['models']) 
     21        except ImportError: 
     22            pass # Assume this app doesn't have a models.py in it. 
     23                 # GOTCHA: It may have a models.py that raises ImportError. 
     24        else: 
     25            try: 
     26                _app_list.append(mod.models) 
     27            except AttributeError: 
     28                pass # This app doesn't have a models.py in it. 
    2329    return _app_list 
    2430