This is an archive of the discontinued LLVM Phabricator instance.

Differential D55203

Python 2/3 compat - http server
ClosedPublic

Authored by serge-sans-paille on Dec 3 2018, 2:46 AM.

Details

Reviewers
joerg
michaelplatings
Commits
rGdc7d7e3fe81b: Portable Python script across Python version
rC348184: Portable Python script across Python version
rL348184: Portable Python script across Python version

Diff Detail

Event Timeline

serge-sans-paille created this revision.Dec 3 2018, 2:46 AM
michaelplatings accepted this revision.Dec 3 2018, 8:52 AM

LGTM

This revision is now accepted and ready to land.Dec 3 2018, 8:52 AM
Closed by commit rL348184: Portable Python script across Python version (authored by serge_sans_paille). · Explain WhyDec 3 2018, 12:29 PM
This revision was automatically updated to reflect the committed changes.
Herald added a subscriber: llvm-commits. · View Herald TranscriptDec 3 2018, 12:29 PM

Revision Contents

PathSize
tools/
scan-view/
share/
21 lines

Diff 176345

tools/scan-view/share/ScanView.py

import BaseHTTPServer
import SimpleHTTPServer
from __future__ import print_function from __future__ import print_function
try:
from http.server import HTTPServer, SimpleHTTPRequestHandler
except ImportError:
from BaseHTTPServer import HTTPServer
from SimpleHTTPServer import SimpleHTTPRequestHandler
import os import os
import sys import sys
try: try:
Context not available.
print('</pre>', file=s) print('</pre>', file=s)
self.status = s.getvalue() self.status = s.getvalue()
class ScanViewServer(BaseHTTPServer.HTTPServer): class ScanViewServer(HTTPServer):
def __init__(self, address, handler, root, reporters, options): def __init__(self, address, handler, root, reporters, options):
BaseHTTPServer.HTTPServer.__init__(self, address, handler) HTTPServer.__init__(self, address, handler)
self.root = root self.root = root
self.reporters = reporters self.reporters = reporters
self.options = options self.options = options
Context not available.
if self.options.autoReload: if self.options.autoReload:
import ScanView import ScanView
self.RequestHandlerClass = reload(ScanView).ScanViewRequestHandler self.RequestHandlerClass = reload(ScanView).ScanViewRequestHandler
BaseHTTPServer.HTTPServer.finish_request(self, request, client_address) HTTPServer.finish_request(self, request, client_address)
def handle_error(self, request, client_address): def handle_error(self, request, client_address):
# Ignore socket errors # Ignore socket errors
Context not available.
if self.options.debug > 1: if self.options.debug > 1:
print("%s: SERVER: ignored socket error." % (sys.argv[0],), file=sys.stderr) print("%s: SERVER: ignored socket error." % (sys.argv[0],), file=sys.stderr)
return return
BaseHTTPServer.HTTPServer.handle_error(self, request, client_address) HTTPServer.handle_error(self, request, client_address)
# Borrowed from Quixote, with simplifications. # Borrowed from Quixote, with simplifications.
def parse_query(qs, fields=None): def parse_query(qs, fields=None):
Context not available.
item.append(value) item.append(value)
return fields return fields
class ScanViewRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): class ScanViewRequestHandler(SimpleHTTPRequestHandler):
server_version = "ScanViewServer/" + __version__ server_version = "ScanViewServer/" + __version__
dynamic_mtime = time.time() dynamic_mtime = time.time()
def do_HEAD(self): def do_HEAD(self):
try: try:
SimpleHTTPServer.SimpleHTTPRequestHandler.do_HEAD(self) SimpleHTTPRequestHandler.do_HEAD(self)
except Exception as e: except Exception as e:
self.handle_exception(e) self.handle_exception(e)
def do_GET(self): def do_GET(self):
try: try:
SimpleHTTPServer.SimpleHTTPRequestHandler.do_GET(self) SimpleHTTPRequestHandler.do_GET(self)
except Exception as e: except Exception as e:
self.handle_exception(e) self.handle_exception(e)
Context not available.