equal
deleted
inserted
replaced
4 |
4 |
5 """ |
5 """ |
6 Small and dumb HTTP server for use in tests. |
6 Small and dumb HTTP server for use in tests. |
7 """ |
7 """ |
8 |
8 |
9 import BaseHTTPServer |
|
10 import SimpleHTTPServer |
|
11 import optparse |
9 import optparse |
12 import signal |
10 import signal |
13 import sys |
11 import sys |
14 |
12 |
15 from mercurial import ( |
13 from mercurial import ( |
16 cmdutil, |
14 cmdutil, |
|
15 util, |
17 ) |
16 ) |
18 |
17 |
|
18 httpserver = util.httpserver |
19 OptionParser = optparse.OptionParser |
19 OptionParser = optparse.OptionParser |
20 |
20 |
21 class simplehttpservice(object): |
21 class simplehttpservice(object): |
22 def __init__(self, host, port): |
22 def __init__(self, host, port): |
23 self.address = (host, port) |
23 self.address = (host, port) |
24 def init(self): |
24 def init(self): |
25 self.httpd = BaseHTTPServer.HTTPServer( |
25 self.httpd = httpserver.httpserver( |
26 self.address, SimpleHTTPServer.SimpleHTTPRequestHandler) |
26 self.address, httpserver.simplehttprequesthandler) |
27 def run(self): |
27 def run(self): |
28 self.httpd.serve_forever() |
28 self.httpd.serve_forever() |
29 |
29 |
30 if __name__ == '__main__': |
30 if __name__ == '__main__': |
31 parser = OptionParser() |
31 parser = OptionParser() |