Django

Code

Changeset 4128

Show
Ignore:
Timestamp:
11/28/06 16:58:10 (2 years ago)
Author:
adrian
Message:

Fixed small bug in 'The view didn't return an HttpResponse object' message -- it assumed the view was a function, whereas it can be any callable object

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/core/handlers/base.py

    r3951 r4128  
    8585            # Complain if the view returned None (a common error). 
    8686            if response is None: 
    87                 raise ValueError, "The view %s.%s didn't return an HttpResponse object." % (callback.__module__, callback.func_name) 
     87                try: 
     88                    view_name = callback.func_name # If it's a function 
     89                except AttributeError: 
     90                    view_name = callback.__class__.__name__ + '.__call__' # If it's a class 
     91                raise ValueError, "The view %s.%s didn't return an HttpResponse object." % (callback.__module__, view_name) 
    8892 
    8993            return response