Merge pull request #34 from dukebody/master

Raise original object action KeyError instead of wrapping it

django_object_actions/tests/tests.py

@@ -68,3 +68,7 @@ def test_intermediate_page_with_post_works(self):
     def test_undefined_tool_404s(self):
         response = self.client.get('/admin/polls/choice/1/tools/weeeewoooooo/')
         self.assertEqual(response.status_code, 404)
+
+    def test_key_error_tool_500s(self):
+        self.assertRaises(KeyError, self.client.get,
+                          '/admin/polls/choice/1/tools/raise_key_error/')

django_object_actions/utils.py

@@ -112,9 +112,10 @@ def get(self, request, **kwargs):
         #   is instantiated with `model` and the urlpattern has `pk`.
         obj = self.get_object()
         try:
-            ret = self.tools[kwargs['tool']](request, obj)
+            tool = self.tools[kwargs['tool']]
         except KeyError:
             raise Http404(u'Tool does not exist')
+        ret = tool(request, obj)
         if isinstance(ret, HttpResponse):
             return ret
         back = request.path.rsplit('/', 3)[0] + '/'

example_project/polls/admin.py

@@ -39,8 +39,11 @@ def edit_poll(self, request, obj):
         url = reverse('admin:polls_poll_change', args=(obj.poll.pk,))
         return HttpResponseRedirect(url)
 
+    def raise_key_error(self, request, obj):
+        raise KeyError
+
     objectactions = ('increment_vote', 'decrement_vote', 'reset_vote',
-        'edit_poll')
+        'edit_poll', 'raise_key_error')
     actions = ['increment_vote']
 
 admin.site.register(Choice, ChoiceAdmin)