| hg-reviewers |
The values of opts dict still needed to be converted to bytes.
| Lint Skipped |
| Unit Tests Skipped |
| #!/usr/bin/env python | #!/usr/bin/env python | ||||
| from __future__ import absolute_import | from __future__ import absolute_import | ||||
| """ | """ | ||||
| Small and dumb HTTP server for use in tests. | Small and dumb HTTP server for use in tests. | ||||
| """ | """ | ||||
| import optparse | import optparse | ||||
| import os | import os | ||||
| import signal | import signal | ||||
| import socket | import socket | ||||
| import sys | import sys | ||||
| from mercurial import ( | from mercurial import ( | ||||
| pycompat, | |||||
| server, | server, | ||||
| util, | util, | ||||
| ) | ) | ||||
| httpserver = util.httpserver | httpserver = util.httpserver | ||||
| OptionParser = optparse.OptionParser | OptionParser = optparse.OptionParser | ||||
| if os.environ.get('HGIPV6', '0') == '1': | if os.environ.get('HGIPV6', '0') == '1': | ||||
| signal.signal(signal.SIGTERM, lambda x, y: sys.exit(0)) | signal.signal(signal.SIGTERM, lambda x, y: sys.exit(0)) | ||||
| if options.foreground and options.logfile: | if options.foreground and options.logfile: | ||||
| parser.error("options --logfile and --foreground are mutually " | parser.error("options --logfile and --foreground are mutually " | ||||
| "exclusive") | "exclusive") | ||||
| if options.foreground and options.pid: | if options.foreground and options.pid: | ||||
| parser.error("options --pid and --foreground are mutually exclusive") | parser.error("options --pid and --foreground are mutually exclusive") | ||||
| opts = {'pid_file': options.pid, | opts = {b'pid_file': options.pid, | ||||
| 'daemon': not options.foreground, | b'daemon': not options.foreground, | ||||
| 'daemon_postexec': options.daemon_postexec} | b'daemon_postexec': options.daemon_postexec} | ||||
| service = simplehttpservice(options.host, options.port) | 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, | server.runservice(opts, initfn=service.init, runfn=service.run, | ||||
| logfile=options.logfile, | logfile=options.logfile, | ||||
| runargs=[sys.executable, __file__] + sys.argv[1:]) | runargs=runargs) | ||||