Skip to content
Snippets Groups Projects
Commit 5713adc51f2a authored by Pierre-Yves David's avatar Pierre-Yves David :octopus:
Browse files

branching: merge stable into default

No related branches found
No related tags found
2 merge requests!1041Merge default into stable,!1006merge stable into default.
Pipeline #89676 passed with warnings
......@@ -63,6 +63,7 @@
'_weakrefset',
'warnings',
'threading',
'collections.abc',
}
_pypy = '__pypy__' in sys.builtin_module_names
......
......@@ -149,6 +149,6 @@
assert f(type(re.stderr)) == "<class '_io.TextIOWrapper'>", f(type(re.stderr))
assert f(re) == "<module 'sys' (built-in)>"
assert 'telnetlib' not in sys.modules
import telnetlib
assert 'wsgiref' not in sys.modules
import wsgiref
......@@ -154,5 +154,5 @@
assert isinstance(telnetlib, _LazyModule)
assert f(telnetlib) == "<module 'telnetlib' from '?'>"
assert isinstance(wsgiref, _LazyModule)
assert f(wsgiref) == "<module 'wsgiref' from '?'>"
try:
......@@ -157,6 +157,6 @@
try:
from telnetlib import unknownattr
from wsgiref import unknownattr
assert False, (
'no demandmod should be created for attribute of non-package '
......@@ -160,7 +160,7 @@
assert False, (
'no demandmod should be created for attribute of non-package '
'module:\ntelnetlib.unknownattr = %s' % f(unknownattr)
'module:\nwsgiref.unknownattr = %s' % f(unknownattr)
)
except ImportError as inst:
assert rsub(r"'", '', str(inst)).startswith(
......@@ -177,5 +177,5 @@
# test deactivation for issue6725
del sys.modules['telnetlib']
del sys.modules['wsgiref']
with demandimport.deactivated():
......@@ -181,4 +181,4 @@
with demandimport.deactivated():
import telnetlib
assert telnetlib.__loader__ == telnetlib.__spec__.loader
assert telnetlib.__loader__.get_resource_reader
import wsgiref
assert wsgiref.__loader__ == wsgiref.__spec__.loader
assert wsgiref.__loader__.get_resource_reader
......@@ -36,7 +36,7 @@
import binascii
from contextlib import contextmanager
import pipes
import shlex
import shutil
import silenttestrunner
import subprocess
......@@ -267,7 +267,7 @@
if os.path.exists(path):
return
self.log.append(
"$ mkdir -p -- %s" % (pipes.quote(os.path.relpath(path)),)
"$ mkdir -p -- %s" % (shlex.quote(os.path.relpath(path)),)
)
os.makedirs(path)
......@@ -276,7 +276,7 @@
if path == ".":
return
os.chdir(path)
self.log.append("$ cd -- %s" % (pipes.quote(path),))
self.log.append("$ cd -- %s" % (shlex.quote(path),))
def hg(self, *args):
extra_flags = []
......@@ -286,7 +286,7 @@
self.command("hg", *(tuple(extra_flags) + args))
def command(self, *args):
self.log.append("$ " + ' '.join(map(pipes.quote, args)))
self.log.append("$ " + ' '.join(map(shlex.quote, args)))
subprocess.check_output(args, stderr=subprocess.STDOUT)
# Section: Set up basic data
......@@ -355,7 +355,7 @@
)
% (
binascii.hexlify(content),
pipes.quote(path),
shlex.quote(path),
)
)
......@@ -405,7 +405,7 @@
if amend:
errors.append("cannot amend public changesets")
command.append("--amend")
command.append("-m" + pipes.quote(message))
command.append("-m" + shlex.quote(message))
if secret:
command.append("--secret")
if close_branch:
......
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