Merge pull request #3388 from mmerickel/black

Michael Merickel

2018-10-15 bda1306749c62ef4f11cfe567ed7d56c8ad94240

 tests/pkgs/subrequestapp/__init__.py

@@ -1,25 +1,30 @@
from pyramid.config import Configurator
from pyramid.request import Request


def view_one(request):
    subreq = Request.blank('/view_two')
    response = request.invoke_subrequest(subreq, use_tweens=False)
    return response


def view_two(request):
    # check that request.foo is valid for a subrequest
    return 'This came from view_two, foo=%s' % (request.foo,)


def view_three(request):
    subreq = Request.blank('/view_four')
    try:
        return request.invoke_subrequest(subreq, use_tweens=True)
    except: # pragma: no cover
    except Exception:  # pragma: no cover
        request.response.body = b'Value error raised'
        return request.response


def view_four(request):
    raise ValueError('foo')


def view_five(request):
    subreq = Request.blank('/view_four')
@@ -29,10 +34,12 @@
        request.response.body = b'Value error raised'
        return request.response


def excview(request):
    request.response.status_int = 500
    request.response.body = b'Bad stuff happened'
    return request.response


def main():
    config = Configurator()
@@ -49,4 +56,3 @@
    config.add_view(view_five, route_name='five')
    config.add_request_method(lambda r: 'bar', 'foo', property=True)
    return config