[tor-commits] [chutney/master] Be more explicit about using python2

[nickm at torproject.org]

commit cb01a3eea0ca28130fa46f9b3f3bf4948b40d895
Author: Daniel Martí <mvdan at mvdan.cc>
Date:   Fri Aug 15 14:22:34 2014 +0200

    Be more explicit about using python2
    
    Also, normalize the use of env
---
 chutney                   |    2 +-
 lib/chutney/Templating.py |    2 +-
 lib/chutney/TorNet.py     |    2 +-
 lib/chutney/Traffic.py    |    2 +-
 lib/chutney/__init__.py   |    1 -
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/chutney b/chutney
index ade7b6e..b4c1370 100755
--- a/chutney
+++ b/chutney
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 export PYTHONPATH="`dirname $0`/lib:${PYTHONPATH}"
-${PYTHON:=python} -m chutney.TorNet $*
+${PYTHON:=python2} -m chutney.TorNet $*
diff --git a/lib/chutney/Templating.py b/lib/chutney/Templating.py
index 48ca44a..281a500 100644
--- a/lib/chutney/Templating.py
+++ b/lib/chutney/Templating.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 #
 # Copyright 2011 Nick Mathewson, Michael Stone
 #
diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py
index 9d8efd1..bee4619 100644
--- a/lib/chutney/TorNet.py
+++ b/lib/chutney/TorNet.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 #
 # Copyright 2011 Nick Mathewson, Michael Stone
 # Copyright 2013 The Tor Project
diff --git a/lib/chutney/Traffic.py b/lib/chutney/Traffic.py
index 57250f7..8467b28 100644
--- a/lib/chutney/Traffic.py
+++ b/lib/chutney/Traffic.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#!/usr/bin/env python2
 #
 # Copyright 2013 The Tor Project
 #
diff --git a/lib/chutney/__init__.py b/lib/chutney/__init__.py
index 139597f..8b13789 100644
--- a/lib/chutney/__init__.py
+++ b/lib/chutney/__init__.py
@@ -1,2 +1 @@
 
-