X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2Ftcptest.py;h=abdc6fb3acf480bd67ca60fb98c414163e223c66;hb=457d31694f7b0f60e2a6fea230e9a3572b9d2b78;hp=3879a40468ec6dc51723adf81ed3a7c7ddec0e05;hpb=8666ae7f0291e8d115e166ef555f02abafc40fc8;p=tests.git

diff --git a/system/tcptest.py b/system/tcptest.py
index 3879a40..abdc6fb 100755
--- a/system/tcptest.py
+++ b/system/tcptest.py
@@ -3,11 +3,19 @@
 # Thierry Parmentelat <thierry.parmentelat@inria.fr>
 # Copyright (C) 2010 INRIA 
 #
+
+# this is a small and simple standalone utility
+# designed to run in slice-space
+# we keep this in python2 for now until python3
+# can be taken for granted in sliceimage
+
+from __future__ import print_function
+
 import sys
 import time
 import subprocess
 import socket
-import socketserver
+import SocketServer
 import threading
 from optparse import OptionParser    
 
@@ -22,12 +30,12 @@ def show_network_status(id):
     myprint("ip route show", id=id)
     subprocess.call(['ip', 'route', 'show'])
 
-class EchoRequestHandler(socketserver.StreamRequestHandler):
+class EchoRequestHandler(SocketServer.StreamRequestHandler):
     def handle(self):
         line = self.rfile.readline()
         self.wfile.write(line)
 
-class UppercaseRequestHandler(socketserver.StreamRequestHandler):
+class UppercaseRequestHandler(SocketServer.StreamRequestHandler):
     def handle(self):
         line = self.rfile.readline()
         self.wfile.write(line.upper())
@@ -52,7 +60,7 @@ class Server:
 
         myprint("==================== tcptest.py server", id='server')
         show_network_status(id='server')
-        server = socketserver.TCPServer((options.address, options.port),
+        server = SocketServer.TCPServer((options.address, options.port),
                                         UppercaseRequestHandler)
         try:
             if options.timeout: