Skip to content
Snippets Groups Projects
Commit b34561fa6289 authored by Raphaël Gomès's avatar Raphaël Gomès
Browse files

py3: add compatibility layer for urllib with Python 3 precedence

parent d9809e530d95
No related branches found
No related tags found
No related merge requests found
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
import os import os
import subprocess import subprocess
from os.path import isdir, join from os.path import isdir, join
import urllib
from benchmarks.utils import read_yaml_file from benchmarks.utils import read_yaml_file
...@@ -9,6 +8,11 @@ ...@@ -9,6 +8,11 @@
from benchmarks.utils import read_yaml_file from benchmarks.utils import read_yaml_file
try:
from urllib.parse import quote_plus
except ImportError:
from urllib import quote_plus
def clone_repositories(config, partial_revset, repos_dir): def clone_repositories(config, partial_revset, repos_dir):
cachedir = join(repos_dir, "partial-references") cachedir = join(repos_dir, "partial-references")
...@@ -22,7 +26,7 @@ ...@@ -22,7 +26,7 @@
print(partial_revset) print(partial_revset)
for pset, setconfig in partial_revset.items(): for pset, setconfig in partial_revset.items():
revset = setconfig.get('remove') revset = setconfig.get('remove')
repo_suffix = urllib.quote_plus(revset) repo_suffix = quote_plus(revset)
partialdir = join(cachedir, "partial-{}-{}".format(repo_name, repo_suffix)) partialdir = join(cachedir, "partial-{}-{}".format(repo_name, repo_suffix))
if not isdir(partialdir): if not isdir(partialdir):
print( print(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment