Mercurial > hg
comparison tests/dumbhttp.py @ 38593:e46c3b6a47b5
py3: fix dumbhttp.py to convert --daemon-postexec arguments back to bytes
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Sun, 08 Jul 2018 16:45:40 +0900 |
parents | 8bacc09814ba |
children | 2372284d9457 |
comparison
equal
deleted
inserted
replaced
38592:21be76e07148 | 38593:e46c3b6a47b5 |
---|---|
11 import signal | 11 import signal |
12 import socket | 12 import socket |
13 import sys | 13 import sys |
14 | 14 |
15 from mercurial import ( | 15 from mercurial import ( |
16 encoding, | |
16 pycompat, | 17 pycompat, |
17 server, | 18 server, |
18 util, | 19 util, |
19 ) | 20 ) |
20 | 21 |
64 if options.foreground and options.pid: | 65 if options.foreground and options.pid: |
65 parser.error("options --pid and --foreground are mutually exclusive") | 66 parser.error("options --pid and --foreground are mutually exclusive") |
66 | 67 |
67 opts = {b'pid_file': options.pid, | 68 opts = {b'pid_file': options.pid, |
68 b'daemon': not options.foreground, | 69 b'daemon': not options.foreground, |
69 b'daemon_postexec': options.daemon_postexec} | 70 b'daemon_postexec': pycompat.rapply(encoding.strtolocal, |
71 options.daemon_postexec)} | |
70 service = simplehttpservice(options.host, options.port) | 72 service = simplehttpservice(options.host, options.port) |
71 runargs = [sys.executable, __file__] + sys.argv[1:] | 73 runargs = [sys.executable, __file__] + sys.argv[1:] |
72 runargs = [pycompat.fsencode(a) for a in runargs] | 74 runargs = [pycompat.fsencode(a) for a in runargs] |
73 server.runservice(opts, initfn=service.init, runfn=service.run, | 75 server.runservice(opts, initfn=service.init, runfn=service.run, |
74 logfile=options.logfile, | 76 logfile=options.logfile, |