From fa4220127b6ab18a749454e007ed34ba4e92041b Mon Sep 17 00:00:00 2001 From: Serge Guelton Date: Thu, 13 Dec 2018 07:45:55 +0000 Subject: [PATCH] Portable Python script across Python version SocketServer has been renamed socketserver in Python3. Differential Revision: https://reviews.llvm.org/D55258 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@349010 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/scan-view/bin/scan-view | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/scan-view/bin/scan-view b/tools/scan-view/bin/scan-view index a3999168f3..6e384ec217 100755 --- a/tools/scan-view/bin/scan-view +++ b/tools/scan-view/bin/scan-view @@ -80,9 +80,12 @@ def run(port, options, root): def port_is_open(port): - import SocketServer try: - t = SocketServer.TCPServer((kDefaultHost, port), None) + import socketserver + except ImportError: + import SocketServer as socketserver + try: + t = socketserver.TCPServer((kDefaultHost, port), None) except: return False t.server_close() -- 2.50.1