Commit 4a57ef85 authored by Jacob Kaplan-Moss's avatar Jacob Kaplan-Moss
Browse files

Fixed #2048 - get_object_or_404 now allows *args as well. Thanks, Joeboy 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@3014 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 6b1e7bdd

django/shortcuts/__init__.py

+2 −2
Original line number Diff line number Diff line
@@ -10,9 +10,9 @@ def render_to_response(*args, **kwargs): 
    return HttpResponse(loader.render_to_string(*args, **kwargs))

load_and_render = render_to_response # For backwards compatibility.



def get_object_or_404(klass, **kwargs):

def get_object_or_404(klass, *args, **kwargs):

    try:

        return klass._default_manager.get(**kwargs)

        return klass._default_manager.get(*args, **kwargs)

    except klass.DoesNotExist:

        raise Http404