Final conversions for py3.6

Hainish · Hainish · commit 65eac6c9c846 · 2018-02-23T09:44:24.000-08:00
diff --git a/install-dev-dependencies.sh b/install-dev-dependencies.sh
@@ -34,9 +34,8 @@ if type apt-get >/dev/null ; then
     BROWSERS="iceweasel chromium"
     CHROMEDRIVER="chromedriver"
   fi
-  # In Debian, `python-` is assumed to be python 2.7, no need to specify - dkg
   $SUDO_SHIM apt-get install -y libxml2-dev libxml2-utils libxslt1-dev \
-    python-dev $BROWSERS zip sqlite3 python-pip libcurl4-openssl-dev xvfb \
+    python3.6-dev $BROWSERS zip sqlite3 python3-pip libcurl4-openssl-dev xvfb \
     libssl-dev git curl $CHROMEDRIVER
   if ! type geckodriver >/dev/null; then
     curl -LO "https://github.com/mozilla/geckodriver/releases/download/v0.17.0/geckodriver-v0.17.0-linux64.tar.gz"
diff --git a/make.sh b/make.sh
@@ -31,7 +31,7 @@ if [ -n "$1" -a "$1" != "--remove-update-channel" ]; then
   git submodule update --recursive -f
 fi
 
-VERSION=`python2.7 -c "import json ; print(json.loads(open('chromium/manifest.json').read())['version'])"`
+VERSION=`python3.6 -c "import json ; print(json.loads(open('chromium/manifest.json').read())['version'])"`
 
 echo "Building version" $VERSION
 
@@ -70,15 +70,15 @@ cp -a src/META-INF pkg/xpi-eff
 
 # Remove the 'applications' manifest key from the crx version of the extension, change the 'author' string to a hash, and add the "update_url" manifest key
 # "update_url" needs to be present to avoid problems reported in https://bugs.chromium.org/p/chromium/issues/detail?id=805755
-python2.7 -c "import json; m=json.loads(open('pkg/crx/manifest.json').read()); m['author']={'email': 'eff.software.projects@gmail.com'}; del m['applications']; m['update_url'] = 'https://clients2.google.com/service/update2/crx'; open('pkg/crx/manifest.json','w').write(json.dumps(m,indent=4,sort_keys=True))"
+python3.6 -c "import json; m=json.loads(open('pkg/crx/manifest.json').read()); m['author']={'email': 'eff.software.projects@gmail.com'}; del m['applications']; m['update_url'] = 'https://clients2.google.com/service/update2/crx'; open('pkg/crx/manifest.json','w').write(json.dumps(m,indent=4,sort_keys=True))"
 # Remove the 'update_url' manifest key from the xpi version of the extension delivered to AMO
-python2.7 -c "import json; m=json.loads(open('pkg/xpi-amo/manifest.json').read()); del m['applications']['gecko']['update_url']; m['applications']['gecko']['id'] = 'https-everywhere@eff.org'; open('pkg/xpi-amo/manifest.json','w').write(json.dumps(m,indent=4,sort_keys=True))"
+python3.6 -c "import json; m=json.loads(open('pkg/xpi-amo/manifest.json').read()); del m['applications']['gecko']['update_url']; m['applications']['gecko']['id'] = 'https-everywhere@eff.org'; open('pkg/xpi-amo/manifest.json','w').write(json.dumps(m,indent=4,sort_keys=True))"
 
 # If the --remove-update-channel flag is set, ensure the extension is unable to update
 if [ "$1" == "--remove-update-channel" -o "$2" == "--remove-update-channel" ]; then
   echo "Flag --remove-update-channel specified.  Removing the XPI extensions' ability to update."
-  python2.7 -c "import json; m=json.loads(open('pkg/xpi-amo/manifest.json').read()); m['applications']['gecko']['update_url'] = 'data:text/plain,'; open('pkg/xpi-amo/manifest.json','w').write(json.dumps(m,indent=4,sort_keys=True))"
-  python2.7 -c "import json; m=json.loads(open('pkg/xpi-eff/manifest.json').read()); m['applications']['gecko']['update_url'] = 'data:text/plain,'; open('pkg/xpi-eff/manifest.json','w').write(json.dumps(m,indent=4,sort_keys=True))"
+  python3.6 -c "import json; m=json.loads(open('pkg/xpi-amo/manifest.json').read()); m['applications']['gecko']['update_url'] = 'data:text/plain,'; open('pkg/xpi-amo/manifest.json','w').write(json.dumps(m,indent=4,sort_keys=True))"
+  python3.6 -c "import json; m=json.loads(open('pkg/xpi-eff/manifest.json').read()); m['applications']['gecko']['update_url'] = 'data:text/plain,'; open('pkg/xpi-eff/manifest.json','w').write(json.dumps(m,indent=4,sort_keys=True))"
 fi
 
 if [ -n "$BRANCH" ] ; then
@@ -170,16 +170,6 @@ cp $zip $xpi_eff
 
 bash utils/android-push.sh "$xpi_eff"
 
-#rm -rf pkg/crx
-
-#python2.7 githubhelper.py $VERSION
-
-#git add chromium/updates.xml
-#git commit -m "release $VERSION"
-#git tag -s chrome-$VERSION -m "release $VERSION"
-#git push
-#git push --tags
-
 echo >&2 "Total included rules: `find src/chrome/content/rules -name "*.xml" | wc -l`"
 echo >&2 "Rules disabled by default: `find src/chrome/content/rules -name "*.xml" | xargs grep -F default_off | wc -l`"
 
diff --git a/test/script.py b/test/script.py
@@ -2,7 +2,7 @@
 #
 # Run Selenium tests for HTTPS Everywhere
 #
-# This script may be executed as `python script.py [directory of CRX]`
+# This script may be executed as `python3.6 script.py [directory of CRX]`
 #
 # The script is compatible with Python 2. Python 3 is not tested.
 # Selenium, WebDriver and Google Chrome (or Chromium) must be installed
diff --git a/utils/create_zip.py b/utils/create_zip.py
@@ -4,7 +4,7 @@
 # Author: Yan Zhu, yan@mit.edu
 
 """
-Usage: python create_zip.py -x <exclusions> -n <name of zipped file> <directory>
+Usage: python3.6 create_zip.py -x <exclusions> -n <name of zipped file> <directory>
 """
 
 import argparse

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`#`
`3`	`3`	`# Run Selenium tests for HTTPS Everywhere`
`4`	`4`	`#`
`5`		-# This script may be executed as `python script.py [directory of CRX]`
	`5`	+# This script may be executed as `python3.6 script.py [directory of CRX]`
`6`	`6`	`#`
`7`	`7`	`# The script is compatible with Python 2. Python 3 is not tested.`
`8`	`8`	`# Selenium, WebDriver and Google Chrome (or Chromium) must be installed`