Merge branch '1.0.x'

2019-06-12 10:41:11 -07:00 · 2019-06-12 10:41:11 -07:00 · 29111a3259
commit 29111a3259
parent d4b688bd03 8a7d080085
8 changed files with 35 additions and 65 deletions
--- a/tests/test_helpers.py
+++ b/tests/test_helpers.py
@ -455,7 +455,7 @@ class TestSendfile(object):
            assert rv.data == f.read()
        rv.close()

-    def test_send_file_xsendfile(self, app, req_ctx, catch_deprecation_warnings):
+    def test_send_file_xsendfile(self, app, req_ctx):
        app.use_x_sendfile = True
        rv = flask.send_file("static/index.html")
        assert rv.direct_passthrough