openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File bcc-python3.patch of Package bcc (Revision 87a97cd76695682d0c437dbc7c73f480)

Currently displaying revision 87a97cd76695682d0c437dbc7c73f480 , Show latest

From d1de8de6459b00f311a66acc775d32eb77e58942 Mon Sep 17 00:00:00 2001
From: Gary Lin <glin@suse.com>
Date: Thu, 8 Feb 2018 11:37:57 +0800
Subject: [PATCH] Use python3 by default

Based on the patch from manfred.h@gmx.net

Index: bcc-0.6.0/docs/reference_guide.md
===================================================================
--- bcc-0.6.0.orig/docs/reference_guide.md
+++ bcc-0.6.0/docs/reference_guide.md
@@ -1037,7 +1037,7 @@ Other examples:
 
 ```Python
 b.attach_uprobe(name="c", sym="getaddrinfo", fn_name="do_entry")
-b.attach_uprobe(name="/usr/bin/python", sym="main", fn_name="do_main")
+b.attach_uprobe(name="/usr/bin/python3", sym="main", fn_name="do_main")
 ```
 
 You can call attach_uprobe() more than once, and attach your BPF function to multiple user-level functions.
@@ -1066,7 +1066,7 @@ Other examples:
 
 ```Python
 b.attach_uprobe(name="c", sym="getaddrinfo", fn_name="do_entry")
-b.attach_uprobe(name="/usr/bin/python", sym="main", fn_name="do_main")
+b.attach_uprobe(name="/usr/bin/python3", sym="main", fn_name="do_main")
 ```
 
 You can call attach_uretprobe() more than once, and attach your BPF function to multiple user-level functions.
Index: bcc-0.6.0/examples/hello_world.py
===================================================================
--- bcc-0.6.0.orig/examples/hello_world.py
+++ bcc-0.6.0/examples/hello_world.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (c) PLUMgrid, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License")
 
Index: bcc-0.6.0/examples/networking/distributed_bridge/main.py
===================================================================
--- bcc-0.6.0.orig/examples/networking/distributed_bridge/main.py
+++ bcc-0.6.0/examples/networking/distributed_bridge/main.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (c) PLUMgrid, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License")
 
@@ -45,9 +45,9 @@ class TunnelSimulation(Simulation):
             host_info.append(self._create_ns("host%d" % i, ipaddr=ipaddr,
                 disable_ipv6=True))
             if multicast:
-              cmd = ["python", "tunnel.py", str(i)]
+              cmd = ["python3", "tunnel.py", str(i)]
             else:
-              cmd = ["python", "tunnel_mesh.py", str(num_hosts), str(i), str(dhcp), str(gretap)]
+              cmd = ["python3", "tunnel_mesh.py", str(num_hosts), str(i), str(dhcp), str(gretap)]
             p = NSPopen(host_info[i][0].nl.netns, cmd, stdin=PIPE)
             self.processes.append(p)
         with self.ipdb.create(ifname="br-fabric", kind="bridge") as br:
Index: bcc-0.6.0/examples/networking/distributed_bridge/tunnel.py
===================================================================
--- bcc-0.6.0.orig/examples/networking/distributed_bridge/tunnel.py
+++ bcc-0.6.0/examples/networking/distributed_bridge/tunnel.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (c) PLUMgrid, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License")
 
Index: bcc-0.6.0/examples/networking/distributed_bridge/tunnel_mesh.py
===================================================================
--- bcc-0.6.0.orig/examples/networking/distributed_bridge/tunnel_mesh.py
+++ bcc-0.6.0/examples/networking/distributed_bridge/tunnel_mesh.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (c) PLUMgrid, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License")
 
Index: bcc-0.6.0/examples/networking/dns_matching/dns_matching.py
===================================================================
--- bcc-0.6.0.orig/examples/networking/dns_matching/dns_matching.py
+++ bcc-0.6.0/examples/networking/dns_matching/dns_matching.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 from __future__ import print_function
 from bcc import BPF
Index: bcc-0.6.0/examples/networking/http_filter/README.md
===================================================================
--- bcc-0.6.0.orig/examples/networking/http_filter/README.md
+++ bcc-0.6.0/examples/networking/http_filter/README.md
@@ -7,7 +7,7 @@ eBPF application that parses HTTP packet
 ## Usage Example
 
 
-    $ sudo python http-parse-complete.py 
+    $ sudo python3 http-parse-complete.py
     GET /pipermail/iovisor-dev/ HTTP/1.1
     HTTP/1.1 200 OK
     GET /favicon.ico HTTP/1.1
@@ -43,5 +43,5 @@ Two versions of this code are available
 
 This sample can be executed by typing either one the two commands below:
  
-    $ sudo python http-parse-simple.py
-    $ sudo python http-parse-complete.py
+    $ sudo python3 http-parse-simple.py
+    $ sudo python3 http-parse-complete.py
Index: bcc-0.6.0/examples/networking/http_filter/http-parse-complete.py
===================================================================
--- bcc-0.6.0.orig/examples/networking/http_filter/http-parse-complete.py
+++ bcc-0.6.0/examples/networking/http_filter/http-parse-complete.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 #Bertrone Matteo - Polytechnic of Turin
 #November 2015
Index: bcc-0.6.0/examples/networking/http_filter/http-parse-simple.py
===================================================================
--- bcc-0.6.0.orig/examples/networking/http_filter/http-parse-simple.py
+++ bcc-0.6.0/examples/networking/http_filter/http-parse-simple.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 #Bertrone Matteo - Polytechnic of Turin
 #November 2015
Index: bcc-0.6.0/examples/networking/neighbor_sharing/tc_neighbor_sharing.py
===================================================================
--- bcc-0.6.0.orig/examples/networking/neighbor_sharing/tc_neighbor_sharing.py
+++ bcc-0.6.0/examples/networking/neighbor_sharing/tc_neighbor_sharing.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (c) PLUMgrid, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License")
 
Index: bcc-0.6.0/examples/networking/simple_tc.py
===================================================================
--- bcc-0.6.0.orig/examples/networking/simple_tc.py
+++ bcc-0.6.0/examples/networking/simple_tc.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # Copyright (c) PLUMgrid, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License")
 
Index: bcc-0.6.0/examples/networking/tc_perf_event.py
===================================================================
--- bcc-0.6.0.orig/examples/networking/tc_perf_event.py
+++ bcc-0.6.0/examples/networking/tc_perf_event.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # tc_perf_event.py  Output skb and meta data through perf event
 #
