Skip to content

tools: make test.py Python 3 compatible #25767

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
thefourtheye wants to merge 3 commits into from
Closed

tools: make test.py Python 3 compatible #25767

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
35f6fa3
tools: make test.py Python 3 compatible
thefourtheye Jan 28, 2019
df481e5
simplify importing urllib's unquote
thefourtheye Jan 28, 2019
8644359
simplify string splitting with partition
thefourtheye Jan 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions tools/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,9 @@ def cmp(x, y): # Python 3
xrange = range # Python 3

try:
import urllib.parse # Python 3
urllib_unquote = urllib.parse.unquote
from urllib.parse import unquote # Python 3
except ImportError:
import urllib # Python 2
urllib_unquote = urllib.unquote
from urllib import unquote # Python 2

Comment thread
thefourtheye marked this conversation as resolved.

logger = logging.getLogger('testrunner')
Expand Down Expand Up @@ -1485,8 +1483,8 @@ def ExpandCommand(args):
return ExpandCommand
else:
pos = value.find('@')
prefix = urllib_unquote(value[:pos]).split()
suffix = urllib_unquote(value[pos+1:]).split()
prefix = unquote(value[:pos]).split()
suffix = unquote(value[pos+1:]).split()
Comment thread
thefourtheye marked this conversation as resolved.
Outdated
def ExpandCommand(args):
return prefix + args + suffix
return ExpandCommand
Expand Down
⚡