Colin Watson has proposed merging ~cjwatson/launchpad:py3-sitesearch-hostpair
into launchpad:master.
Commit message:
Fix BingLaunchpadFunctionalLayer setup on Python 3
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/392038
--
Your team Launchpad code reviewers is requested to review the proposed merge of
~cjwatson/launchpad:py3-sitesearch-hostpair into launchpad:master.
diff --git a/lib/lp/services/sitesearch/testservice.py b/lib/lp/services/sitesearch/testservice.py
index 345e92c..5cbc6f2 100644
--- a/lib/lp/services/sitesearch/testservice.py
+++ b/lib/lp/services/sitesearch/testservice.py
@@ -16,6 +16,7 @@ import socket
import subprocess
import time
+import six
from six.moves.BaseHTTPServer import BaseHTTPRequestHandler
from lp.services.osutils import remove_if_exists
@@ -163,7 +164,7 @@ def wait_for_service_shutdown(host, port, seconds_to_wait=10.0):
def hostpair(url):
"""Parse the host and port number out of a URL string."""
parts = urlsplit(url)
- host, port = parts[1].split(':')
+ host, port = six.ensure_str(parts[1]).split(':')
port = int(port)
return (host, port)
_______________________________________________
Mailing list: https://launchpad.net/~launchpad-reviewers
Post to : [email protected]
Unsubscribe : https://launchpad.net/~launchpad-reviewers
More help : https://help.launchpad.net/ListHelp
