From ea6a210e70ac890066146ddfb9edbb61f546671f Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Tue, 19 Mar 2019 17:08:50 -0400 Subject: [PATCH] python3: wire up more code to polyglot.http_server --- src/calibre/ebooks/oeb/display/test-cfi/run_rapydscript.py | 6 +++--- src/calibre/utils/serve_coffee.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/calibre/ebooks/oeb/display/test-cfi/run_rapydscript.py b/src/calibre/ebooks/oeb/display/test-cfi/run_rapydscript.py index 887708f454..0ca3698b23 100644 --- a/src/calibre/ebooks/oeb/display/test-cfi/run_rapydscript.py +++ b/src/calibre/ebooks/oeb/display/test-cfi/run_rapydscript.py @@ -8,9 +8,10 @@ __copyright__ = '2011, Kovid Goyal ' __docformat__ = 'restructuredtext en' import os, shutil, tempfile -import SimpleHTTPServer import SocketServer +from polyglot.http_server import SimpleHTTPRequestHandler + def run_devel_server(): base = os.path.dirname(os.path.abspath(__file__)) @@ -27,7 +28,7 @@ def run_devel_server(): with lopen('cfi-test.pyj', 'rb') as f, lopen('cfi-test.js', 'wb') as js: js.write(compile_pyj(f.read()).encode('utf-8')) PORT = 8000 - Handler = SimpleHTTPServer.SimpleHTTPRequestHandler + Handler = SimpleHTTPRequestHandler httpd = SocketServer.TCPServer(("", PORT), Handler) print('Serving CFI test at http://localhost:%d' % PORT) try: @@ -37,4 +38,3 @@ def run_devel_server(): if __name__ == '__main__': run_devel_server() - diff --git a/src/calibre/utils/serve_coffee.py b/src/calibre/utils/serve_coffee.py index 2239860932..887df3a323 100644 --- a/src/calibre/utils/serve_coffee.py +++ b/src/calibre/utils/serve_coffee.py @@ -18,9 +18,9 @@ if sys.version_info.major > 2: file=sys.stderr) raise SystemExit(1) -import time, BaseHTTPServer, os, sys, re, SocketServer +import time, os, sys, re, SocketServer from threading import Lock, local -from SimpleHTTPServer import SimpleHTTPRequestHandler +from polyglot.http_server import BaseHTTPServer, SimpleHTTPRequestHandler # Compiler {{{