From 3e94f4dc709143d577433c164873654e7c0579f8 Mon Sep 17 00:00:00 2001
From: Henry Clifford <h.a.clifford@gmail.com>
Date: Fri, 4 Oct 2013 10:49:56 -0400
Subject: [PATCH] support args on get_object_or_404

---
 rest_framework/generics.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rest_framework/generics.py b/rest_framework/generics.py
index 7d1bf7945..4f134bce6 100644
--- a/rest_framework/generics.py
+++ b/rest_framework/generics.py
@@ -25,13 +25,13 @@ def strict_positive_int(integer_string, cutoff=None):
         ret = min(ret, cutoff)
     return ret
 
-def get_object_or_404(queryset, **filter_kwargs):
+def get_object_or_404(queryset, *filter_args, **filter_kwargs):
     """
     Same as Django's standard shortcut, but make sure to raise 404
     if the filter_kwargs don't match the required types.
     """
     try:
-        return _get_object_or_404(queryset, **filter_kwargs)
+        return _get_object_or_404(queryset, *filter_args, **filter_kwargs)
     except (TypeError, ValueError):
         raise Http404