]> granicus.if.org Git - clang/commitdiff
Portable Python script across Python version
authorSerge Guelton <sguelton@quarkslab.com>
Thu, 13 Dec 2018 07:45:55 +0000 (07:45 +0000)
committerSerge Guelton <sguelton@quarkslab.com>
Thu, 13 Dec 2018 07:45:55 +0000 (07:45 +0000)
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

index a3999168f329f7ec7dc8a4edec816d80c26db81b..6e384ec2171db868e2a3b1fcf7c91473c538ea79 100755 (executable)
@@ -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()