Index: bcc-0.6.0/examples/networking/tunnel_monitor/README.md
===================================================================
--- bcc-0.6.0.orig/examples/networking/tunnel_monitor/README.md
+++ bcc-0.6.0/examples/networking/tunnel_monitor/README.md
@@ -40,7 +40,7 @@ fastclick#1.0.6 bower_components/fastcli
 Then, start the simulation by running main.py:
 
 ```
-[root@bcc-dev tunnel_monitor]# python main.py 
+[root@bcc-dev tunnel_monitor]# python3 main.py
 Launching host 1 of 9
 Launching host 2 of 9
 ...
Index: bcc-0.6.0/examples/networking/tunnel_monitor/main.py
===================================================================
--- bcc-0.6.0.orig/examples/networking/tunnel_monitor/main.py
+++ bcc-0.6.0/examples/networking/tunnel_monitor/main.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (c) PLUMgrid, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License")
 
@@ -61,7 +61,7 @@ class TunnelSimulation(Simulation):
 
         # pick one host to start the monitor in
         host = host_info[0]
-        cmd = ["python", "monitor.py"]
+        cmd = ["python3", "monitor.py"]
         p = NSPopen(host[0].nl.netns, cmd)
         self.processes.append(p)
 
Index: bcc-0.6.0/examples/networking/tunnel_monitor/monitor.py
===================================================================
--- bcc-0.6.0.orig/examples/networking/tunnel_monitor/monitor.py
+++ bcc-0.6.0/examples/networking/tunnel_monitor/monitor.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (c) PLUMgrid, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License")
 
Index: bcc-0.6.0/examples/networking/vlan_learning/vlan_learning.py
===================================================================
--- bcc-0.6.0.orig/examples/networking/vlan_learning/vlan_learning.py
+++ bcc-0.6.0/examples/networking/vlan_learning/vlan_learning.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (c) PLUMgrid, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License")
 
@@ -33,7 +33,7 @@ class VlanSimulation(Simulation):
         for i in range(0, num_clients):
             httpmod = ("SimpleHTTPServer" if sys.version_info[0] < 3
                        else "http.server")
-            cmd = ["python", "-m", httpmod, "80"]
+            cmd = ["python3", "-m", httpmod, "80"]
             self._create_ns("worker%d" % i, cmd=cmd, fn=virt_fn, action="drop",
                             ipaddr="172.16.1.5/24")
 
Index: bcc-0.6.0/examples/networking/xdp/xdp_drop_count.py
===================================================================
--- bcc-0.6.0.orig/examples/networking/xdp/xdp_drop_count.py
+++ bcc-0.6.0/examples/networking/xdp/xdp_drop_count.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # xdp_drop_count.py Drop incoming packets on XDP layer and count for which
 #                   protocol type
Index: bcc-0.6.0/examples/tracing/bitehist.py
===================================================================
--- bcc-0.6.0.orig/examples/tracing/bitehist.py
+++ bcc-0.6.0/examples/tracing/bitehist.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # bitehist.py	Block I/O size histogram.
 #		For Linux, uses BCC, eBPF. Embedded C.
Index: bcc-0.6.0/examples/tracing/disksnoop.py
===================================================================
--- bcc-0.6.0.orig/examples/tracing/disksnoop.py
+++ bcc-0.6.0/examples/tracing/disksnoop.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # disksnoop.py	Trace block device I/O: basic version of iosnoop.
 #		For Linux, uses BCC, eBPF. Embedded C.
Index: bcc-0.6.0/examples/tracing/hello_fields.py
===================================================================
--- bcc-0.6.0.orig/examples/tracing/hello_fields.py
+++ bcc-0.6.0/examples/tracing/hello_fields.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # This is a Hello World example that formats output as fields.
 
Index: bcc-0.6.0/examples/tracing/hello_perf_output.py
===================================================================
--- bcc-0.6.0.orig/examples/tracing/hello_perf_output.py
+++ bcc-0.6.0/examples/tracing/hello_perf_output.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # This is a Hello World example that uses BPF_PERF_OUTPUT.
 
Index: bcc-0.6.0/examples/tracing/kvm_hypercall.py
===================================================================
--- bcc-0.6.0.orig/examples/tracing/kvm_hypercall.py
+++ bcc-0.6.0/examples/tracing/kvm_hypercall.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # kvm_hypercall.py
 #
Index: bcc-0.6.0/examples/tracing/mallocstacks.py
===================================================================
--- bcc-0.6.0.orig/examples/tracing/mallocstacks.py
+++ bcc-0.6.0/examples/tracing/mallocstacks.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # mallocstacks  Trace malloc() calls in a process and print the full
 #               stack trace for all callsites.
Index: bcc-0.6.0/examples/tracing/mysqld_query.py
===================================================================
--- bcc-0.6.0.orig/examples/tracing/mysqld_query.py
+++ bcc-0.6.0/examples/tracing/mysqld_query.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # mysqld_query    Trace MySQL server queries. Example of USDT tracing.
 #                 For Linux, uses BCC, BPF. Embedded C.
Index: bcc-0.6.0/examples/tracing/nodejs_http_server.py
===================================================================
--- bcc-0.6.0.orig/examples/tracing/nodejs_http_server.py
+++ bcc-0.6.0/examples/tracing/nodejs_http_server.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # nodejs_http_server    Basic example of node.js USDT tracing.
 #                       For Linux, uses BCC, BPF. Embedded C.
Index: bcc-0.6.0/examples/tracing/stacksnoop.py
===================================================================
--- bcc-0.6.0.orig/examples/tracing/stacksnoop.py
+++ bcc-0.6.0/examples/tracing/stacksnoop.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # stacksnoop    Trace a kernel function and print all kernel stack traces.
 #               For Linux, uses BCC, eBPF, and currently x86_64 only. Inline C.
Index: bcc-0.6.0/examples/tracing/strlen_count.py
===================================================================
--- bcc-0.6.0.orig/examples/tracing/strlen_count.py
+++ bcc-0.6.0/examples/tracing/strlen_count.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # strlen_count  Trace strlen() and print a frequency count of strings.
 #               For Linux, uses BCC, eBPF. Embedded C.
Index: bcc-0.6.0/examples/tracing/strlen_hist.py
===================================================================
--- bcc-0.6.0.orig/examples/tracing/strlen_hist.py
+++ bcc-0.6.0/examples/tracing/strlen_hist.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 #
 # strlen_hist.py   Histogram of system-wide strlen return values
Index: bcc-0.6.0/examples/tracing/strlen_snoop.py
===================================================================
--- bcc-0.6.0.orig/examples/tracing/strlen_snoop.py
+++ bcc-0.6.0/examples/tracing/strlen_snoop.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # strlen_snoop  Trace strlen() library function for a given PID.
 #               For Linux, uses BCC, eBPF. Embedded C.
Index: bcc-0.6.0/examples/tracing/sync_timing.py
===================================================================
--- bcc-0.6.0.orig/examples/tracing/sync_timing.py
+++ bcc-0.6.0/examples/tracing/sync_timing.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # sync_timing.py    Trace time between syncs.
 #                   For Linux, uses BCC, eBPF. Embedded C.
Index: bcc-0.6.0/examples/tracing/task_switch.py
===================================================================
--- bcc-0.6.0.orig/examples/tracing/task_switch.py
+++ bcc-0.6.0/examples/tracing/task_switch.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # Copyright (c) PLUMgrid, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License")
 
Index: bcc-0.6.0/examples/tracing/tcpv4connect.py
===================================================================
--- bcc-0.6.0.orig/examples/tracing/tcpv4connect.py
+++ bcc-0.6.0/examples/tracing/tcpv4connect.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # tcpv4connect	Trace TCP IPv4 connect()s.
 #		For Linux, uses BCC, eBPF. Embedded C.
Index: bcc-0.6.0/examples/tracing/trace_fields.py
===================================================================
--- bcc-0.6.0.orig/examples/tracing/trace_fields.py
+++ bcc-0.6.0/examples/tracing/trace_fields.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (c) PLUMgrid, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License")
 
Index: bcc-0.6.0/examples/tracing/trace_perf_output.py
===================================================================
--- bcc-0.6.0.orig/examples/tracing/trace_perf_output.py
+++ bcc-0.6.0/examples/tracing/trace_perf_output.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (c) PLUMgrid, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License")
 
Index: bcc-0.6.0/examples/tracing/urandomread-explicit.py
===================================================================
--- bcc-0.6.0.orig/examples/tracing/urandomread-explicit.py
+++ bcc-0.6.0/examples/tracing/urandomread-explicit.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # urandomread-explicit  Example of instrumenting a kernel tracepoint.
 #                       For Linux, uses BCC, BPF. Embedded C.
Index: bcc-0.6.0/examples/tracing/urandomread.py
===================================================================
--- bcc-0.6.0.orig/examples/tracing/urandomread.py
+++ bcc-0.6.0/examples/tracing/urandomread.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # urandomread  Example of instrumenting a kernel tracepoint.
 #              For Linux, uses BCC, BPF. Embedded C.
Index: bcc-0.6.0/examples/tracing/vfsreadlat.py
===================================================================
--- bcc-0.6.0.orig/examples/tracing/vfsreadlat.py
+++ bcc-0.6.0/examples/tracing/vfsreadlat.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # vfsreadlat.py		VFS read latency distribution.
 #			For Linux, uses BCC, eBPF. See .c file.
Index: bcc-0.6.0/examples/usdt_sample/usdt_sample.md
===================================================================
--- bcc-0.6.0.orig/examples/usdt_sample/usdt_sample.md
+++ bcc-0.6.0/examples/usdt_sample/usdt_sample.md
@@ -25,7 +25,7 @@ $ popd
 
 After building, you should see the available probes:
 ```bash
-$ python tools/tplist.py -l examples/usdt_sample/build/usdt_sample_lib1/libusdt_sample_lib1.so
+$ python3 tools/tplist.py -l examples/usdt_sample/build/usdt_sample_lib1/libusdt_sample_lib1.so
 examples/usdt_sample/build/usdt_sample_lib1/libusdt_sample_lib1.so usdt_sample_lib1:operation_end
 examples/usdt_sample/build/usdt_sample_lib1/libusdt_sample_lib1.so usdt_sample_lib1:operation_start
 $ readelf -n examples/usdt_sample/build/usdt_sample_lib1/libusdt_sample_lib1.so
@@ -64,7 +64,7 @@ Press ctrl-c to exit.
 
 Use argdist.py on the individual probes:
 ```bash
-$ sudo python tools/argdist.py -p 25433 -i 5 -C 'u:usdt_sample_lib1:operation_start():char*:arg2#input' -z 32
+$ sudo python3 tools/argdist.py -p 25433 -i 5 -C 'u:usdt_sample_lib1:operation_start():char*:arg2#input' -z 32
 [11:18:29]
 input
 	COUNT      EVENT
@@ -97,7 +97,7 @@ input
 
 Use latency.py to trace the operation latencies:
 ```bash
-$ sudo python examples/usdt_sample/scripts/latency.py -p=25433 -f="pf_2"
+$ sudo python3 examples/usdt_sample/scripts/latency.py -p=25433 -f="pf_2"
 Attaching probes to pid 25433
 Tracing... Hit Ctrl-C to end.
 time(s)            id         input                            output                                 start (ns)         end (ns)    duration (us)
@@ -121,7 +121,7 @@ time(s)            id         input
 
 Use lat_dist.py to trace the latency distribution:
 ```bash
-$ sudo python examples/usdt_sample/scripts/lat_dist.py -p=25433 -i=30 -f="pf_20"
+$ sudo python3 examples/usdt_sample/scripts/lat_dist.py -p=25433 -i=30 -f="pf_20"
 Attaching probes to pid 25433
 [11:23:47]
 
@@ -147,7 +147,7 @@ Bucket ptr = 'pf_20'
 
 Use lat_avg.py to trace the moving average of the latencies:
 ```bash
-$ sudo python examples/usdt_sample/scripts/lat_avg.py -p=25433 -i=5 -c=10 -f="pf_2"
+$ sudo python3 examples/usdt_sample/scripts/lat_avg.py -p=25433 -i=5 -c=10 -f="pf_2"
 Attaching probes to pid 25433
 Tracing... Hit Ctrl-C to end.
 [11:28:32]
Index: bcc-0.6.0/snapcraft/wrapper
===================================================================
--- bcc-0.6.0.orig/snapcraft/wrapper
+++ bcc-0.6.0/snapcraft/wrapper
@@ -7,7 +7,7 @@
 cmd="$1"
 if [ `id -u` = 0 ] ; then
 	shift
-	stdbuf -oL $SNAP/usr/bin/python "$SNAP/usr/share/bcc/tools/$cmd" $@
+	stdbuf -oL $SNAP/usr/bin/python3 "$SNAP/usr/share/bcc/tools/$cmd" $@
 else
 	echo "Need to run $cmd as root (use sudo $@)"
 	exit 1
Index: bcc-0.6.0/src/python/bcc/__init__.py
===================================================================
--- bcc-0.6.0.orig/src/python/bcc/__init__.py
+++ bcc-0.6.0/src/python/bcc/__init__.py
@@ -905,7 +905,7 @@ class BPF(object):
         version of the library used by the process.
 
         Example: BPF(text).attach_uprobe("c", "malloc")
