X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2Ftcptest.py;h=5aa7b37bcf117844238d20108cd11bf3286bfbf8;hb=1f729fbf7e8fae3fe71184db41eb8b60063534ae;hp=3879a40468ec6dc51723adf81ed3a7c7ddec0e05;hpb=91a502c1e5932b97f67efbce5c5d0e843b932310;p=tests.git

diff --git a/system/tcptest.py b/system/tcptest.py
index 3879a40..5aa7b37 100755
--- a/system/tcptest.py
+++ b/system/tcptest.py
@@ -7,10 +7,12 @@ import sys
 import time
 import subprocess
 import socket
-import socketserver
+import SocketServer
 import threading
 from optparse import OptionParser    
 
+from __future__ import print_function
+
 def myprint(message, id='client'):
     now = time.strftime("%H:%M:%S", time.localtime())
     print("* {now} ({id}) -- {message}".format(**locals()))
@@ -22,12 +24,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 +54,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: