Re: [PATCH] Standardize python shebangs

2 messages, 2 authors, 2016-06-15 · open the first message on its own page

Re: [PATCH] Standardize python shebangs

From: Matthieu Moy <hidden>
Date: 2016-06-15 23:01:02

Felipe Contreras [off-list ref] writes:
It's better if all our scripts use the same '/usr/bin/env python'.
Why?

Using python2 for git_multimail.py is a deliberate decision:

https://github.com/mhagger/git-multimail/pull/2

(also, contrib/hooks/multimail/README says:

"The git-multimail project itself is currently hosted on GitHub:

    https://github.com/mhagger/git-multimail

We use the GitHub issue tracker to keep track of bugs and feature
requests, and GitHub pull requests to exchange patches (though, if you
prefer, you can send patches via the Git mailing list with cc to me).
Please sign off your patches as per the Git project practice."
)
quoted hunk
Signed-off-by: Felipe Contreras <redacted>
---
 contrib/hooks/multimail/README                  | 6 +++---
 contrib/hooks/multimail/git_multimail.py        | 2 +-
 contrib/hooks/multimail/migrate-mailhook-config | 2 +-
 contrib/hooks/multimail/post-receive            | 2 +-
 contrib/svn-fe/svnrdump_sim.py                  | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/contrib/hooks/multimail/README b/contrib/hooks/multimail/README
index 477d65f..cf0bcb8 100644
--- a/contrib/hooks/multimail/README
+++ b/contrib/hooks/multimail/README
@@ -76,10 +76,10 @@ Requirements
   The example scripts invoke Python using the following shebang line
   (following PEP 394 [1]):
 
-      #! /usr/bin/env python2
+      #! /usr/bin/env python
 
-  If your system's Python2 interpreter is not in your PATH or is not
-  called "python2", you can change the lines accordingly.  Or you can
+  If your system's Python interpreter is not in your PATH or is not
+  called "python", you can change the lines accordingly.  Or you can
   invoke the Python interpreter explicitly, for example via a tiny
   shell script like
 
diff --git a/contrib/hooks/multimail/git_multimail.py b/contrib/hooks/multimail/git_multimail.py
index 8b58ed6..f6dcdc6 100755
--- a/contrib/hooks/multimail/git_multimail.py
+++ b/contrib/hooks/multimail/git_multimail.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python2
+#! /usr/bin/env python
 
 # Copyright (c) 2012-2014 Michael Haggerty and others
 # Derived from contrib/hooks/post-receive-email, which is
diff --git a/contrib/hooks/multimail/migrate-mailhook-config b/contrib/hooks/multimail/migrate-mailhook-config
index 04eeaac..fba0b90 100755
--- a/contrib/hooks/multimail/migrate-mailhook-config
+++ b/contrib/hooks/multimail/migrate-mailhook-config
@@ -1,4 +1,4 @@
-#! /usr/bin/env python2
+#! /usr/bin/env python
 
 """Migrate a post-receive-email configuration to be usable with git_multimail.py.
 
diff --git a/contrib/hooks/multimail/post-receive b/contrib/hooks/multimail/post-receive
index 4d46828..4f2cf9d 100755
--- a/contrib/hooks/multimail/post-receive
+++ b/contrib/hooks/multimail/post-receive
@@ -1,4 +1,4 @@
-#! /usr/bin/env python2
+#! /usr/bin/env python
 
 """Example post-receive hook based on git-multimail.
 
diff --git a/contrib/svn-fe/svnrdump_sim.py b/contrib/svn-fe/svnrdump_sim.py
index 4e78a1c..bf20819 100755
--- a/contrib/svn-fe/svnrdump_sim.py
+++ b/contrib/svn-fe/svnrdump_sim.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 """
 Simulates svnrdump by replaying an existing dump from a file, taking care
 of the specified revision range.


-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/

Re: [PATCH] Standardize python shebangs

From: Felipe Contreras <hidden>
Date: 2016-06-15 23:01:03

Matthieu Moy wrote:
Felipe Contreras [off-list ref] writes:
quoted
It's better if all our scripts use the same '/usr/bin/env python'.
Why?

Using python2 for git_multimail.py is a deliberate decision:
If you want to use python2, then use '/usr/bin/env python2'.
"The git-multimail project itself is currently hosted on GitHub:

    https://github.com/mhagger/git-multimail

We use the GitHub issue tracker to keep track of bugs and feature
requests, and GitHub pull requests to exchange patches (though, if you
prefer, you can send patches via the Git mailing list with cc to me).
Please sign off your patches as per the Git project practice."
)
If you are going to follow practices different than git.git, then
multimail shouldn't live in 'contrib/'. Junio is already thretening to
remove stuff out of contrib even when development behaves as the Git
core does, so it makes more sense for stuff that doesn't.

-- 
Felipe Contreras
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help