Fix 0 port value being overriden by default

By explicitly comparing port value with None,
instead of using its bool() value.
This commit is contained in:
vorelq 2018-09-29 18:38:32 +02:00 committed by David Lord
parent 05102f63b8
commit e1cc16f8be
No known key found for this signature in database
GPG Key ID: 7A1C87E3F5BC42A8
3 changed files with 14 additions and 8 deletions

View File

@ -42,6 +42,8 @@ Unreleased
:pr:`3195` :pr:`3195`
- Allow customizing the :attr:`Flask.url_map_class` used for routing. - Allow customizing the :attr:`Flask.url_map_class` used for routing.
:pr:`3069` :pr:`3069`
- The development server port can be set to 0, which tells the OS to
pick an available port. :issue:`2926`
.. _#2935: https://github.com/pallets/flask/issues/2935 .. _#2935: https://github.com/pallets/flask/issues/2935
.. _#2957: https://github.com/pallets/flask/issues/2957 .. _#2957: https://github.com/pallets/flask/issues/2957

View File

@ -972,7 +972,8 @@ class Flask(_PackageBoundObject):
sn_host, _, sn_port = server_name.partition(":") sn_host, _, sn_port = server_name.partition(":")
host = host or sn_host or _host host = host or sn_host or _host
port = int(port or sn_port or _port) # pick the first value that's not None (0 is allowed)
port = int(next((p for p in (port, sn_port) if p is not None), _port))
options.setdefault("use_reloader", self.debug) options.setdefault("use_reloader", self.debug)
options.setdefault("use_debugger", self.debug) options.setdefault("use_debugger", self.debug)

View File

@ -1916,21 +1916,24 @@ def test_run_server_port(monkeypatch, app):
@pytest.mark.parametrize( @pytest.mark.parametrize(
"host,port,expect_host,expect_port", "host,port,server_name,expect_host,expect_port",
( (
(None, None, "pocoo.org", 8080), (None, None, "pocoo.org:8080", "pocoo.org", 8080),
("localhost", None, "localhost", 8080), ("localhost", None, "pocoo.org:8080", "localhost", 8080),
(None, 80, "pocoo.org", 80), (None, 80, "pocoo.org:8080", "pocoo.org", 80),
("localhost", 80, "localhost", 80), ("localhost", 80, "pocoo.org:8080", "localhost", 80),
("localhost", 0, "localhost:8080", "localhost", 0),
(None, None, "localhost:8080", "localhost", 8080),
(None, None, "localhost:0", "localhost", 0),
), ),
) )
def test_run_from_config(monkeypatch, host, port, expect_host, expect_port, app): def test_run_from_config(monkeypatch, host, port, server_name, expect_host, expect_port, app):
def run_simple_mock(hostname, port, *args, **kwargs): def run_simple_mock(hostname, port, *args, **kwargs):
assert hostname == expect_host assert hostname == expect_host
assert port == expect_port assert port == expect_port
monkeypatch.setattr(werkzeug.serving, "run_simple", run_simple_mock) monkeypatch.setattr(werkzeug.serving, "run_simple", run_simple_mock)
app.config["SERVER_NAME"] = "pocoo.org:8080" app.config["SERVER_NAME"] = server_name
app.run(host, port) app.run(host, port)