diff --git a/src/allmydata/scripts/common.py b/src/allmydata/scripts/common.py index e50617fd7..ae9d78db7 100644 --- a/src/allmydata/scripts/common.py +++ b/src/allmydata/scripts/common.py @@ -2,10 +2,12 @@ from __future__ import print_function -import os, sys, urllib, textwrap +import os, sys, textwrap import codecs from os.path import join +from six.moves import urllib # import urllib.parse + try: from typing import Optional from .types_ import Parameters @@ -284,4 +286,4 @@ def escape_path(path): """ # this always returns bytes, specifically US-ASCII, valid URL characters segments = path.split("/") - return "/".join([urllib.quote(unicode_to_url(s)) for s in segments]) + return "/".join([urllib.parse.quote(unicode_to_url(s)) for s in segments])