summaryrefslogtreecommitdiff
path: root/lorrycontroller/proxy.py
diff options
context:
space:
mode:
Diffstat (limited to 'lorrycontroller/proxy.py')
-rw-r--r--lorrycontroller/proxy.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/lorrycontroller/proxy.py b/lorrycontroller/proxy.py
index b9e75b8..5eea4f1 100644
--- a/lorrycontroller/proxy.py
+++ b/lorrycontroller/proxy.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2014 Codethink Limited
+# Copyright (C) 2014-2019 Codethink Limited
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -16,13 +16,13 @@
import json
import os
-import urllib
+import urllib.request, urllib.parse, urllib.error
def build_proxy_url(protocol, proxy_config):
"""Build a proxy URL from data in our proxy configuration format."""
- hostname = urllib.quote(proxy_config['hostname'])
+ hostname = urllib.parse.quote(proxy_config['hostname'])
url = '%s:%s' % (hostname, proxy_config['port'])
if 'username' not in proxy_config: