Django

Code

Changeset 4237

Show
Ignore:
Timestamp:
12/26/06 08:40:33 (2 years ago)
Author:
jacob
Message:

Fixed #3187 -- Django will now look for the root URLconf as an attribute of the request object, if available. This lets middleware override the urlconf as needed. Thanks, Fredrik Lundh.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r4128 r4237  
    6161                return response 
    6262 
    63         resolver = urlresolvers.RegexURLResolver(r'^/', settings.ROOT_URLCONF) 
     63        # Get urlconf from request object, if available.  Otherwise use default. 
     64        urlconf = getattr(request, "urlconf", settings.ROOT_URLCONF) 
     65 
     66        resolver = urlresolvers.RegexURLResolver(r'^/', urlconf) 
    6467        try: 
    6568            callback, callback_args, callback_kwargs = resolver.resolve(request.path)