comparison tests/dumbhttp.py @ 37672:8bacc09814ba

py3: make values bytes before passing into server.runservice()

The values of opts dict still needed to be converted to bytes.

Differential Revision: https://phab.mercurial-scm.org/D3330

37671:726a95a57eeb

import signal
import socket
import sys

from mercurial import (
    server,
    util,
)

httpserver = util.httpserver

        parser.error("options --logfile and --foreground are mutually "
                     "exclusive")
    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}
    service = simplehttpservice(options.host, options.port)
    server.runservice(opts, initfn=service.init, runfn=service.run,
                      logfile=options.logfile,
                      runargs=[sys.executable, __file__] + sys.argv[1:])

37672:8bacc09814ba

import signal
import socket
import sys

from mercurial import (
    pycompat,
    server,
    util,
)

httpserver = util.httpserver

        parser.error("options --logfile and --foreground are mutually "
                     "exclusive")
    if options.foreground and options.pid:
        parser.error("options --pid and --foreground are mutually exclusive")

    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=runargs)