Bug 1597737 : Importing urlparse from six to keep py2, py3 compatible r=whimboo,marionette-reviewers
authorRishi Gupta <rishigpt2009@gmail.com>
Thu, 21 Nov 2019 14:33:45 +0000
changeset 503243 5fe975a91529160a1e9c7b7a15f61e101a0511e6
parent 503242 a7abb046cb61c8ec2177bb099261d951ecc241e4
child 503244 bb120dcc1726ee5590bbba188203379c4be4e261
push id101212
push userhskupin@mozilla.com
push dateFri, 22 Nov 2019 00:25:33 +0000
treeherderautoland@5fe975a91529 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerswhimboo, marionette-reviewers
bugs1597737
milestone72.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1597737 : Importing urlparse from six to keep py2, py3 compatible r=whimboo,marionette-reviewers Differential Revision: https://phabricator.services.mozilla.com/D54128
testing/marionette/harness/marionette_harness/runner/httpd.py
--- a/testing/marionette/harness/marionette_harness/runner/httpd.py
+++ b/testing/marionette/harness/marionette_harness/runner/httpd.py
@@ -11,25 +11,26 @@ Marionette.
 
 from __future__ import absolute_import, print_function
 
 import argparse
 import os
 import select
 import sys
 import time
-import urlparse
 
 from wptserve import (
     handlers,
     request,
     routes as default_routes,
     server
 )
 
+from six.moves.urllib import parse as urlparse
+
 
 root = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
 default_doc_root = os.path.join(root, "www")
 default_ssl_cert = os.path.join(root, "certificates", "test.cert")
 default_ssl_key = os.path.join(root, "certificates", "test.key")
 
 
 @handlers.handler