-                 BPF(text).attach_uprobe("/usr/bin/python", "main")
+                 BPF(text).attach_uprobe("/usr/bin/python3", "main")
         """
 
         name = _assert_is_bytes(name)
Index: bcc-0.6.0/tests/lua/test_uprobes.lua
===================================================================
--- bcc-0.6.0.orig/tests/lua/test_uprobes.lua
+++ bcc-0.6.0/tests/lua/test_uprobes.lua
@@ -54,10 +54,10 @@ int count(struct pt_regs *ctx) {
 }]]
 
   local b = BPF:new{text=text}
-  b:attach_uprobe{name="/usr/bin/python", sym="main", fn_name="count"}
-  b:attach_uprobe{name="/usr/bin/python", sym="main", fn_name="count", retprobe=true}
+  b:attach_uprobe{name="/usr/bin/python3", sym="main", fn_name="count"}
+  b:attach_uprobe{name="/usr/bin/python3", sym="main", fn_name="count", retprobe=true}
 
-  os.spawn("/usr/bin/python -V")
+  os.spawn("/usr/bin/python3 -V")
 
   local stats = b:get_table("stats")
   assert_true(tonumber(stats:get(0)) >= 2)
Index: bcc-0.6.0/tests/python/test_array.py
===================================================================
--- bcc-0.6.0.orig/tests/python/test_array.py
+++ bcc-0.6.0/tests/python/test_array.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (c) PLUMgrid, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License")
 
Index: bcc-0.6.0/tests/python/test_bpf_log.py
===================================================================
--- bcc-0.6.0.orig/tests/python/test_bpf_log.py
+++ bcc-0.6.0/tests/python/test_bpf_log.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (c) PLUMgrid, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License")
 
Index: bcc-0.6.0/tests/python/test_brb.py
===================================================================
--- bcc-0.6.0.orig/tests/python/test_brb.py
+++ bcc-0.6.0/tests/python/test_brb.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (c) PLUMgrid, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License")
 
Index: bcc-0.6.0/tests/python/test_brb2.py
===================================================================
--- bcc-0.6.0.orig/tests/python/test_brb2.py
+++ bcc-0.6.0/tests/python/test_brb2.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (c) PLUMgrid, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License")
 
Index: bcc-0.6.0/tests/python/test_call1.py
===================================================================
--- bcc-0.6.0.orig/tests/python/test_call1.py
+++ bcc-0.6.0/tests/python/test_call1.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (c) PLUMgrid, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License")
 
Index: bcc-0.6.0/tests/python/test_clang.py
===================================================================
--- bcc-0.6.0.orig/tests/python/test_clang.py
+++ bcc-0.6.0/tests/python/test_clang.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (c) PLUMgrid, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License")
 
Index: bcc-0.6.0/tests/python/test_debuginfo.py
===================================================================
--- bcc-0.6.0.orig/tests/python/test_debuginfo.py
+++ bcc-0.6.0/tests/python/test_debuginfo.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (c) Sasha Goldshtein
 # Licensed under the Apache License, Version 2.0 (the "License")
 
Index: bcc-0.6.0/tests/python/test_dump_func.py
===================================================================
--- bcc-0.6.0.orig/tests/python/test_dump_func.py
+++ bcc-0.6.0/tests/python/test_dump_func.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (c) PLUMgrid, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License")
 
Index: bcc-0.6.0/tests/python/test_flags.py
===================================================================
--- bcc-0.6.0.orig/tests/python/test_flags.py
+++ bcc-0.6.0/tests/python/test_flags.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (c) PLUMgrid, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License")
 
Index: bcc-0.6.0/tests/python/test_histogram.py
===================================================================
--- bcc-0.6.0.orig/tests/python/test_histogram.py
+++ bcc-0.6.0/tests/python/test_histogram.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (c) PLUMgrid, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License")
 
Index: bcc-0.6.0/tests/python/test_lpm_trie.py
===================================================================
--- bcc-0.6.0.orig/tests/python/test_lpm_trie.py
+++ bcc-0.6.0/tests/python/test_lpm_trie.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (c) 2017 Facebook, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License")
 
Index: bcc-0.6.0/tests/python/test_lru.py
===================================================================
--- bcc-0.6.0.orig/tests/python/test_lru.py
+++ bcc-0.6.0/tests/python/test_lru.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (c) PLUMgrid, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License")
 
Index: bcc-0.6.0/tests/python/test_percpu.py
===================================================================
--- bcc-0.6.0.orig/tests/python/test_percpu.py
+++ bcc-0.6.0/tests/python/test_percpu.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (c) PLUMgrid, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License")
 
Index: bcc-0.6.0/tests/python/test_perf_event.py
===================================================================
--- bcc-0.6.0.orig/tests/python/test_perf_event.py
+++ bcc-0.6.0/tests/python/test_perf_event.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (c) 2016 PLUMgrid
 # Licensed under the Apache License, Version 2.0 (the "License")
 
Index: bcc-0.6.0/tests/python/test_probe_count.py
===================================================================
--- bcc-0.6.0.orig/tests/python/test_probe_count.py
+++ bcc-0.6.0/tests/python/test_probe_count.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (c) Suchakra Sharma <suchakrapani.sharma@polymtl.ca>
 # Licensed under the Apache License, Version 2.0 (the "License")
 
Index: bcc-0.6.0/tests/python/test_shared_table.py
===================================================================
--- bcc-0.6.0.orig/tests/python/test_shared_table.py
+++ bcc-0.6.0/tests/python/test_shared_table.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (c) 2016 Facebook, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License")
 
Index: bcc-0.6.0/tests/python/test_stackid.py
===================================================================
--- bcc-0.6.0.orig/tests/python/test_stackid.py
+++ bcc-0.6.0/tests/python/test_stackid.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # Copyright (c) PLUMgrid, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License")
 
Index: bcc-0.6.0/tests/python/test_stat1.py
===================================================================
--- bcc-0.6.0.orig/tests/python/test_stat1.py
+++ bcc-0.6.0/tests/python/test_stat1.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (c) PLUMgrid, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License")
 
Index: bcc-0.6.0/tests/python/test_tools_memleak.py
===================================================================
--- bcc-0.6.0.orig/tests/python/test_tools_memleak.py
+++ bcc-0.6.0/tests/python/test_tools_memleak.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 from unittest import main, skipUnless, TestCase
 import distutils.version
Index: bcc-0.6.0/tests/python/test_tools_smoke.py
===================================================================
--- bcc-0.6.0.orig/tests/python/test_tools_smoke.py
+++ bcc-0.6.0/tests/python/test_tools_smoke.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (c) Sasha Goldshtein, 2017
 # Licensed under the Apache License, Version 2.0 (the "License")
 
Index: bcc-0.6.0/tests/python/test_trace1.py
===================================================================
--- bcc-0.6.0.orig/tests/python/test_trace1.py
+++ bcc-0.6.0/tests/python/test_trace1.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (c) PLUMgrid, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License")
 
Index: bcc-0.6.0/tests/python/test_trace2.py
===================================================================
--- bcc-0.6.0.orig/tests/python/test_trace2.py
+++ bcc-0.6.0/tests/python/test_trace2.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (c) PLUMgrid, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License")
 
Index: bcc-0.6.0/tests/python/test_trace3.py
===================================================================
--- bcc-0.6.0.orig/tests/python/test_trace3.py
+++ bcc-0.6.0/tests/python/test_trace3.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (c) PLUMgrid, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License")
 
Index: bcc-0.6.0/tests/python/test_trace4.py
===================================================================
--- bcc-0.6.0.orig/tests/python/test_trace4.py
+++ bcc-0.6.0/tests/python/test_trace4.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (c) PLUMgrid, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License")
 
Index: bcc-0.6.0/tests/python/test_tracepoint.py
===================================================================
--- bcc-0.6.0.orig/tests/python/test_tracepoint.py
+++ bcc-0.6.0/tests/python/test_tracepoint.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (c) Sasha Goldshtein
 # Licensed under the Apache License, Version 2.0 (the "License")
 
Index: bcc-0.6.0/tests/python/test_uprobes.py
===================================================================
--- bcc-0.6.0.orig/tests/python/test_uprobes.py
+++ bcc-0.6.0/tests/python/test_uprobes.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (c) PLUMgrid, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License")
 
@@ -56,13 +56,13 @@ int count(struct pt_regs *ctx) {
     return 0;
 }"""
         b = bcc.BPF(text=text)
-        b.attach_uprobe(name="/usr/bin/python", sym="main", fn_name="count")
-        b.attach_uretprobe(name="/usr/bin/python", sym="main", fn_name="count")
-        with os.popen("/usr/bin/python -V") as f:
+        b.attach_uprobe(name="/usr/bin/python3", sym="main", fn_name="count")
+        b.attach_uretprobe(name="/usr/bin/python3", sym="main", fn_name="count")
+        with os.popen("/usr/bin/python3 -V") as f:
             pass
         self.assertGreater(b["stats"][ctypes.c_int(0)].value, 0)
