aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/generics.py
diff options
context:
space:
mode:
authorEdmond Wong2013-09-03 12:30:18 -0700
committerEdmond Wong2013-09-03 12:30:18 -0700
commit6e7e4fc01c5ddaf668f17f1d1f201a14a26f72f3 (patch)
tree8de07353f3f081117cc3627399a825862f1d472d /rest_framework/generics.py
parent3063a50fc20f0bfb7308e668cf083c5ae0876dac (diff)
downloaddjango-rest-framework-6e7e4fc01c5ddaf668f17f1d1f201a14a26f72f3.tar.bz2
Added test for OPTIONS before object creation from a PUT
Diffstat (limited to 'rest_framework/generics.py')
-rw-r--r--rest_framework/generics.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/rest_framework/generics.py b/rest_framework/generics.py
index 4d909ef1..7d1bf794 100644
--- a/rest_framework/generics.py
+++ b/rest_framework/generics.py
@@ -360,7 +360,9 @@ class GenericAPIView(views.APIView):
self.get_object()
except Http404:
# Http404 should be acceptable and the serializer
- # metadata should be populated.
+ # metadata should be populated. Except this so the
+ # outer "else" clause of the try-except-else block
+ # will be executed.
pass
except (exceptions.APIException, PermissionDenied):
pass