Use python2 rather than python

python may refer to either python2 or python3 so rather by explicit by
using python2.
See PEP 394 - http://www.python.org/dev/peps/pep-0394/ for more
details.

diff --git a/event_rpcgen.py b/event_rpcgen.py
index c43e1152abc9d87f81212c6191f15d3ab825975f..c5375656969e38f2fab5e884bc4e85132c6dafc6 100755 (executable)
--- a/event_rpcgen.py
+++ b/event_rpcgen.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 #
 # Copyright (c) 2005-2007 Niels Provos <provos@citi.umich.edu>
 # Copyright (c) 2007-2012 Niels Provos and Nick Mathewson

diff --git a/make_epoll_table.py b/make_epoll_table.py
index e77191c86b05844a394142ff98260ef91a4e490f..37d6df1edc1ef73483cb7ddf5ea0c70e9eba5cd8 100755 (executable)
--- a/make_epoll_table.py
+++ b/make_epoll_table.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 
 def get(old,wc,rc):
     if ('xxx' in (rc, wc)):

diff --git a/test/check-dumpevents.py b/test/check-dumpevents.py
index 7d749323c7c658992172343ee27b98cf1c3ff339..16fe9bc92fdf21acbf97170f058479b1775e4603 100755 (executable)
--- a/test/check-dumpevents.py
+++ b/test/check-dumpevents.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 #
 # Post-process the output of test-dumpevents and check it for correctness.
 #

diff --git a/test/test.sh b/test/test.sh
index 610a2795eedbc9ae09427442a72ad6c90086f55c..d47bd2d82cc8df7f1c0adc49d371907c8f680001 100755 (executable)
--- a/test/test.sh
+++ b/test/test.sh
@@ -76,8 +76,8 @@ run_tests () {
                fi
        done
        announce_n " test-dumpevents: "
-       if python -c 'import sys; assert(sys.version_info >= (2, 4))' 2>/dev/null; then
-           if $TEST_DIR/test-dumpevents | python $TEST_SRC_DIR/check-dumpevents.py >> "$TEST_OUTPUT_FILE" ;
+       if python2 -c 'import sys; assert(sys.version_info >= (2, 4))' 2>/dev/null; then
+           if $TEST_DIR/test-dumpevents | python2 $TEST_SRC_DIR/check-dumpevents.py >> "$TEST_OUTPUT_FILE" ;
            then
                announce OKAY ;
            else