Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

bpf: Add Python 3 support to selftests scripts for bpf

Adjust tcp_client.py and tcp_server.py to work with Python 3 by using
the print function, marking string literals as bytes, and using the
newer exception syntax. This should be functionally equivalent and
supports Python 3+.

Signed-off-by: Jeremy Cline <jcline@redhat.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

authored by

Jeremy Cline and committed by
Daniel Borkmann
e66565f3 2cc512c1

+14 -14
+6 -6
tools/testing/selftests/bpf/tcp_client.py
··· 1 - #!/usr/bin/env python2 1 + #!/usr/bin/env python3 2 2 # 3 3 # SPDX-License-Identifier: GPL-2.0 4 4 # ··· 9 9 import select 10 10 11 11 def read(sock, n): 12 - buf = '' 12 + buf = b'' 13 13 while len(buf) < n: 14 14 rem = n - len(buf) 15 15 try: s = sock.recv(rem) 16 - except (socket.error), e: return '' 16 + except (socket.error) as e: return b'' 17 17 buf += s 18 18 return buf 19 19 ··· 22 22 count = 0 23 23 while count < total: 24 24 try: n = sock.send(s) 25 - except (socket.error), e: n = 0 25 + except (socket.error) as e: n = 0 26 26 if n == 0: 27 27 return count; 28 28 count += n ··· 39 39 except socket.error as e: 40 40 sys.exit(1) 41 41 42 - buf = '' 42 + buf = b'' 43 43 n = 0 44 44 while n < 1000: 45 - buf += '+' 45 + buf += b'+' 46 46 n += 1 47 47 48 48 sock.settimeout(1);
+8 -8
tools/testing/selftests/bpf/tcp_server.py
··· 1 - #!/usr/bin/env python2 1 + #!/usr/bin/env python3 2 2 # 3 3 # SPDX-License-Identifier: GPL-2.0 4 4 # ··· 9 9 import select 10 10 11 11 def read(sock, n): 12 - buf = '' 12 + buf = b'' 13 13 while len(buf) < n: 14 14 rem = n - len(buf) 15 15 try: s = sock.recv(rem) 16 - except (socket.error), e: return '' 16 + except (socket.error) as e: return b'' 17 17 buf += s 18 18 return buf 19 19 ··· 22 22 count = 0 23 23 while count < total: 24 24 try: n = sock.send(s) 25 - except (socket.error), e: n = 0 25 + except (socket.error) as e: n = 0 26 26 if n == 0: 27 27 return count; 28 28 count += n ··· 43 43 44 44 try: serverSocket.bind((host, 0)) 45 45 except socket.error as msg: 46 - print 'bind fails: ', msg 46 + print('bind fails: ' + str(msg)) 47 47 48 48 sn = serverSocket.getsockname() 49 49 serverPort = sn[1] ··· 51 51 cmdStr = ("./tcp_client.py %d &") % (serverPort) 52 52 os.system(cmdStr) 53 53 54 - buf = '' 54 + buf = b'' 55 55 n = 0 56 56 while n < 500: 57 - buf += '.' 57 + buf += b'.' 58 58 n += 1 59 59 60 60 serverSocket.listen(MAX_PORTS) ··· 79 79 serverSocket.close() 80 80 sys.exit(0) 81 81 else: 82 - print 'Select timeout!' 82 + print('Select timeout!') 83 83 sys.exit(1)