diff options
Diffstat (limited to 'clang/tools/scan-view')
| -rwxr-xr-x | clang/tools/scan-view/bin/scan-view | 12 | ||||
| -rw-r--r-- | clang/tools/scan-view/share/ScanView.py | 31 |
2 files changed, 23 insertions, 20 deletions
diff --git a/clang/tools/scan-view/bin/scan-view b/clang/tools/scan-view/bin/scan-view index 6e384ec2171..e3abb1c8347 100755 --- a/clang/tools/scan-view/bin/scan-view +++ b/clang/tools/scan-view/bin/scan-view @@ -1,5 +1,7 @@ #!/usr/bin/env python +from __future__ import print_function + """The clang static analyzer results viewer. """ @@ -52,10 +54,10 @@ def start_browser(port, options): sys.stderr.flush() time.sleep(kSleepTimeout) else: - print >> sys.stderr, 'WARNING: Unable to detect that server started.' + print('WARNING: Unable to detect that server started.', file=sys.stderr) if options.debug: - print >> sys.stderr, '%s: Starting webbrowser...' % sys.argv[0] + print('%s: Starting webbrowser...' % sys.argv[0], file=sys.stderr) webbrowser.open(url) @@ -69,9 +71,9 @@ def run(port, options, root): import ScanView try: - print 'Starting scan-view at: http://%s:%d' % (options.host, - port) - print ' Use Ctrl-C to exit.' + print('Starting scan-view at: http://%s:%d' % (options.host, + port)) + print(' Use Ctrl-C to exit.') httpd = ScanView.create_server((options.host, port), options, root) httpd.serve_forever() diff --git a/clang/tools/scan-view/share/ScanView.py b/clang/tools/scan-view/share/ScanView.py index b465c971dbf..b1ce8c3d3aa 100644 --- a/clang/tools/scan-view/share/ScanView.py +++ b/clang/tools/scan-view/share/ScanView.py @@ -1,3 +1,4 @@ +from __future__ import print_function try: from http.server import HTTPServer, SimpleHTTPRequestHandler except ImportError: @@ -102,20 +103,20 @@ class ReporterThread(threading.Thread): result = None try: if self.server.options.debug: - print >>sys.stderr, "%s: SERVER: submitting bug."%(sys.argv[0],) + print("%s: SERVER: submitting bug."%(sys.argv[0],), file=sys.stderr) self.status = self.reporter.fileReport(self.report, self.parameters) self.success = True time.sleep(3) if self.server.options.debug: - print >>sys.stderr, "%s: SERVER: submission complete."%(sys.argv[0],) + print("%s: SERVER: submission complete."%(sys.argv[0],), file=sys.stderr) except Reporter.ReportFailure as e: self.status = e.value except Exception as e: s = StringIO.StringIO() import traceback - print >>s,'<b>Unhandled Exception</b><br><pre>' - traceback.print_exc(e,file=s) - print >>s,'</pre>' + print('<b>Unhandled Exception</b><br><pre>', file=s) + traceback.print_exc(file=s) + print('</pre>', file=s) self.status = s.getvalue() class ScanViewServer(HTTPServer): @@ -161,16 +162,16 @@ class ScanViewServer(HTTPServer): def halt(self): self.halted = True if self.options.debug: - print >>sys.stderr, "%s: SERVER: halting." % (sys.argv[0],) + print("%s: SERVER: halting." % (sys.argv[0],), file=sys.stderr) def serve_forever(self): while not self.halted: if self.options.debug > 1: - print >>sys.stderr, "%s: SERVER: waiting..." % (sys.argv[0],) + print("%s: SERVER: waiting..." % (sys.argv[0],), file=sys.stderr) try: self.handle_request() except OSError as e: - print 'OSError',e.errno + print('OSError',e.errno) def finish_request(self, request, client_address): if self.options.autoReload: @@ -183,7 +184,7 @@ class ScanViewServer(HTTPServer): info = sys.exc_info() if info and isinstance(info[1], socket.error): if self.options.debug > 1: - print >>sys.stderr, "%s: SERVER: ignored socket error." % (sys.argv[0],) + print("%s: SERVER: ignored socket error." % (sys.argv[0],), file=sys.stderr) return HTTPServer.handle_error(self, request, client_address) @@ -270,8 +271,8 @@ class ScanViewRequestHandler(SimpleHTTPRequestHandler): def handle_exception(self, exc): import traceback s = StringIO.StringIO() - print >>s, "INTERNAL ERROR\n" - traceback.print_exc(exc, s) + print("INTERNAL ERROR\n", file=s) + traceback.print_exc(file=s) f = self.send_string(s.getvalue(), 'text/plain') if f: self.copyfile(f, self.wfile) @@ -416,8 +417,8 @@ Submit</h3> import startfile if self.server.options.debug: - print >>sys.stderr, '%s: SERVER: opening "%s"'%(sys.argv[0], - file) + print('%s: SERVER: opening "%s"'%(sys.argv[0], + file), file=sys.stderr) status = startfile.open(file) if status: @@ -696,8 +697,8 @@ File Bug</h3> path = posixpath.join(self.server.root, relpath) if self.server.options.debug > 1: - print >>sys.stderr, '%s: SERVER: sending path "%s"'%(sys.argv[0], - path) + print('%s: SERVER: sending path "%s"'%(sys.argv[0], + path), file=sys.stderr) return self.send_path(path) def send_404(self): |