-        b.detach_uretprobe(name="/usr/bin/python", sym="main")
-        b.detach_uprobe(name="/usr/bin/python", sym="main")
+        b.detach_uretprobe(name="/usr/bin/python3", sym="main")
+        b.detach_uprobe(name="/usr/bin/python3", sym="main")
 
     def test_mount_namespace(self):
         text = """
Index: bcc-0.6.0/tests/python/test_usdt.py
===================================================================
--- bcc-0.6.0.orig/tests/python/test_usdt.py
+++ bcc-0.6.0/tests/python/test_usdt.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # USAGE: test_usdt.py
 #
Index: bcc-0.6.0/tests/python/test_usdt2.py
===================================================================
--- bcc-0.6.0.orig/tests/python/test_usdt2.py
+++ bcc-0.6.0/tests/python/test_usdt2.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # USAGE: test_usdt2.py
 #
Index: bcc-0.6.0/tests/python/test_utils.py
===================================================================
--- bcc-0.6.0.orig/tests/python/test_utils.py
+++ bcc-0.6.0/tests/python/test_utils.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # Copyright (c) Catalysts GmbH
 # Licensed under the Apache License, Version 2.0 (the "License")
 
Index: bcc-0.6.0/tests/python/test_xlate1.py
===================================================================
--- bcc-0.6.0.orig/tests/python/test_xlate1.py
+++ bcc-0.6.0/tests/python/test_xlate1.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (c) PLUMgrid, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License")
 
Index: bcc-0.6.0/tools/argdist.py
===================================================================
--- bcc-0.6.0.orig/tools/argdist.py
+++ bcc-0.6.0/tools/argdist.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # argdist   Trace a function and display a distribution of its
 #           parameter values as a histogram or frequency count.
Index: bcc-0.6.0/tools/bashreadline.py
===================================================================
--- bcc-0.6.0.orig/tools/bashreadline.py
+++ bcc-0.6.0/tools/bashreadline.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # bashreadline  Print entered bash commands from all running shells.
 #               For Linux, uses BCC, eBPF. Embedded C.
Index: bcc-0.6.0/tools/biolatency.py
===================================================================
--- bcc-0.6.0.orig/tools/biolatency.py
+++ bcc-0.6.0/tools/biolatency.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # biolatency    Summarize block device I/O latency as a histogram.
Index: bcc-0.6.0/tools/biosnoop.py
===================================================================
--- bcc-0.6.0.orig/tools/biosnoop.py
+++ bcc-0.6.0/tools/biosnoop.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # biosnoop  Trace block device I/O and print details including issuing PID.
Index: bcc-0.6.0/tools/biotop.py
===================================================================
--- bcc-0.6.0.orig/tools/biotop.py
+++ bcc-0.6.0/tools/biotop.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # biotop  block device (disk) I/O by process.
Index: bcc-0.6.0/tools/bitesize.py
===================================================================
--- bcc-0.6.0.orig/tools/bitesize.py
+++ bcc-0.6.0/tools/bitesize.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # bitehist.py   Block I/O size histogram.
 #               For Linux, uses BCC, eBPF. See .c file.
Index: bcc-0.6.0/tools/bpflist.py
===================================================================
--- bcc-0.6.0.orig/tools/bpflist.py
+++ bcc-0.6.0/tools/bpflist.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # bpflist   Display processes currently using BPF programs and maps,
 #           pinned BPF programs and maps, and enabled probes.
Index: bcc-0.6.0/tools/btrfsdist.py
===================================================================
--- bcc-0.6.0.orig/tools/btrfsdist.py
+++ bcc-0.6.0/tools/btrfsdist.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # btrfsdist  Summarize btrfs operation latency.
Index: bcc-0.6.0/tools/btrfsslower.py
===================================================================
--- bcc-0.6.0.orig/tools/btrfsslower.py
+++ bcc-0.6.0/tools/btrfsslower.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # btrfsslower  Trace slow btrfs operations.
Index: bcc-0.6.0/tools/cachestat.py
===================================================================
--- bcc-0.6.0.orig/tools/cachestat.py
+++ bcc-0.6.0/tools/cachestat.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # cachestat     Count cache kernel function calls.
 #               For Linux, uses BCC, eBPF. See .c file.
Index: bcc-0.6.0/tools/cachetop.py
===================================================================
--- bcc-0.6.0.orig/tools/cachetop.py
+++ bcc-0.6.0/tools/cachetop.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # cachetop      Count cache kernel function calls per processes
Index: bcc-0.6.0/tools/capable.py
===================================================================
--- bcc-0.6.0.orig/tools/capable.py
+++ bcc-0.6.0/tools/capable.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # capable   Trace security capabilitiy checks (cap_capable()).
Index: bcc-0.6.0/tools/cpudist.py
===================================================================
--- bcc-0.6.0.orig/tools/cpudist.py
+++ bcc-0.6.0/tools/cpudist.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # cpudist   Summarize on- and off-CPU time per task as a histogram.
Index: bcc-0.6.0/tools/cpuunclaimed.py
===================================================================
--- bcc-0.6.0.orig/tools/cpuunclaimed.py
+++ bcc-0.6.0/tools/cpuunclaimed.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # cpuunclaimed   Sample CPU run queues and calculate unclaimed idle CPU.
Index: bcc-0.6.0/tools/dbslower.py
===================================================================
--- bcc-0.6.0.orig/tools/dbslower.py
+++ bcc-0.6.0/tools/dbslower.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # dbslower      Trace MySQL and PostgreSQL queries slower than a threshold.
 #
Index: bcc-0.6.0/tools/dbstat.py
===================================================================
--- bcc-0.6.0.orig/tools/dbstat.py
+++ bcc-0.6.0/tools/dbstat.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # dbstat        Display a histogram of MySQL and PostgreSQL query latencies.
 #
Index: bcc-0.6.0/tools/dcsnoop.py
===================================================================
--- bcc-0.6.0.orig/tools/dcsnoop.py
+++ bcc-0.6.0/tools/dcsnoop.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # dcsnoop   Trace directory entry cache (dcache) lookups.
Index: bcc-0.6.0/tools/dcstat.py
===================================================================
--- bcc-0.6.0.orig/tools/dcstat.py
+++ bcc-0.6.0/tools/dcstat.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # dcstat   Directory entry cache (dcache) stats.
Index: bcc-0.6.0/tools/deadlock_detector.py
===================================================================
--- bcc-0.6.0.orig/tools/deadlock_detector.py
+++ bcc-0.6.0/tools/deadlock_detector.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # deadlock_detector  Detects potential deadlocks (lock order inversions)
 #                    on a running process. For Linux, uses BCC, eBPF.
Index: bcc-0.6.0/tools/execsnoop.py
===================================================================
--- bcc-0.6.0.orig/tools/execsnoop.py
+++ bcc-0.6.0/tools/execsnoop.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # execsnoop Trace new processes via exec() syscalls.
Index: bcc-0.6.0/tools/ext4dist.py
===================================================================
--- bcc-0.6.0.orig/tools/ext4dist.py
+++ bcc-0.6.0/tools/ext4dist.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # ext4dist  Summarize ext4 operation latency.
Index: bcc-0.6.0/tools/ext4slower.py
===================================================================
--- bcc-0.6.0.orig/tools/ext4slower.py
+++ bcc-0.6.0/tools/ext4slower.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # ext4slower  Trace slow ext4 operations.
Index: bcc-0.6.0/tools/filelife.py
===================================================================
--- bcc-0.6.0.orig/tools/filelife.py
+++ bcc-0.6.0/tools/filelife.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # filelife    Trace the lifespan of short-lived files.
Index: bcc-0.6.0/tools/fileslower.py
===================================================================
--- bcc-0.6.0.orig/tools/fileslower.py
+++ bcc-0.6.0/tools/fileslower.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # fileslower  Trace slow synchronous file reads and writes.
Index: bcc-0.6.0/tools/filetop.py
===================================================================
--- bcc-0.6.0.orig/tools/filetop.py
+++ bcc-0.6.0/tools/filetop.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # filetop  file reads and writes by process.
Index: bcc-0.6.0/tools/funccount.py
===================================================================
--- bcc-0.6.0.orig/tools/funccount.py
+++ bcc-0.6.0/tools/funccount.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # funccount Count functions, tracepoints, and USDT probes.
Index: bcc-0.6.0/tools/funclatency.py
===================================================================
--- bcc-0.6.0.orig/tools/funclatency.py
+++ bcc-0.6.0/tools/funclatency.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # funclatency   Time functions and print latency as a histogram.
Index: bcc-0.6.0/tools/funcslower.py
===================================================================
--- bcc-0.6.0.orig/tools/funcslower.py
+++ bcc-0.6.0/tools/funcslower.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # funcslower  Trace slow kernel or user function calls.
Index: bcc-0.6.0/tools/gethostlatency.py
===================================================================
--- bcc-0.6.0.orig/tools/gethostlatency.py
+++ bcc-0.6.0/tools/gethostlatency.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # gethostlatency  Show latency for getaddrinfo/gethostbyname[2] calls.
 #                 For Linux, uses BCC, eBPF. Embedded C.
Index: bcc-0.6.0/tools/hardirqs.py
===================================================================
--- bcc-0.6.0.orig/tools/hardirqs.py
+++ bcc-0.6.0/tools/hardirqs.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # hardirqs  Summarize hard IRQ (interrupt) event time.
Index: bcc-0.6.0/tools/killsnoop.py
===================================================================
--- bcc-0.6.0.orig/tools/killsnoop.py
+++ bcc-0.6.0/tools/killsnoop.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # killsnoop Trace signals issued by the kill() syscall.
Index: bcc-0.6.0/tools/lib/ucalls.py
===================================================================
--- bcc-0.6.0.orig/tools/lib/ucalls.py
+++ bcc-0.6.0/tools/lib/ucalls.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # ucalls  Summarize method calls in high-level languages and/or system calls.
Index: bcc-0.6.0/tools/lib/uflow.py
===================================================================
--- bcc-0.6.0.orig/tools/lib/uflow.py
+++ bcc-0.6.0/tools/lib/uflow.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # uflow  Trace method execution flow in high-level languages.
Index: bcc-0.6.0/tools/lib/ugc.py
===================================================================
--- bcc-0.6.0.orig/tools/lib/ugc.py
+++ bcc-0.6.0/tools/lib/ugc.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # ugc  Summarize garbage collection events in high-level languages.
Index: bcc-0.6.0/tools/lib/uobjnew.py
===================================================================
--- bcc-0.6.0.orig/tools/lib/uobjnew.py
+++ bcc-0.6.0/tools/lib/uobjnew.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # uobjnew  Summarize object allocations in high-level languages.
Index: bcc-0.6.0/tools/lib/ustat.py
===================================================================
--- bcc-0.6.0.orig/tools/lib/ustat.py
+++ bcc-0.6.0/tools/lib/ustat.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # ustat  Activity stats from high-level languages, including exceptions,
Index: bcc-0.6.0/tools/lib/uthreads.py
===================================================================
--- bcc-0.6.0.orig/tools/lib/uthreads.py
+++ bcc-0.6.0/tools/lib/uthreads.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # uthreads  Trace thread creation/destruction events in high-level languages.
Index: bcc-0.6.0/tools/llcstat.py
===================================================================
--- bcc-0.6.0.orig/tools/llcstat.py
+++ bcc-0.6.0/tools/llcstat.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # llcstat.py Summarize cache references and cache misses by PID.
 #            Cache reference and cache miss are corresponding events defined in
Index: bcc-0.6.0/tools/mdflush.py
===================================================================
--- bcc-0.6.0.orig/tools/mdflush.py
+++ bcc-0.6.0/tools/mdflush.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # mdflush  Trace md flush events.
Index: bcc-0.6.0/tools/memleak.py
===================================================================
--- bcc-0.6.0.orig/tools/memleak.py
+++ bcc-0.6.0/tools/memleak.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # memleak   Trace and display outstanding allocations to detect
 #           memory leaks in user-mode processes and the kernel.
Index: bcc-0.6.0/tools/mountsnoop.py
===================================================================
--- bcc-0.6.0.orig/tools/mountsnoop.py
+++ bcc-0.6.0/tools/mountsnoop.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # mountsnoop Trace mount() and umount syscalls.
 #            For Linux, uses BCC, eBPF. Embedded C.
Index: bcc-0.6.0/tools/mysqld_qslower.py
===================================================================
--- bcc-0.6.0.orig/tools/mysqld_qslower.py
+++ bcc-0.6.0/tools/mysqld_qslower.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # mysqld_qslower    MySQL server queries slower than a threshold.
 #                   For Linux, uses BCC, BPF. Embedded C.
Index: bcc-0.6.0/tools/nfsdist.py
===================================================================
--- bcc-0.6.0.orig/tools/nfsdist.py
+++ bcc-0.6.0/tools/nfsdist.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # nfsdist   Summarize NFS operation latency
Index: bcc-0.6.0/tools/nfsslower.py
===================================================================
--- bcc-0.6.0.orig/tools/nfsslower.py
+++ bcc-0.6.0/tools/nfsslower.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # nfsslower     Trace slow NFS operations
Index: bcc-0.6.0/tools/offcputime.py
===================================================================
--- bcc-0.6.0.orig/tools/offcputime.py
+++ bcc-0.6.0/tools/offcputime.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # offcputime    Summarize off-CPU time by stack trace
 #               For Linux, uses BCC, eBPF.
Index: bcc-0.6.0/tools/offwaketime.py
===================================================================
--- bcc-0.6.0.orig/tools/offwaketime.py
+++ bcc-0.6.0/tools/offwaketime.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # offwaketime   Summarize blocked time by kernel off-CPU stack + waker stack
 #               For Linux, uses BCC, eBPF.
Index: bcc-0.6.0/tools/old/bashreadline.py
===================================================================
--- bcc-0.6.0.orig/tools/old/bashreadline.py
+++ bcc-0.6.0/tools/old/bashreadline.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # bashreadline  Print entered bash commands from all running shells.
 #               For Linux, uses BCC, eBPF. Embedded C.
Index: bcc-0.6.0/tools/old/biosnoop.py
===================================================================
--- bcc-0.6.0.orig/tools/old/biosnoop.py
+++ bcc-0.6.0/tools/old/biosnoop.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # biosnoop  Trace block device I/O and print details including issuing PID.
Index: bcc-0.6.0/tools/old/filelife.py
===================================================================
--- bcc-0.6.0.orig/tools/old/filelife.py
+++ bcc-0.6.0/tools/old/filelife.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # filelife    Trace the lifespan of short-lived files.
Index: bcc-0.6.0/tools/old/gethostlatency.py
===================================================================
--- bcc-0.6.0.orig/tools/old/gethostlatency.py
+++ bcc-0.6.0/tools/old/gethostlatency.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # gethostlatency  Show latency for getaddrinfo/gethostbyname[2] calls.
 #                 For Linux, uses BCC, eBPF. Embedded C.
Index: bcc-0.6.0/tools/old/killsnoop.py
===================================================================
--- bcc-0.6.0.orig/tools/old/killsnoop.py
+++ bcc-0.6.0/tools/old/killsnoop.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # killsnoop Trace signals issued by the kill() syscall.
Index: bcc-0.6.0/tools/old/memleak.py
===================================================================
--- bcc-0.6.0.orig/tools/old/memleak.py
+++ bcc-0.6.0/tools/old/memleak.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # memleak   Trace and display outstanding allocations to detect
 #           memory leaks in user-mode processes and the kernel.
Index: bcc-0.6.0/tools/old/offcputime.py
===================================================================
--- bcc-0.6.0.orig/tools/old/offcputime.py
+++ bcc-0.6.0/tools/old/offcputime.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # offcputime    Summarize off-CPU time by kernel stack trace
 #               For Linux, uses BCC, eBPF.
Index: bcc-0.6.0/tools/old/offwaketime.py
===================================================================
--- bcc-0.6.0.orig/tools/old/offwaketime.py
+++ bcc-0.6.0/tools/old/offwaketime.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # offwaketime   Summarize blocked time by kernel off-CPU stack + waker stack
 #               For Linux, uses BCC, eBPF.
Index: bcc-0.6.0/tools/old/opensnoop.py
===================================================================
--- bcc-0.6.0.orig/tools/old/opensnoop.py
+++ bcc-0.6.0/tools/old/opensnoop.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # opensnoop Trace open() syscalls.
Index: bcc-0.6.0/tools/old/profile.py
===================================================================
--- bcc-0.6.0.orig/tools/old/profile.py
+++ bcc-0.6.0/tools/old/profile.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # profile  Profile CPU usage by sampling stack traces at a timed interval.
Index: bcc-0.6.0/tools/old/softirqs.py
===================================================================
--- bcc-0.6.0.orig/tools/old/softirqs.py
+++ bcc-0.6.0/tools/old/softirqs.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # softirqs  Summarize soft IRQ (interrupt) event time.
Index: bcc-0.6.0/tools/old/stackcount.py
===================================================================
--- bcc-0.6.0.orig/tools/old/stackcount.py
+++ bcc-0.6.0/tools/old/stackcount.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # stackcount    Count kernel function calls and their stack traces.
 #               For Linux, uses BCC, eBPF.
Index: bcc-0.6.0/tools/old/stacksnoop.py
===================================================================
--- bcc-0.6.0.orig/tools/old/stacksnoop.py
+++ bcc-0.6.0/tools/old/stacksnoop.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # stacksnoop    Trace a kernel function and print all kernel stack traces.
 #               For Linux, uses BCC, eBPF, and currently x86_64 only. Inline C.
Index: bcc-0.6.0/tools/old/statsnoop.py
===================================================================
--- bcc-0.6.0.orig/tools/old/statsnoop.py
+++ bcc-0.6.0/tools/old/statsnoop.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # statsnoop Trace stat() syscalls.
Index: bcc-0.6.0/tools/old/syncsnoop.py
===================================================================
--- bcc-0.6.0.orig/tools/old/syncsnoop.py
+++ bcc-0.6.0/tools/old/syncsnoop.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # syncsnoop Trace sync() syscall.
Index: bcc-0.6.0/tools/old/tcpaccept.py
===================================================================
--- bcc-0.6.0.orig/tools/old/tcpaccept.py
+++ bcc-0.6.0/tools/old/tcpaccept.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # tcpaccept Trace TCP accept()s.
Index: bcc-0.6.0/tools/old/tcpconnect.py
===================================================================
--- bcc-0.6.0.orig/tools/old/tcpconnect.py
+++ bcc-0.6.0/tools/old/tcpconnect.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # tcpconnect    Trace TCP connect()s.
Index: bcc-0.6.0/tools/old/wakeuptime.py
===================================================================
--- bcc-0.6.0.orig/tools/old/wakeuptime.py
+++ bcc-0.6.0/tools/old/wakeuptime.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # wakeuptime    Summarize sleep to wakeup time by waker kernel stack
 #               For Linux, uses BCC, eBPF.
Index: bcc-0.6.0/tools/oomkill.py
===================================================================
--- bcc-0.6.0.orig/tools/oomkill.py
+++ bcc-0.6.0/tools/oomkill.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # oomkill   Trace oom_kill_process(). For Linux, uses BCC, eBPF.
 #
Index: bcc-0.6.0/tools/opensnoop.py
===================================================================
--- bcc-0.6.0.orig/tools/opensnoop.py
+++ bcc-0.6.0/tools/opensnoop.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # opensnoop Trace open() syscalls.
Index: bcc-0.6.0/tools/pidpersec.py
===================================================================
--- bcc-0.6.0.orig/tools/pidpersec.py
+++ bcc-0.6.0/tools/pidpersec.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # pidpersec Count new processes (via fork).
Index: bcc-0.6.0/tools/profile.py
===================================================================
--- bcc-0.6.0.orig/tools/profile.py
+++ bcc-0.6.0/tools/profile.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # profile  Profile CPU usage by sampling stack traces at a timed interval.
Index: bcc-0.6.0/tools/runqlat.py
===================================================================
--- bcc-0.6.0.orig/tools/runqlat.py
+++ bcc-0.6.0/tools/runqlat.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # runqlat   Run queue (scheduler) latency as a histogram.
Index: bcc-0.6.0/tools/runqlen.py
===================================================================
--- bcc-0.6.0.orig/tools/runqlen.py
+++ bcc-0.6.0/tools/runqlen.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # runqlen    Summarize scheduler run queue length as a histogram.
Index: bcc-0.6.0/tools/slabratetop.py
===================================================================
--- bcc-0.6.0.orig/tools/slabratetop.py
+++ bcc-0.6.0/tools/slabratetop.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # slabratetop  Summarize kmem_cache_alloc() calls.
Index: bcc-0.6.0/tools/softirqs.py
===================================================================
--- bcc-0.6.0.orig/tools/softirqs.py
+++ bcc-0.6.0/tools/softirqs.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # softirqs  Summarize soft IRQ (interrupt) event time.
Index: bcc-0.6.0/tools/solisten.py
===================================================================
--- bcc-0.6.0.orig/tools/solisten.py
+++ bcc-0.6.0/tools/solisten.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # solisten      Trace TCP listen events
 #               For Linux, uses BCC, eBPF. Embedded C.
Index: bcc-0.6.0/tools/sslsniff.py
===================================================================
--- bcc-0.6.0.orig/tools/sslsniff.py
+++ bcc-0.6.0/tools/sslsniff.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # sslsniff  Captures data on read/recv or write/send functions of OpenSSL and
 #           GnuTLS
Index: bcc-0.6.0/tools/stackcount.py
===================================================================
--- bcc-0.6.0.orig/tools/stackcount.py
+++ bcc-0.6.0/tools/stackcount.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # stackcount    Count events and their stack traces.
 #               For Linux, uses BCC, eBPF.
Index: bcc-0.6.0/tools/statsnoop.py
===================================================================
--- bcc-0.6.0.orig/tools/statsnoop.py
+++ bcc-0.6.0/tools/statsnoop.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # statsnoop Trace stat() syscalls.
Index: bcc-0.6.0/tools/syncsnoop.py
===================================================================
--- bcc-0.6.0.orig/tools/syncsnoop.py
+++ bcc-0.6.0/tools/syncsnoop.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # syncsnoop Trace sync() syscall.
Index: bcc-0.6.0/tools/syscount.py
===================================================================
--- bcc-0.6.0.orig/tools/syscount.py
+++ bcc-0.6.0/tools/syscount.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # syscount   Summarize syscall counts and latencies.
 #
Index: bcc-0.6.0/tools/tcpaccept.py
===================================================================
--- bcc-0.6.0.orig/tools/tcpaccept.py
+++ bcc-0.6.0/tools/tcpaccept.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # tcpaccept Trace TCP accept()s.
Index: bcc-0.6.0/tools/tcpconnect.py
===================================================================
--- bcc-0.6.0.orig/tools/tcpconnect.py
+++ bcc-0.6.0/tools/tcpconnect.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # tcpconnect    Trace TCP connect()s.
Index: bcc-0.6.0/tools/tcpconnlat.py
===================================================================
--- bcc-0.6.0.orig/tools/tcpconnlat.py
+++ bcc-0.6.0/tools/tcpconnlat.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # tcpconnlat    Trace TCP active connection latency (connect).
Index: bcc-0.6.0/tools/tcplife.py
===================================================================
--- bcc-0.6.0.orig/tools/tcplife.py
+++ bcc-0.6.0/tools/tcplife.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # tcplife   Trace the lifespan of TCP sessions and summarize.
Index: bcc-0.6.0/tools/tcpretrans.py
===================================================================
--- bcc-0.6.0.orig/tools/tcpretrans.py
+++ bcc-0.6.0/tools/tcpretrans.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # tcpretrans    Trace or count TCP retransmits and TLPs.
Index: bcc-0.6.0/tools/tcptop.py
===================================================================
--- bcc-0.6.0.orig/tools/tcptop.py
+++ bcc-0.6.0/tools/tcptop.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # tcptop    Summarize TCP send/recv throughput by host.
Index: bcc-0.6.0/tools/tcptracer.py
===================================================================
--- bcc-0.6.0.orig/tools/tcptracer.py
+++ bcc-0.6.0/tools/tcptracer.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # tcpv4tracer   Trace TCP connections.
 #               For Linux, uses BCC, eBPF. Embedded C.
Index: bcc-0.6.0/tools/tplist.py
===================================================================
--- bcc-0.6.0.orig/tools/tplist.py
+++ bcc-0.6.0/tools/tplist.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # tplist    Display kernel tracepoints or USDT probes and their formats.
 #
Index: bcc-0.6.0/tools/trace.py
===================================================================
--- bcc-0.6.0.orig/tools/trace.py
+++ bcc-0.6.0/tools/trace.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # trace         Trace a function and print a trace message based on its
 #               parameters, with an optional filter.
Index: bcc-0.6.0/tools/ttysnoop.py
===================================================================
--- bcc-0.6.0.orig/tools/ttysnoop.py
+++ bcc-0.6.0/tools/ttysnoop.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # ttysnoop   Watch live output from a tty or pts device.
Index: bcc-0.6.0/tools/vfscount.py
===================================================================
--- bcc-0.6.0.orig/tools/vfscount.py
+++ bcc-0.6.0/tools/vfscount.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # vfscount  Count VFS calls ("vfs_*").
Index: bcc-0.6.0/tools/vfsstat.py
===================================================================
--- bcc-0.6.0.orig/tools/vfsstat.py
+++ bcc-0.6.0/tools/vfsstat.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # vfsstat   Count some VFS calls.
Index: bcc-0.6.0/tools/wakeuptime.py
===================================================================
--- bcc-0.6.0.orig/tools/wakeuptime.py
+++ bcc-0.6.0/tools/wakeuptime.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # wakeuptime    Summarize sleep to wakeup time by waker kernel stack
 #               For Linux, uses BCC, eBPF.
Index: bcc-0.6.0/tools/xfsdist.py
===================================================================
--- bcc-0.6.0.orig/tools/xfsdist.py
+++ bcc-0.6.0/tools/xfsdist.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # xfsdist  Summarize XFS operation latency.
Index: bcc-0.6.0/tools/xfsslower.py
===================================================================
--- bcc-0.6.0.orig/tools/xfsslower.py
+++ bcc-0.6.0/tools/xfsslower.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # xfsslower  Trace slow XFS operations.
Index: bcc-0.6.0/tools/zfsdist.py
===================================================================
--- bcc-0.6.0.orig/tools/zfsdist.py
+++ bcc-0.6.0/tools/zfsdist.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # zfsdist  Summarize ZFS operation latency.
Index: bcc-0.6.0/tools/zfsslower.py
===================================================================
--- bcc-0.6.0.orig/tools/zfsslower.py
+++ bcc-0.6.0/tools/zfsslower.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # zfsslower  Trace slow ZFS operations.
Index: bcc-0.6.0/examples/networking/vlan_filter/data-plane-tracing.py
===================================================================
--- bcc-0.6.0.orig/examples/networking/vlan_filter/data-plane-tracing.py
+++ bcc-0.6.0/examples/networking/vlan_filter/data-plane-tracing.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 from __future__ import print_function
 from bcc import BPF
 
Index: bcc-0.6.0/examples/networking/xdp/xdp_redirect_cpu.py
===================================================================
--- bcc-0.6.0.orig/examples/networking/xdp/xdp_redirect_cpu.py
+++ bcc-0.6.0/examples/networking/xdp/xdp_redirect_cpu.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # xdp_redirect_cpu.py Redirect the incoming packet to the specific CPU
 #
Index: bcc-0.6.0/examples/networking/xdp/xdp_redirect_map.py
===================================================================
--- bcc-0.6.0.orig/examples/networking/xdp/xdp_redirect_map.py
+++ bcc-0.6.0/examples/networking/xdp/xdp_redirect_map.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # xdp_redirect_map.py Redirect the incoming packet to another interface
 #                     with the helper: bpf_redirect_map()
Index: bcc-0.6.0/tools/runqslower.py
===================================================================
--- bcc-0.6.0.orig/tools/runqslower.py
+++ bcc-0.6.0/tools/runqslower.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # runqslower    Trace long process scheduling delays.
Index: bcc-0.6.0/tools/tcpdrop.py
===================================================================
--- bcc-0.6.0.orig/tools/tcpdrop.py
+++ bcc-0.6.0/tools/tcpdrop.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # tcpdrop   Trace TCP kernel-dropped packets/segments.
Index: bcc-0.6.0/tools/tcpstates.py
===================================================================
--- bcc-0.6.0.orig/tools/tcpstates.py
+++ bcc-0.6.0/tools/tcpstates.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # tcpstates   Trace the TCP session state changes with durations.
Index: bcc-0.6.0/tools/tcpsubnet.py
===================================================================
--- bcc-0.6.0.orig/tools/tcpsubnet.py
+++ bcc-0.6.0/tools/tcpsubnet.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # @lint-avoid-python-3-compatibility-imports
 #
 # tcpsubnet   Summarize TCP bytes sent to different subnets.

Places

File bcc-python3.patch of Package bcc (Revision 87a97cd76695682d0c437dbc7c73f480)

Places