Clean up syntax a bit

pallets · Apr 1, 2016 · 69ecee4 · 69ecee4
1 parent b4dd92d
commit 69ecee4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/flask/helpers.py b/flask/helpers.py
@@ -621,9 +621,7 @@ def download_file(filename):
     try:
         if not os.path.isfile(filename):
             raise NotFound()
-    except TypeError:
-        raise BadRequest()
-    except ValueError:
+    except (TypeError, ValueError):
         raise BadRequest()
     options.setdefault('conditional', True)
     return send_file(filename, **options)

diff --git a/tests/test_helpers.py b/tests/test_helpers.py
@@ -510,13 +510,9 @@ def test_send_from_directory_bad_request(self):
         app.testing = True
         app.root_path = os.path.join(os.path.dirname(__file__),
                                      'test_apps', 'subdomaintestmodule')
-        with app.test_request_context():
-            try:
-                rv = flask.send_from_directory('static', 'bad\x00')
-                rv.close()
-                assert False
-            except BadRequest:
-                pass
+        with app.test_request_context(), pytest.raises(BadRequest):
+            rv = flask.send_from_directory('static', 'bad\x00')
+            rv.close()
 
 class TestLogging(object):