Merge pull request #1371 from jcass77/enhance/format_proxy

Handle missing or empty 'port' configuration parameter.
mopidy · Dec 29, 2015 · 811131f · 811131f
2 parents 4fba994 + 3488e64
commit 811131f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/mopidy/httpclient.py b/mopidy/httpclient.py
@@ -21,8 +21,8 @@ def format_proxy(proxy_config, auth=True):
     if not proxy_config.get('hostname'):
         return None
 
-    port = proxy_config.get('port', 80)
-    if port < 0:
+    port = proxy_config.get('port')
+    if not port or port < 0:
         port = 80
 
     if proxy_config.get('username') and proxy_config.get('password') and auth:

diff --git a/tests/test_httpclient.py b/tests/test_httpclient.py
@@ -9,13 +9,16 @@
 
 @pytest.mark.parametrize("config,expected", [
     ({}, None),
+    ({'hostname': ''}, None),
     ({'hostname': 'proxy.lan'}, 'http://proxy.lan:80'),
     ({'scheme': None, 'hostname': 'proxy.lan'}, 'http://proxy.lan:80'),
     ({'scheme': 'https', 'hostname': 'proxy.lan'}, 'https://proxy.lan:80'),
     ({'username': 'user', 'hostname': 'proxy.lan'}, 'http://proxy.lan:80'),
     ({'password': 'pass', 'hostname': 'proxy.lan'}, 'http://proxy.lan:80'),
     ({'hostname': 'proxy.lan', 'port': 8080}, 'http://proxy.lan:8080'),
     ({'hostname': 'proxy.lan', 'port': -1}, 'http://proxy.lan:80'),
+    ({'hostname': 'proxy.lan', 'port': None}, 'http://proxy.lan:80'),
+    ({'hostname': 'proxy.lan', 'port': ''}, 'http://proxy.lan:80'),
     ({'username': 'user', 'password': 'pass', 'hostname': 'proxy.lan'},
      'http://user:pass@proxy.lan:80'),
 ])