Merge 4c2fcd3 into 72e427c

.travis.yml

@@ -6,7 +6,6 @@ python:
   - "2.7"
   - "2.6"
   - "pypy"
-  - "pypy3"
 env:
   - RIPOZO="ripozo"
   - RIPOZO="git+git://github.com/vertical-knowledge/ripozo.git@master"
@@ -17,4 +16,4 @@ install:
 script:
   coverage run --source=flask_ripozo setup.py test
 after_success:
-  coveralls
+  coveralls

flask_ripozo/dispatcher.py

@@ -31,10 +31,12 @@ def __getitem__(self, key):
 def exception_handler(dispatcher, accepted_mimetypes, exc):
     """
     Responsible for handling exceptions in the project.
-    This catches any RestException (from ripozo.exceptions)
-    and calls the format_exception class method on the adapter
-    class.  It will appropriately set the status_code, response,
-    and content type for the exception.
+    This catches **any** Exception and calls the format_exception
+    class method on the adapter class.  It will appropriately set
+    the status_code, response, and content type for the exception.
+
+    If you want an exception to set a status_code other than 500,
+    ensure that it has a ``status_code`` attribute.
 
     :param FlaskDispatcher dispatcher: A FlaskDispatcher instance
         used to format the exception
@@ -44,11 +46,10 @@ def exception_handler(dispatcher, accepted_mimetypes, exc):
     :return: A flask Response object.
     :rtype: flask.Response
     """
-    if isinstance(exc, RestException):
-        adapter_klass = dispatcher.get_adapter_for_type(accepted_mimetypes)
-        response, content_type, status_code = adapter_klass.format_exception(exc)
-        return Response(response=response, content_type=content_type, status=status_code)
-    raise exc
+    adapter_klass = dispatcher.get_adapter_for_type(accepted_mimetypes)
+    response, content_type, status_code = adapter_klass.format_exception(exc)
+    return Response(response=response, content_type=content_type,
+                    status=status_code)
 
 
 def get_request_query_body_args(request_obj):

flask_ripozo_tests/unit/dispatcher.py

@@ -67,16 +67,15 @@ def fake(*args, **kwargs):
             self.assertEqual(response.status_code, 600)
             self.assertEqual(response.data.decode('utf8'), 'some body')
 
-    def test_flask_dispatch_wrapper_fail_restexception(self):
+    def test_flask_dispatch_wrapper_fail(self):
         """
-        Tests the response when their is a failure in
-        dispatching a request. In particular when a RestException
-        is raised.
+        Tests the response when there is a failure in
+        dispatching a request
         """
         adapter_class = self.get_mock_adapter_class()
 
         def fake(*args, **kwargs):
-            raise RestException
+            raise Exception
 
         d = FlaskDispatcher(self.app)
         d.register_adapters(adapter_class)
@@ -89,24 +88,6 @@ def fake(*args, **kwargs):
             self.assertEqual(response.data.decode('utf8'), 'error')
             self.assertEqual(response.content_type, 'fake')
 
-    def test_flask_dispatch_wrapper_fail(self):
-        """
-        Tests the response when their is a failure in
-        dispatching a request that is not a RestException
-        """
-        adapter_class = self.get_mock_adapter_class()
-
-        def fake(*args, **kwargs):
-            raise Exception
-
-        d = FlaskDispatcher(self.app)
-        d.register_adapters(adapter_class)
-        view_func = flask_dispatch_wrapper(d, fake)
-        self.assertEqual(view_func.__name__, fake.__name__)
-
-        with self.app.test_request_context('/myresource'):
-            self.assertRaises(Exception, view_func)
-
     def test_base_url(self):
         """
         Tests that the base_url always returns the

setup.py

@@ -21,6 +21,7 @@
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Software Development :: Libraries :: Python Modules'
     ],

tox.ini

@@ -1,5 +1,6 @@
 [tox]
-envlist=py{26,27,33,34,py,py3}-ripozo{release,git}
+# py3 removed due to flask 0.11 incompatibility
+envlist=py{26,27,33,34,35,py}-ripozo{release,git}
 
 [testenv]
 deps=