change #!/usr/bin/python to #!/usr/bin/env python

Note that using "whatever version of python the name 'python' maps to in the current shell environment" is more error-prone that specifying which python you mean, such as by executing "/usr/bin/python setup.py" instead of executing "./setup.py".  When you build tahoe (by running "make") it will make a copy of bin/allmydata-tahoe in instdir/bin/allmydata-tahoe with the shebang line rewritten to execute the specific version of python that was used when building instead of to execute "/usr/bin/env python".

However, it seems better that the default for lazy people be "whatever 'python' means currently" instead of "whatever 'python' meant to the manufacturer of your operating system".

diff --git a/bin/allmydata-tahoe b/bin/allmydata-tahoe
index 57d4ebc6ec202acc28de1636eb24cf617e649395..8958528eb24f10ca48e26a2b65bfd7ed9f919391 100644 (file)
--- a/bin/allmydata-tahoe
+++ b/bin/allmydata-tahoe
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 from allmydata.scripts import runner
 runner.run()

diff --git a/misc/figleaf2el.py b/misc/figleaf2el.py
index c32f3782e3fb59648f47e99618453cf68ee15bbb..30a6bdfa719360a3feaaabc0e608bc99e91ccaec 100644 (file)
--- a/misc/figleaf2el.py
+++ b/misc/figleaf2el.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/env python
 
 import os, sys, pickle
 

diff --git a/misc/getmem.py b/misc/getmem.py
index 171340d2e31b984eb5f7722e70168f25c4ca79da..8ddc3ed7e91ca1fa998b30f957d894fbeb2fdfed 100644 (file)
--- a/misc/getmem.py
+++ b/misc/getmem.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/env python
 
 from foolscap import Tub
 from foolscap.eventual import eventually

diff --git a/setup.py b/setup.py
index 16f34be99839d125f6b4d870ff133b6eabcbfdb3..0bdb13709b6e5d0aaf6f9f611bfc3eb6dcaf8a31 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/env python
 
 from distutils.core import setup
 from distutils.core import Extension

diff --git a/simulator.py b/simulator.py
index 81ad34184232732aeb882fca94db5e3d5fef753a..5a53fadbe76dd56ecc12c7da822670c36ded6185 100644 (file)
--- a/simulator.py
+++ b/simulator.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/env python
 
 import sha as shamodule
 import os, random

diff --git a/sizes.py b/sizes.py
index 6e251989c731a689ceb932f2500132c0006e5442..5d7eec049897303ac05609fe1da1152a836351bc 100644 (file)
--- a/sizes.py
+++ b/sizes.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/env python
 
 import random, math, os, re
 from twisted.python import usage

diff --git a/src/allmydata/scripts/runner.py b/src/allmydata/scripts/runner.py
index c4fe8edb6aede9099572bf22106433cc3611e053..b2d79ff11b2facb772374040d200f33f7792f840 100644 (file)
--- a/src/allmydata/scripts/runner.py
+++ b/src/allmydata/scripts/runner.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/env python
 
 import os, sys, signal, time
 from twisted.python import usage

diff --git a/src/allmydata/test/check_memory.py b/src/allmydata/test/check_memory.py
index 2a3d2452a85ab2d58fbdf9a27caacbda445d0092..4745c4a231b93204302c2b928f195790a5f3c7b3 100644 (file)
--- a/src/allmydata/test/check_memory.py
+++ b/src/allmydata/test/check_memory.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/env python
 
 import os, shutil
 

diff --git a/src/allmydata/test/test_encode.py b/src/allmydata/test/test_encode.py
index 5af27b7f45a04ea4607074cff517597f1f38f6f7..c220ba9aa04faf723baaad82ee25d9b7455ef2fa 100644 (file)
--- a/src/allmydata/test/test_encode.py
+++ b/src/allmydata/test/test_encode.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/env python
 
 from twisted.trial import unittest
 from twisted.internet import defer

diff --git a/twisted/plugins/allmydata_trial.py b/twisted/plugins/allmydata_trial.py
index 08fd3759813810ce19a2eff0ad80e16ee34080b1..93af3802459f55502f19ff8dd703a0600e13787d 100644 (file)
--- a/twisted/plugins/allmydata_trial.py
+++ b/twisted/plugins/allmydata_trial.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/env python
 
 from zope.interface import implements
 from twisted.trial.itrial import IReporter