From b03181363bd78ab0934af3badd9b4845e454fbb3 Mon Sep 17 00:00:00 2001 From: Wouter Van Hemel Date: Wed, 4 Sep 2013 12:15:32 +0300 Subject: [PATCH 1/2] Add a non-decorator version of the error handler register function The main application object has a register_error_handler function which mirrors the decorator's functionality. According to the principle of least surprise, make sure blueprints also have this convenience function. --- flask/blueprints.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/flask/blueprints.py b/flask/blueprints.py index d45fd062..2b64c1f9 100644 --- a/flask/blueprints.py +++ b/flask/blueprints.py @@ -399,3 +399,14 @@ class Blueprint(_PackageBoundObject): self.name, code_or_exception, f)) return f return decorator + + def register_error_handler(self, code_or_exception, f): + """Non-decorator version of the :meth:`errorhandler` error attach + function, akin to the :meth:`~flask.Flask.register_error_handler` + application-wide function of the :class:`~flask.Flask` object but + for error handlers limited to this blueprint. + + .. versionadded:: 0.11 + """ + self.record_once(lambda s: s.app._register_error_handler( + self.name, code_or_exception, f)) From 079ae20f24e23ba4ab32faeca88705b247fd3eb2 Mon Sep 17 00:00:00 2001 From: Wouter Van Hemel Date: Fri, 6 Sep 2013 10:43:02 +0300 Subject: [PATCH 2/2] Add tests for user-defined exceptions in blueprints --- flask/testsuite/blueprints.py | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/flask/testsuite/blueprints.py b/flask/testsuite/blueprints.py index 72cf5182..57abdb6e 100644 --- a/flask/testsuite/blueprints.py +++ b/flask/testsuite/blueprints.py @@ -296,6 +296,39 @@ class BlueprintTestCase(FlaskTestCase): self.assert_equal(c.get('/backend-no').data, b'backend says no') self.assert_equal(c.get('/what-is-a-sideend').data, b'application itself says no') + def test_blueprint_specific_user_error_handling(self): + class MyDecoratorException(Exception): + pass + class MyFunctionException(Exception): + pass + + blue = flask.Blueprint('blue', __name__) + + @blue.errorhandler(MyDecoratorException) + def my_decorator_exception_handler(e): + self.assert_true(isinstance(e, MyDecoratorException)) + return 'boom' + + def my_function_exception_handler(e): + self.assert_true(isinstance(e, MyFunctionException)) + return 'bam' + blue.register_error_handler(MyFunctionException, my_function_exception_handler) + + @blue.route('/decorator') + def blue_deco_test(): + raise MyDecoratorException() + @blue.route('/function') + def blue_func_test(): + raise MyFunctionException() + + app = flask.Flask(__name__) + app.register_blueprint(blue) + + c = app.test_client() + + self.assert_equal(c.get('/decorator').data, b'boom') + self.assert_equal(c.get('/function').data, b'bam') + def test_blueprint_url_definitions(self): bp = flask.Blueprint('test', __name__)