r349010 - Portable Python script across Python version

[Serge Guelton via cfe-commits]

Author: serge_sans_paille
Date: Wed Dec 12 23:45:55 2018
New Revision: 349010

URL: http://llvm.org/viewvc/llvm-project?rev=349010&view=rev
Log:
Portable Python script across Python version

SocketServer has been renamed socketserver in Python3.

Differential Revision: https://reviews.llvm.org/D55258

Modified:
    cfe/trunk/tools/scan-view/bin/scan-view

Modified: cfe/trunk/tools/scan-view/bin/scan-view
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/scan-view/bin/scan-view?rev=349010&r1=349009&r2=349010&view=diff
==============================================================================
--- cfe/trunk/tools/scan-view/bin/scan-view (original)
+++ cfe/trunk/tools/scan-view/bin/scan-view Wed Dec 12 23:45:55 2018
@@ -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()