tor

commit ee6f54ff3f508ff7d0e169150ebc8519752d69ad
parent b547ece92fc85497947fdb1b113aa5a387a3d313
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed,  3 Apr 2019 08:33:40 -0400

Merge remote-tracking branch 'tor-github/pr/860'

Diffstat:
A
changes/ticket29913
 | 
4
++++
M
scripts/maint/checkIncludes.py
 | 
2
+-
M
scripts/maint/practracker/practracker.py
 | 
2
+-
M
scripts/maint/rectify_include_paths.py
 | 
2
+-
M
src/config/mmdb-convert.py
 | 
2
+-
M
src/test/ope_ref.py
 | 
2
+-

6 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/changes/ticket29913 b/changes/ticket29913
@@ -0,0 +1,4 @@
+  o Minor bugfixes (python):
+    - Stop assuming that /usr/bin/python3 exists. For scripts that work with
+      python2, use /usr/bin/python. Otherwise, use /usr/bin/env python3.
+      Fixes bug 29913; bugfix on 0.2.5.3-alpha.
diff --git a/scripts/maint/checkIncludes.py b/scripts/maint/checkIncludes.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/python
 # Copyright 2018 The Tor Project, Inc.  See LICENSE file for licensing info.
 
 """This script looks through all the directories for files matching *.c or
diff --git a/scripts/maint/practracker/practracker.py b/scripts/maint/practracker/practracker.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/python
 
 """
 Best-practices tracker for Tor source code.
diff --git a/scripts/maint/rectify_include_paths.py b/scripts/maint/rectify_include_paths.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/python
 
 import os
 import os.path
diff --git a/src/config/mmdb-convert.py b/src/config/mmdb-convert.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/python
 
 #   This software has been dedicated to the public domain under the CC0
 #   public domain dedication.
diff --git a/src/test/ope_ref.py b/src/test/ope_ref.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 # Copyright 2018-2019, The Tor Project, Inc. See LICENSE for licensing info.
 
 # Reference implementation for our rudimentary OPE code, used to