D3330: py3: make values bytes before passing into server.runservice()
pulkit (Pulkit Goyal)
phabricator at mercurial-scm.org
Fri Apr 13 23:41:54 EDT 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG8bacc09814ba: py3: make values bytes before passing into server.runservice() (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3330?vs=8150&id=8218
REVISION DETAIL
https://phab.mercurial-scm.org/D3330
AFFECTED FILES
tests/dumbhttp.py
CHANGE DETAILS
diff --git a/tests/dumbhttp.py b/tests/dumbhttp.py
--- a/tests/dumbhttp.py
+++ b/tests/dumbhttp.py
@@ -13,6 +13,7 @@
import sys
from mercurial import (
+ pycompat,
server,
util,
)
@@ -63,10 +64,12 @@
if options.foreground and options.pid:
parser.error("options --pid and --foreground are mutually exclusive")
- opts = {'pid_file': options.pid,
- 'daemon': not options.foreground,
- 'daemon_postexec': options.daemon_postexec}
+ opts = {b'pid_file': options.pid,
+ b'daemon': not options.foreground,
+ b'daemon_postexec': options.daemon_postexec}
service = simplehttpservice(options.host, options.port)
+ runargs = [sys.executable, __file__] + sys.argv[1:]
+ runargs = [pycompat.fsencode(a) for a in runargs]
server.runservice(opts, initfn=service.init, runfn=service.run,
logfile=options.logfile,
- runargs=[sys.executable, __file__] + sys.argv[1:])
+ runargs=runargs)
To: pulkit, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list