Merge pull request EFForg#138 from charlesthomas/master

jsha · jsha · commit b095f822a36b · 2014-08-15T09:33:25.000-04:00
Unified shebang (#!), so all python utils repsect virtual envs
diff --git a/chromium/setversion.py b/chromium/setversion.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python2.7
 import json
 from datetime import date
 
diff --git a/utils/check_certs.py b/utils/check_certs.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 
 import sys
 import re
diff --git a/utils/chromium-preloads.py b/utils/chromium-preloads.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 
 # autogenerate sample versions of rules from Chromium browser's HSTS
 # preload list (in the from-preloads/ directory)
diff --git a/utils/create_xpi.py b/utils/create_xpi.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.7
+#!/usr/bin/env python2.7
 
 # Uses the Python zip implementation to create deterministic XPI's
 # Author: Yan Zhu, yan@mit.edu
diff --git a/utils/dbconnect.py b/utils/dbconnect.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 import MySQLdb
 
 try:    from db_private import DB_USER
diff --git a/utils/find_rules.py b/utils/find_rules.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python2.7
 """
 Copyleft 2013 Osama Khalid.
 
diff --git a/utils/make-sqlite.py b/utils/make-sqlite.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.7
+#!/usr/bin/env python2.7
 #
 # Builds an sqlite DB containing all the rulesets, indexed by target.
 
diff --git a/utils/merge-rulesets.py b/utils/merge-rulesets.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 
 # Merge all the .xml rulesets into a single "default.rulesets" file -- this
 # prevents inodes from wasting disk space, but more importantly, works around
diff --git a/utils/mk_client_whitelist.py b/utils/mk_client_whitelist.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 
 # Make a list of the current top 1,000 certs to whitelist from the
 # Decentralized SSL Observatory's client submissions, to live in
diff --git a/utils/simple.py b/utils/simple.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 
 from lxml import etree
 import regex
diff --git a/utils/single_rule_response.py b/utils/single_rule_response.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 
 import sys, os, re
 from functools import partial
diff --git a/utils/trivial-response.py b/utils/trivial-response.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 
 import sys, os, re, subprocess
 from time import sleep
diff --git a/utils/trivial-validate.py b/utils/trivial-validate.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.7
+#!/usr/bin/env python2.7
 
 import argparse
 import sys, re, os
diff --git a/utils/zipfile_deterministic.py b/utils/zipfile_deterministic.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python2.7
 """
 A fork of the Zipfile module to read and write ZIP files from Python 2.6.
 This module aims to create deterministic, byte-for-byte identical zip files.

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#!/usr/bin/env python2.7`
`1`	`2`	`import json`
`2`	`3`	`from datetime import date`
`3`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/usr/bin/env python`
	`1`	`+#!/usr/bin/env python2.7`
`2`	`2`
`3`	`3`	`import sys`
`4`	`4`	`import re`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/usr/bin/python2.7`
	`1`	`+#!/usr/bin/env python2.7`
`2`	`2`
`3`	`3`	`# Uses the Python zip implementation to create deterministic XPI's`
`4`	`4`	`# Author: Yan Zhu, yan@mit.edu`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#!/usr/bin/env python2.7`
`1`	`2`	`"""`
`2`	`3`	`Copyleft 2013 Osama Khalid.`
`3`	`4`