From 1f729fbf7e8fae3fe71184db41eb8b60063534ae Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Wed, 18 Mar 2015 16:40:31 +0100 Subject: [PATCH] revert tcptest to python2 as this runs in the slice context use print() as per print_function though --- system/tcptest.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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: -- 2.43.0