From 8f9e3627ef054c9732f4e529c6ed429ed8dc7183 Mon Sep 17 00:00:00 2001 From: John Newbery Date: Tue, 10 Oct 2017 10:49:28 -0400 Subject: [tests] authproxy.py: tidy up __init__() --- test/functional/test_framework/authproxy.py | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'test/functional/test_framework') diff --git a/test/functional/test_framework/authproxy.py b/test/functional/test_framework/authproxy.py index e3ae0f7930..1a3acf48a3 100644 --- a/test/functional/test_framework/authproxy.py +++ b/test/functional/test_framework/authproxy.py @@ -71,19 +71,9 @@ class AuthServiceProxy(object): self._service_name = service_name self.ensure_ascii = ensure_ascii # can be toggled on the fly by tests self.__url = urllib.parse.urlparse(service_url) - if self.__url.port is None: - port = 80 - else: - port = self.__url.port - (user, passwd) = (self.__url.username, self.__url.password) - try: - user = user.encode('utf8') - except AttributeError: - pass - try: - passwd = passwd.encode('utf8') - except AttributeError: - pass + port = 80 if self.__url.port is None else self.__url.port + user = None if self.__url.username is None else self.__url.username.encode('utf8') + passwd = None if self.__url.password is None else self.__url.password.encode('utf8') authpair = user + b':' + passwd self.__auth_header = b'Basic ' + base64.b64encode(authpair) -- cgit v1.2.3