Django

Code

Changeset 5127

Show
Ignore:
Timestamp:
04/29/07 04:41:46 (1 year ago)
Author:
mtredinnick
Message:

Fixed #4044 -- Allowed callable views specifier to mix (i.e. not crash) with
prefix strings in URLConfs. Thanks, Vinay Sajip.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/conf/urls/defaults.py

    r5086 r5127  
    2323        return RegexURLResolver(regex, view[0], kwargs) 
    2424    else: 
    25         return RegexURLPattern(regex, prefix and (prefix + '.' + view) or view, kwargs, name) 
     25        if prefix and isinstance(view, basestring): 
     26            view = prefix + '.' + view 
     27        return RegexURLPattern(regex, view, kwargs, name) 
    2628