| Message ID | 20191209143432.200205-1-xnox@ubuntu.com |
|---|---|
| State | New |
| Headers | show |
| Series | [kernel-testing] Change python shebangs to python2, as unversioned python is removed. | expand |
On Mon, Dec 09, 2019 at 02:34:32PM +0000, Dimitri John Ledkov wrote: > Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com> I've been assured by Dimitri that we have a pyhton2 symlink in everything we still support, so this looks good to me. Acked-by: Seth Forshee <seth.forshee@canonical.com>
On 09.12.19 15:34, Dimitri John Ledkov wrote: > Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com> Acked-by: Stefan Bader <stefan.bader@canonical.com> > --- > dep8-runner | 2 +- > info | 2 +- > jenkins-job-creator/jjc | 2 +- > kmsgq-ircbot | 2 +- > lib/benchmarkdb.py | 2 +- > lib/cmdline.py | 2 +- > lib/cobbler.py | 2 +- > lib/configuration.py | 2 +- > lib/dbg.py | 2 +- > lib/debian.py | 2 +- > lib/dlipower.py | 2 +- > lib/exceptions.py | 2 +- > lib/grinder.py | 2 +- > lib/infrastructure.kernel-team | 2 +- > lib/job.py | 2 +- > lib/kt_cfg.py | 2 +- > lib/log.py | 2 +- > lib/maas_shell.py | 2 +- > lib/provisioning.py | 2 +- > lib/shell.py | 2 +- > lib/target.py | 2 +- > lib/test_attributes.py | 2 +- > lib/ubuntu.py | 2 +- > lib/utils.py | 2 +- > lib3/kernel_series.py | 2 +- > lib3/shell.py | 2 +- > lib3/utils.py | 2 +- > misc/benchmarking/iozone-fsync-results/digest | 2 +- > misc/benchmarking/iozone-fsync-results/grinder.py | 2 +- > misc/benchmarking/iozone-fsync-results/ingest | 2 +- > misc/benchmarking/iozone-fsync-results/mk-ingest-job | 2 +- > misc/benchmarking/iozone-fsync-results/reaper | 2 +- > misc/benchmarking/iozone-ioscheduler-xfs-results/digest | 2 +- > misc/benchmarking/iozone-ioscheduler-xfs-results/grinder.py | 2 +- > misc/benchmarking/iozone-ioscheduler-xfs-results/ingest | 2 +- > misc/benchmarking/iozone-ioscheduler-xfs-results/mk-ingest-job | 2 +- > misc/benchmarking/iozone-ioscheduler-xfs-results/reaper | 2 +- > misc/benchmarking/iozone-nolazy-results/digest | 2 +- > misc/benchmarking/iozone-nolazy-results/grinder.py | 2 +- > misc/benchmarking/iozone-nolazy-results/ingest | 2 +- > misc/benchmarking/iozone-nolazy-results/mk-ingest-job | 2 +- > misc/benchmarking/iozone-nolazy-results/reaper | 2 +- > misc/benchmarking/iozone-results/digest | 2 +- > misc/benchmarking/iozone-results/grinder.py | 2 +- > misc/benchmarking/iozone-results/ingest | 2 +- > misc/benchmarking/iozone-results/mk-ingest-job | 2 +- > misc/benchmarking/iozone-results/reaper | 2 +- > misc/benchmarking/old-benchmarking/create-result-set | 2 +- > misc/benchmarking/tiobench-results/digest | 2 +- > misc/benchmarking/tiobench-results/grinder.py | 2 +- > misc/benchmarking/tiobench-results/ingest | 2 +- > misc/benchmarking/tiobench-results/mk-ingest-job | 2 +- > misc/benchmarking/tiobench-results/reaper | 2 +- > misc/bs/bootspeed | 2 +- > misc/bs/gen-master-index | 2 +- > misc/bs/gen-per-system-index | 2 +- > misc/bs/gen-single-run-page | 2 +- > .../node-gyp/legacy/tools/gyp/buildbot/buildbot_run.py | 2 +- > .../node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/gyp | 2 +- > .../npm/node_modules/node-gyp/legacy/tools/gyp/gyptest.py | 2 +- > .../node-gyp/legacy/tools/gyp/pylib/gyp/MSVSSettings_test.py | 2 +- > .../node-gyp/legacy/tools/gyp/pylib/gyp/__init__.py | 2 +- > .../node-gyp/legacy/tools/gyp/pylib/gyp/easy_xml_test.py | 2 +- > .../node-gyp/legacy/tools/gyp/pylib/gyp/generator/msvs_test.py | 2 +- > .../node-gyp/legacy/tools/gyp/pylib/gyp/generator/ninja_test.py | 2 +- > .../node-gyp/legacy/tools/gyp/pylib/gyp/mac_tool.py | 2 +- > .../node-gyp/legacy/tools/gyp/pylib/gyp/sun_tool.py | 2 +- > .../node-gyp/legacy/tools/gyp/pylib/gyp/system_test.py | 2 +- > .../npm/node_modules/node-gyp/legacy/tools/gyp/samples/samples | 2 +- > .../npm/node_modules/node-gyp/legacy/tools/gyp/setup.py | 2 +- > .../node_modules/node-gyp/legacy/tools/gyp/tools/graphviz.py | 2 +- > .../node_modules/node-gyp/legacy/tools/gyp/tools/pretty_gyp.py | 2 +- > .../node_modules/node-gyp/legacy/tools/gyp/tools/pretty_sln.py | 2 +- > .../node-gyp/legacy/tools/gyp/tools/pretty_vcproj.py | 2 +- > .../npm/node_modules/node-gyp/legacy/tools/gyp_addon | 2 +- > misc/bs/pbr | 2 +- > misc/bs/upload-results | 2 +- > msgpub | 2 +- > power | 2 +- > runner | 2 +- > test-request | 2 +- > test-results/gen-hosts-files | 2 +- > test-results/gen-per-suite-indexes | 2 +- > test-results/gen-root-indexes | 2 +- > test-results/ingest | 2 +- > test-results/process-maas-test-results | 2 +- > test-results/reaper | 2 +- > test-results/render | 2 +- > test-results/test_results.py | 2 +- > ubuntu-kernel-tests-version | 2 +- > unicode-filter | 2 +- > yaml.dump | 2 +- > 92 files changed, 92 insertions(+), 92 deletions(-) > > diff --git a/dep8-runner b/dep8-runner > index a919336..52259e0 100755 > --- a/dep8-runner > +++ b/dep8-runner > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > > from os import getenv, path, makedirs, environ > diff --git a/info b/info > index 26234bf..09a93a9 100755 > --- a/info > +++ b/info > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > > from lib.argparse import ArgumentParser, RawDescriptionHelpFormatter > diff --git a/jenkins-job-creator/jjc b/jenkins-job-creator/jjc > index f3822f4..84813a8 100755 > --- a/jenkins-job-creator/jjc > +++ b/jenkins-job-creator/jjc > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > # Called by one of the jenkins matix jobs for every cell of > # the matix. This job creates the correct provision-job, > diff --git a/kmsgq-ircbot b/kmsgq-ircbot > index b3cfe2c..96cd6b5 100755 > --- a/kmsgq-ircbot > +++ b/kmsgq-ircbot > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > > import sys > diff --git a/lib/benchmarkdb.py b/lib/benchmarkdb.py > index 1c663ac..cd1b2e1 100644 > --- a/lib/benchmarkdb.py > +++ b/lib/benchmarkdb.py > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > # > # This defines filter sets which are applied to the metadata in benchmark results in order to filter them for charting. > diff --git a/lib/cmdline.py b/lib/cmdline.py > index 1f7ba23..5c0293c 100644 > --- a/lib/cmdline.py > +++ b/lib/cmdline.py > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > # This application takes a list json file as input. That json file > # contains a 'dictionary' of key value pairs where the key is a > diff --git a/lib/cobbler.py b/lib/cobbler.py > index 0bee24e..9303677 100644 > --- a/lib/cobbler.py > +++ b/lib/cobbler.py > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > from os import path > from time import sleep > diff --git a/lib/configuration.py b/lib/configuration.py > index 9be28af..5b9758c 100644 > --- a/lib/configuration.py > +++ b/lib/configuration.py > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > import sys > from os import path > diff --git a/lib/dbg.py b/lib/dbg.py > index 1afd634..9374d0f 100644 > --- a/lib/dbg.py > +++ b/lib/dbg.py > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > > from sys import stdout > diff --git a/lib/debian.py b/lib/debian.py > index 1dce227..0d2ada1 100644 > --- a/lib/debian.py > +++ b/lib/debian.py > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > > from re import compile > diff --git a/lib/dlipower.py b/lib/dlipower.py > index 7be8325..75c98f3 100755 > --- a/lib/dlipower.py > +++ b/lib/dlipower.py > @@ -1,4 +1,4 @@ > -#!/usr/bin/python > +#!/usr/bin/python2 > """ > ############################################################### > Digital Loggers Web Power Switch management > diff --git a/lib/exceptions.py b/lib/exceptions.py > index 8b500c2..ac03020 100644 > --- a/lib/exceptions.py > +++ b/lib/exceptions.py > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > > # ErrorExit > diff --git a/lib/grinder.py b/lib/grinder.py > index 850fb1d..86afd54 100644 > --- a/lib/grinder.py > +++ b/lib/grinder.py > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > > from os import path, makedirs, listdir, walk > diff --git a/lib/infrastructure.kernel-team b/lib/infrastructure.kernel-team > index 664be1b..ace2f7a 100644 > --- a/lib/infrastructure.kernel-team > +++ b/lib/infrastructure.kernel-team > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > > MAASConfig = { > diff --git a/lib/job.py b/lib/job.py > index 88878f7..90baa63 100644 > --- a/lib/job.py > +++ b/lib/job.py > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > from sys import stdout > from subprocess import Popen, STDOUT, PIPE > diff --git a/lib/kt_cfg.py b/lib/kt_cfg.py > index a11753f..00175c3 100644 > --- a/lib/kt_cfg.py > +++ b/lib/kt_cfg.py > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > > from sys import argv > diff --git a/lib/log.py b/lib/log.py > index a8848c2..51df119 100644 > --- a/lib/log.py > +++ b/lib/log.py > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > from logging import info, debug, warning > from lib.termcolor import colored > diff --git a/lib/maas_shell.py b/lib/maas_shell.py > index ff38bbb..e0316a6 100644 > --- a/lib/maas_shell.py > +++ b/lib/maas_shell.py > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > > from sys import stdout > diff --git a/lib/provisioning.py b/lib/provisioning.py > index bad617d..e8bb38e 100644 > --- a/lib/provisioning.py > +++ b/lib/provisioning.py > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > from sys import stdout, argv > from os import path > diff --git a/lib/shell.py b/lib/shell.py > index 6560452..cab327e 100644 > --- a/lib/shell.py > +++ b/lib/shell.py > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > > from sys import stdout > diff --git a/lib/target.py b/lib/target.py > index ca12eed..76f99dc 100644 > --- a/lib/target.py > +++ b/lib/target.py > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > from sys import stdout, argv > from os import path > diff --git a/lib/test_attributes.py b/lib/test_attributes.py > index 2dde1db..da9a83b 100644 > --- a/lib/test_attributes.py > +++ b/lib/test_attributes.py > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > > from sys import argv > diff --git a/lib/ubuntu.py b/lib/ubuntu.py > index d93ce03..5fcbb23 100644 > --- a/lib/ubuntu.py > +++ b/lib/ubuntu.py > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > > import re > diff --git a/lib/utils.py b/lib/utils.py > index 40ada54..e6067b6 100644 > --- a/lib/utils.py > +++ b/lib/utils.py > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > > from sys import stdout, stderr > diff --git a/lib3/kernel_series.py b/lib3/kernel_series.py > index 747bc02..a7f17f7 100644 > --- a/lib3/kernel_series.py > +++ b/lib3/kernel_series.py > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > > try: > diff --git a/lib3/shell.py b/lib3/shell.py > index e489f15..4f204f0 100644 > --- a/lib3/shell.py > +++ b/lib3/shell.py > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > > from sys import stdout > diff --git a/lib3/utils.py b/lib3/utils.py > index 094f2cc..1b89e14 100644 > --- a/lib3/utils.py > +++ b/lib3/utils.py > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > > from sys import stdout, stderr > diff --git a/misc/benchmarking/iozone-fsync-results/digest b/misc/benchmarking/iozone-fsync-results/digest > index 8da22de..8537c72 100755 > --- a/misc/benchmarking/iozone-fsync-results/digest > +++ b/misc/benchmarking/iozone-fsync-results/digest > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > # Take a tree of test results and process it, producing a set of html > # reports. > diff --git a/misc/benchmarking/iozone-fsync-results/grinder.py b/misc/benchmarking/iozone-fsync-results/grinder.py > index 316a442..e3d18c9 100644 > --- a/misc/benchmarking/iozone-fsync-results/grinder.py > +++ b/misc/benchmarking/iozone-fsync-results/grinder.py > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > > from os import path, makedirs, listdir, walk > diff --git a/misc/benchmarking/iozone-fsync-results/ingest b/misc/benchmarking/iozone-fsync-results/ingest > index e39184a..ce6b197 100755 > --- a/misc/benchmarking/iozone-fsync-results/ingest > +++ b/misc/benchmarking/iozone-fsync-results/ingest > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > # Take a Jenkins test archive tree and process it into the long-term storage > # format that we want. This long-term storage format will be added to the > diff --git a/misc/benchmarking/iozone-fsync-results/mk-ingest-job b/misc/benchmarking/iozone-fsync-results/mk-ingest-job > index 29f8d4b..88eb722 100755 > --- a/misc/benchmarking/iozone-fsync-results/mk-ingest-job > +++ b/misc/benchmarking/iozone-fsync-results/mk-ingest-job > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > # Called by one of the jenkins matix jobs for every cell of > # the matix. This job creates the correct provision-job, > diff --git a/misc/benchmarking/iozone-fsync-results/reaper b/misc/benchmarking/iozone-fsync-results/reaper > index 80554a4..da1e4d5 100755 > --- a/misc/benchmarking/iozone-fsync-results/reaper > +++ b/misc/benchmarking/iozone-fsync-results/reaper > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > # Clean out the test-results directory tree. This is called from cron on the > # kernel-jenkins.magners system every so often. > diff --git a/misc/benchmarking/iozone-ioscheduler-xfs-results/digest b/misc/benchmarking/iozone-ioscheduler-xfs-results/digest > index 056b296..17bf682 100755 > --- a/misc/benchmarking/iozone-ioscheduler-xfs-results/digest > +++ b/misc/benchmarking/iozone-ioscheduler-xfs-results/digest > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > # Take a tree of test results and process it, producing a set of html > # reports. > diff --git a/misc/benchmarking/iozone-ioscheduler-xfs-results/grinder.py b/misc/benchmarking/iozone-ioscheduler-xfs-results/grinder.py > index 316a442..e3d18c9 100644 > --- a/misc/benchmarking/iozone-ioscheduler-xfs-results/grinder.py > +++ b/misc/benchmarking/iozone-ioscheduler-xfs-results/grinder.py > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > > from os import path, makedirs, listdir, walk > diff --git a/misc/benchmarking/iozone-ioscheduler-xfs-results/ingest b/misc/benchmarking/iozone-ioscheduler-xfs-results/ingest > index 43a8839..0c9e91d 100755 > --- a/misc/benchmarking/iozone-ioscheduler-xfs-results/ingest > +++ b/misc/benchmarking/iozone-ioscheduler-xfs-results/ingest > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > # Take a Jenkins test archive tree and process it into the long-term storage > # format that we want. This long-term storage format will be added to the > diff --git a/misc/benchmarking/iozone-ioscheduler-xfs-results/mk-ingest-job b/misc/benchmarking/iozone-ioscheduler-xfs-results/mk-ingest-job > index 29f8d4b..88eb722 100755 > --- a/misc/benchmarking/iozone-ioscheduler-xfs-results/mk-ingest-job > +++ b/misc/benchmarking/iozone-ioscheduler-xfs-results/mk-ingest-job > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > # Called by one of the jenkins matix jobs for every cell of > # the matix. This job creates the correct provision-job, > diff --git a/misc/benchmarking/iozone-ioscheduler-xfs-results/reaper b/misc/benchmarking/iozone-ioscheduler-xfs-results/reaper > index 80554a4..da1e4d5 100755 > --- a/misc/benchmarking/iozone-ioscheduler-xfs-results/reaper > +++ b/misc/benchmarking/iozone-ioscheduler-xfs-results/reaper > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > # Clean out the test-results directory tree. This is called from cron on the > # kernel-jenkins.magners system every so often. > diff --git a/misc/benchmarking/iozone-nolazy-results/digest b/misc/benchmarking/iozone-nolazy-results/digest > index 1c1b854..eb3aa7c 100755 > --- a/misc/benchmarking/iozone-nolazy-results/digest > +++ b/misc/benchmarking/iozone-nolazy-results/digest > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > # Take a tree of test results and process it, producing a set of html > # reports. > diff --git a/misc/benchmarking/iozone-nolazy-results/grinder.py b/misc/benchmarking/iozone-nolazy-results/grinder.py > index 316a442..e3d18c9 100644 > --- a/misc/benchmarking/iozone-nolazy-results/grinder.py > +++ b/misc/benchmarking/iozone-nolazy-results/grinder.py > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > > from os import path, makedirs, listdir, walk > diff --git a/misc/benchmarking/iozone-nolazy-results/ingest b/misc/benchmarking/iozone-nolazy-results/ingest > index 47cfd37..0e73a35 100755 > --- a/misc/benchmarking/iozone-nolazy-results/ingest > +++ b/misc/benchmarking/iozone-nolazy-results/ingest > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > # Take a Jenkins test archive tree and process it into the long-term storage > # format that we want. This long-term storage format will be added to the > diff --git a/misc/benchmarking/iozone-nolazy-results/mk-ingest-job b/misc/benchmarking/iozone-nolazy-results/mk-ingest-job > index 29f8d4b..88eb722 100755 > --- a/misc/benchmarking/iozone-nolazy-results/mk-ingest-job > +++ b/misc/benchmarking/iozone-nolazy-results/mk-ingest-job > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > # Called by one of the jenkins matix jobs for every cell of > # the matix. This job creates the correct provision-job, > diff --git a/misc/benchmarking/iozone-nolazy-results/reaper b/misc/benchmarking/iozone-nolazy-results/reaper > index 80554a4..da1e4d5 100755 > --- a/misc/benchmarking/iozone-nolazy-results/reaper > +++ b/misc/benchmarking/iozone-nolazy-results/reaper > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > # Clean out the test-results directory tree. This is called from cron on the > # kernel-jenkins.magners system every so often. > diff --git a/misc/benchmarking/iozone-results/digest b/misc/benchmarking/iozone-results/digest > index 274b2e5..cffa42a 100755 > --- a/misc/benchmarking/iozone-results/digest > +++ b/misc/benchmarking/iozone-results/digest > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > # Take a tree of test results and process it, producing a set of html > # reports. > diff --git a/misc/benchmarking/iozone-results/grinder.py b/misc/benchmarking/iozone-results/grinder.py > index 316a442..e3d18c9 100644 > --- a/misc/benchmarking/iozone-results/grinder.py > +++ b/misc/benchmarking/iozone-results/grinder.py > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > > from os import path, makedirs, listdir, walk > diff --git a/misc/benchmarking/iozone-results/ingest b/misc/benchmarking/iozone-results/ingest > index 8d28219..5ddce88 100755 > --- a/misc/benchmarking/iozone-results/ingest > +++ b/misc/benchmarking/iozone-results/ingest > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > # Take a Jenkins test archive tree and process it into the long-term storage > # format that we want. This long-term storage format will be added to the > diff --git a/misc/benchmarking/iozone-results/mk-ingest-job b/misc/benchmarking/iozone-results/mk-ingest-job > index 29f8d4b..88eb722 100755 > --- a/misc/benchmarking/iozone-results/mk-ingest-job > +++ b/misc/benchmarking/iozone-results/mk-ingest-job > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > # Called by one of the jenkins matix jobs for every cell of > # the matix. This job creates the correct provision-job, > diff --git a/misc/benchmarking/iozone-results/reaper b/misc/benchmarking/iozone-results/reaper > index 80554a4..da1e4d5 100755 > --- a/misc/benchmarking/iozone-results/reaper > +++ b/misc/benchmarking/iozone-results/reaper > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > # Clean out the test-results directory tree. This is called from cron on the > # kernel-jenkins.magners system every so often. > diff --git a/misc/benchmarking/old-benchmarking/create-result-set b/misc/benchmarking/old-benchmarking/create-result-set > index b45f8ad..ee3ed0a 100755 > --- a/misc/benchmarking/old-benchmarking/create-result-set > +++ b/misc/benchmarking/old-benchmarking/create-result-set > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > > from sys import argv > diff --git a/misc/benchmarking/tiobench-results/digest b/misc/benchmarking/tiobench-results/digest > index 8da22de..8537c72 100755 > --- a/misc/benchmarking/tiobench-results/digest > +++ b/misc/benchmarking/tiobench-results/digest > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > # Take a tree of test results and process it, producing a set of html > # reports. > diff --git a/misc/benchmarking/tiobench-results/grinder.py b/misc/benchmarking/tiobench-results/grinder.py > index 316a442..e3d18c9 100644 > --- a/misc/benchmarking/tiobench-results/grinder.py > +++ b/misc/benchmarking/tiobench-results/grinder.py > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > > from os import path, makedirs, listdir, walk > diff --git a/misc/benchmarking/tiobench-results/ingest b/misc/benchmarking/tiobench-results/ingest > index 0e2d49d..ac35d0c 100755 > --- a/misc/benchmarking/tiobench-results/ingest > +++ b/misc/benchmarking/tiobench-results/ingest > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > # Take a Jenkins test archive tree and process it into the long-term storage > # format that we want. This long-term storage format will be added to the > diff --git a/misc/benchmarking/tiobench-results/mk-ingest-job b/misc/benchmarking/tiobench-results/mk-ingest-job > index 29f8d4b..88eb722 100755 > --- a/misc/benchmarking/tiobench-results/mk-ingest-job > +++ b/misc/benchmarking/tiobench-results/mk-ingest-job > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > # Called by one of the jenkins matix jobs for every cell of > # the matix. This job creates the correct provision-job, > diff --git a/misc/benchmarking/tiobench-results/reaper b/misc/benchmarking/tiobench-results/reaper > index 80554a4..da1e4d5 100755 > --- a/misc/benchmarking/tiobench-results/reaper > +++ b/misc/benchmarking/tiobench-results/reaper > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > # Clean out the test-results directory tree. This is called from cron on the > # kernel-jenkins.magners system every so often. > diff --git a/misc/bs/bootspeed b/misc/bs/bootspeed > index 0ec4ee7..fa9b579 100755 > --- a/misc/bs/bootspeed > +++ b/misc/bs/bootspeed > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > > from os import path, getenv > diff --git a/misc/bs/gen-master-index b/misc/bs/gen-master-index > index fb5e93a..d2dfa11 100755 > --- a/misc/bs/gen-master-index > +++ b/misc/bs/gen-master-index > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > > from sys import stdout > diff --git a/misc/bs/gen-per-system-index b/misc/bs/gen-per-system-index > index e93acd2..d776a0e 100755 > --- a/misc/bs/gen-per-system-index > +++ b/misc/bs/gen-per-system-index > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > > from sys import stdout > diff --git a/misc/bs/gen-single-run-page b/misc/bs/gen-single-run-page > index f1b99b7..b27efa4 100755 > --- a/misc/bs/gen-single-run-page > +++ b/misc/bs/gen-single-run-page > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > > from sys import stdout > diff --git a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/buildbot/buildbot_run.py b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/buildbot/buildbot_run.py > index e0fda36..0f9d11c 100755 > --- a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/buildbot/buildbot_run.py > +++ b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/buildbot/buildbot_run.py > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # Copyright (c) 2012 Google Inc. All rights reserved. > # Use of this source code is governed by a BSD-style license that can be > # found in the LICENSE file. > diff --git a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/gyp b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/gyp > index d52e711..3d82e14 100755 > --- a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/gyp > +++ b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/gyp > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > > # Copyright (c) 2009 Google Inc. All rights reserved. > # Use of this source code is governed by a BSD-style license that can be > diff --git a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/gyptest.py b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/gyptest.py > index d9c814f..c9f7d25 100755 > --- a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/gyptest.py > +++ b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/gyptest.py > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > > # Copyright (c) 2012 Google Inc. All rights reserved. > # Use of this source code is governed by a BSD-style license that can be > diff --git a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/MSVSSettings_test.py b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/MSVSSettings_test.py > index 49e8a1d..a34ca73 100755 > --- a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/MSVSSettings_test.py > +++ b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/MSVSSettings_test.py > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > > # Copyright (c) 2011 Google Inc. All rights reserved. > # Use of this source code is governed by a BSD-style license that can be > diff --git a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/__init__.py b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/__init__.py > index 1402713..a52d4a3 100755 > --- a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/__init__.py > +++ b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/__init__.py > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > > # Copyright (c) 2011 Google Inc. All rights reserved. > # Use of this source code is governed by a BSD-style license that can be > diff --git a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/easy_xml_test.py b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/easy_xml_test.py > index a2aa4f2..4ca5bcd 100755 > --- a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/easy_xml_test.py > +++ b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/easy_xml_test.py > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > > # Copyright (c) 2011 Google Inc. All rights reserved. > # Use of this source code is governed by a BSD-style license that can be > diff --git a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/generator/msvs_test.py b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/generator/msvs_test.py > index 5a69c1c..9aec97d 100755 > --- a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/generator/msvs_test.py > +++ b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/generator/msvs_test.py > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > > # Copyright (c) 2011 Google Inc. All rights reserved. > # Use of this source code is governed by a BSD-style license that can be > diff --git a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/generator/ninja_test.py b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/generator/ninja_test.py > index af2e6d3..fe2c661 100644 > --- a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/generator/ninja_test.py > +++ b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/generator/ninja_test.py > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > > # Copyright (c) 2012 Google Inc. All rights reserved. > # Use of this source code is governed by a BSD-style license that can be > diff --git a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/mac_tool.py b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/mac_tool.py > index 42dd6c9..b6f9adb 100755 > --- a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/mac_tool.py > +++ b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/mac_tool.py > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # Copyright (c) 2012 Google Inc. All rights reserved. > # Use of this source code is governed by a BSD-style license that can be > # found in the LICENSE file. > diff --git a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/sun_tool.py b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/sun_tool.py > index 90d59c8..5b1956f 100755 > --- a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/sun_tool.py > +++ b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/sun_tool.py > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # Copyright (c) 2011 Google Inc. All rights reserved. > # Use of this source code is governed by a BSD-style license that can be > # found in the LICENSE file. > diff --git a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/system_test.py b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/system_test.py > index 51c71e3..ea68283 100755 > --- a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/system_test.py > +++ b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/system_test.py > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > > # Copyright (c) 2011 Google Inc. All rights reserved. > # Use of this source code is governed by a BSD-style license that can be > diff --git a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/samples/samples b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/samples/samples > index 804b618..0139666 100755 > --- a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/samples/samples > +++ b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/samples/samples > @@ -1,4 +1,4 @@ > -#!/usr/bin/python > +#!/usr/bin/python2 > > # Copyright (c) 2009 Google Inc. All rights reserved. > # Use of this source code is governed by a BSD-style license that can be > diff --git a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/setup.py b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/setup.py > index ed2b41a..3e34ac3 100755 > --- a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/setup.py > +++ b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/setup.py > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > > # Copyright (c) 2009 Google Inc. All rights reserved. > # Use of this source code is governed by a BSD-style license that can be > diff --git a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/tools/graphviz.py b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/tools/graphviz.py > index 326ae22..553a101 100755 > --- a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/tools/graphviz.py > +++ b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/tools/graphviz.py > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > > # Copyright (c) 2011 Google Inc. All rights reserved. > # Use of this source code is governed by a BSD-style license that can be > diff --git a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/tools/pretty_gyp.py b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/tools/pretty_gyp.py > index 3749792..8582c60 100755 > --- a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/tools/pretty_gyp.py > +++ b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/tools/pretty_gyp.py > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # Copyright (c) 2011 The Chromium Authors. All rights reserved. > # Use of this source code is governed by a BSD-style license that can be > # found in the LICENSE file. > diff --git a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/tools/pretty_sln.py b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/tools/pretty_sln.py > index 7013f2b..2319808 100755 > --- a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/tools/pretty_sln.py > +++ b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/tools/pretty_sln.py > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > > # Copyright (c) 2009 Google Inc. All rights reserved. > # Use of this source code is governed by a BSD-style license that can be > diff --git a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/tools/pretty_vcproj.py b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/tools/pretty_vcproj.py > index ba65bf2..aacadfa 100755 > --- a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/tools/pretty_vcproj.py > +++ b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/tools/pretty_vcproj.py > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > > # Copyright (c) 2009 Google Inc. All rights reserved. > # Use of this source code is governed by a BSD-style license that can be > diff --git a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp_addon b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp_addon > index b6f2d64..4749d63 100755 > --- a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp_addon > +++ b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp_addon > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > import os > import sys > > diff --git a/misc/bs/pbr b/misc/bs/pbr > index f0cecfb..5bf3203 100755 > --- a/misc/bs/pbr > +++ b/misc/bs/pbr > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > > from os import getenv, path, listdir, rename > diff --git a/misc/bs/upload-results b/misc/bs/upload-results > index f1e3d88..6034f0c 100755 > --- a/misc/bs/upload-results > +++ b/misc/bs/upload-results > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > > from os import getenv > diff --git a/msgpub b/msgpub > index 70aa17e..cacd4b1 100755 > --- a/msgpub > +++ b/msgpub > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > > import sys > diff --git a/power b/power > index a616eb5..665a31e 100755 > --- a/power > +++ b/power > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > > from os import environ > diff --git a/runner b/runner > index 7290997..5e3f284 100755 > --- a/runner > +++ b/runner > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > > from os import getenv, path, makedirs, environ > diff --git a/test-request b/test-request > index 72459c8..716f24f 100755 > --- a/test-request > +++ b/test-request > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > > from argparse import ArgumentParser, RawTextHelpFormatter > diff --git a/test-results/gen-hosts-files b/test-results/gen-hosts-files > index c54fb09..ecaa207 100755 > --- a/test-results/gen-hosts-files > +++ b/test-results/gen-hosts-files > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > > from sys import argv > diff --git a/test-results/gen-per-suite-indexes b/test-results/gen-per-suite-indexes > index d0e89f0..824708e 100755 > --- a/test-results/gen-per-suite-indexes > +++ b/test-results/gen-per-suite-indexes > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > > from argparse import ArgumentParser, RawDescriptionHelpFormatter > diff --git a/test-results/gen-root-indexes b/test-results/gen-root-indexes > index 6a5e06b..1522bfa 100755 > --- a/test-results/gen-root-indexes > +++ b/test-results/gen-root-indexes > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > > from argparse import ArgumentParser, RawDescriptionHelpFormatter > diff --git a/test-results/ingest b/test-results/ingest > index 55a74ba..ab54949 100755 > --- a/test-results/ingest > +++ b/test-results/ingest > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > # Take a Jenkins test archive tree and process it into the long-term storage > # format that we want. This long-term storage format will be added to the > diff --git a/test-results/process-maas-test-results b/test-results/process-maas-test-results > index 3e06cbe..30eb587 100755 > --- a/test-results/process-maas-test-results > +++ b/test-results/process-maas-test-results > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > > from os import makedirs, path, listdir > diff --git a/test-results/reaper b/test-results/reaper > index 2b425f5..749a29b 100755 > --- a/test-results/reaper > +++ b/test-results/reaper > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > # Clean out the test-results directory tree. This is called from cron on the > # kernel-jenkins.magners system every so often. > diff --git a/test-results/render b/test-results/render > index 941bb83..0192ab3 100755 > --- a/test-results/render > +++ b/test-results/render > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > > from argparse import ArgumentParser, RawDescriptionHelpFormatter > diff --git a/test-results/test_results.py b/test-results/test_results.py > index 27436cf..bcf6ace 100644 > --- a/test-results/test_results.py > +++ b/test-results/test_results.py > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > > from lib.log import cdebug, center, cleave > diff --git a/ubuntu-kernel-tests-version b/ubuntu-kernel-tests-version > index 2bf5460..afac117 100755 > --- a/ubuntu-kernel-tests-version > +++ b/ubuntu-kernel-tests-version > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > > import sys, os > > diff --git a/unicode-filter b/unicode-filter > index 62e0241..b3a1544 100755 > --- a/unicode-filter > +++ b/unicode-filter > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python2 > # > > import sys > diff --git a/yaml.dump b/yaml.dump > index f5c3cf8..2db7c0b 100755 > --- a/yaml.dump > +++ b/yaml.dump > @@ -1,4 +1,4 @@ > -#!/usr/bin/python > +#!/usr/bin/python2 > > import argparse > import json >
Applied by sfeole. Sending this out to close this thread. https://kernel.ubuntu.com/git/ubuntu/kernel-testing.git/commit/?id=47c5e4c1f7e58dc1163aa6bd1a786081909be2c7 Thanks Sam
diff --git a/dep8-runner b/dep8-runner index a919336..52259e0 100755 --- a/dep8-runner +++ b/dep8-runner @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # from os import getenv, path, makedirs, environ diff --git a/info b/info index 26234bf..09a93a9 100755 --- a/info +++ b/info @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # from lib.argparse import ArgumentParser, RawDescriptionHelpFormatter diff --git a/jenkins-job-creator/jjc b/jenkins-job-creator/jjc index f3822f4..84813a8 100755 --- a/jenkins-job-creator/jjc +++ b/jenkins-job-creator/jjc @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # # Called by one of the jenkins matix jobs for every cell of # the matix. This job creates the correct provision-job, diff --git a/kmsgq-ircbot b/kmsgq-ircbot index b3cfe2c..96cd6b5 100755 --- a/kmsgq-ircbot +++ b/kmsgq-ircbot @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # import sys diff --git a/lib/benchmarkdb.py b/lib/benchmarkdb.py index 1c663ac..cd1b2e1 100644 --- a/lib/benchmarkdb.py +++ b/lib/benchmarkdb.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # # # This defines filter sets which are applied to the metadata in benchmark results in order to filter them for charting. diff --git a/lib/cmdline.py b/lib/cmdline.py index 1f7ba23..5c0293c 100644 --- a/lib/cmdline.py +++ b/lib/cmdline.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # # This application takes a list json file as input. That json file # contains a 'dictionary' of key value pairs where the key is a diff --git a/lib/cobbler.py b/lib/cobbler.py index 0bee24e..9303677 100644 --- a/lib/cobbler.py +++ b/lib/cobbler.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # from os import path from time import sleep diff --git a/lib/configuration.py b/lib/configuration.py index 9be28af..5b9758c 100644 --- a/lib/configuration.py +++ b/lib/configuration.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # import sys from os import path diff --git a/lib/dbg.py b/lib/dbg.py index 1afd634..9374d0f 100644 --- a/lib/dbg.py +++ b/lib/dbg.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # from sys import stdout diff --git a/lib/debian.py b/lib/debian.py index 1dce227..0d2ada1 100644 --- a/lib/debian.py +++ b/lib/debian.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # from re import compile diff --git a/lib/dlipower.py b/lib/dlipower.py index 7be8325..75c98f3 100755 --- a/lib/dlipower.py +++ b/lib/dlipower.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python2 """ ############################################################### Digital Loggers Web Power Switch management diff --git a/lib/exceptions.py b/lib/exceptions.py index 8b500c2..ac03020 100644 --- a/lib/exceptions.py +++ b/lib/exceptions.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # # ErrorExit diff --git a/lib/grinder.py b/lib/grinder.py index 850fb1d..86afd54 100644 --- a/lib/grinder.py +++ b/lib/grinder.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # from os import path, makedirs, listdir, walk diff --git a/lib/infrastructure.kernel-team b/lib/infrastructure.kernel-team index 664be1b..ace2f7a 100644 --- a/lib/infrastructure.kernel-team +++ b/lib/infrastructure.kernel-team @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # MAASConfig = { diff --git a/lib/job.py b/lib/job.py index 88878f7..90baa63 100644 --- a/lib/job.py +++ b/lib/job.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # from sys import stdout from subprocess import Popen, STDOUT, PIPE diff --git a/lib/kt_cfg.py b/lib/kt_cfg.py index a11753f..00175c3 100644 --- a/lib/kt_cfg.py +++ b/lib/kt_cfg.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # from sys import argv diff --git a/lib/log.py b/lib/log.py index a8848c2..51df119 100644 --- a/lib/log.py +++ b/lib/log.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # from logging import info, debug, warning from lib.termcolor import colored diff --git a/lib/maas_shell.py b/lib/maas_shell.py index ff38bbb..e0316a6 100644 --- a/lib/maas_shell.py +++ b/lib/maas_shell.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # from sys import stdout diff --git a/lib/provisioning.py b/lib/provisioning.py index bad617d..e8bb38e 100644 --- a/lib/provisioning.py +++ b/lib/provisioning.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # from sys import stdout, argv from os import path diff --git a/lib/shell.py b/lib/shell.py index 6560452..cab327e 100644 --- a/lib/shell.py +++ b/lib/shell.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # from sys import stdout diff --git a/lib/target.py b/lib/target.py index ca12eed..76f99dc 100644 --- a/lib/target.py +++ b/lib/target.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # from sys import stdout, argv from os import path diff --git a/lib/test_attributes.py b/lib/test_attributes.py index 2dde1db..da9a83b 100644 --- a/lib/test_attributes.py +++ b/lib/test_attributes.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # from sys import argv diff --git a/lib/ubuntu.py b/lib/ubuntu.py index d93ce03..5fcbb23 100644 --- a/lib/ubuntu.py +++ b/lib/ubuntu.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # import re diff --git a/lib/utils.py b/lib/utils.py index 40ada54..e6067b6 100644 --- a/lib/utils.py +++ b/lib/utils.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # from sys import stdout, stderr diff --git a/lib3/kernel_series.py b/lib3/kernel_series.py index 747bc02..a7f17f7 100644 --- a/lib3/kernel_series.py +++ b/lib3/kernel_series.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # try: diff --git a/lib3/shell.py b/lib3/shell.py index e489f15..4f204f0 100644 --- a/lib3/shell.py +++ b/lib3/shell.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # from sys import stdout diff --git a/lib3/utils.py b/lib3/utils.py index 094f2cc..1b89e14 100644 --- a/lib3/utils.py +++ b/lib3/utils.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # from sys import stdout, stderr diff --git a/misc/benchmarking/iozone-fsync-results/digest b/misc/benchmarking/iozone-fsync-results/digest index 8da22de..8537c72 100755 --- a/misc/benchmarking/iozone-fsync-results/digest +++ b/misc/benchmarking/iozone-fsync-results/digest @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # # Take a tree of test results and process it, producing a set of html # reports. diff --git a/misc/benchmarking/iozone-fsync-results/grinder.py b/misc/benchmarking/iozone-fsync-results/grinder.py index 316a442..e3d18c9 100644 --- a/misc/benchmarking/iozone-fsync-results/grinder.py +++ b/misc/benchmarking/iozone-fsync-results/grinder.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # from os import path, makedirs, listdir, walk diff --git a/misc/benchmarking/iozone-fsync-results/ingest b/misc/benchmarking/iozone-fsync-results/ingest index e39184a..ce6b197 100755 --- a/misc/benchmarking/iozone-fsync-results/ingest +++ b/misc/benchmarking/iozone-fsync-results/ingest @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # # Take a Jenkins test archive tree and process it into the long-term storage # format that we want. This long-term storage format will be added to the diff --git a/misc/benchmarking/iozone-fsync-results/mk-ingest-job b/misc/benchmarking/iozone-fsync-results/mk-ingest-job index 29f8d4b..88eb722 100755 --- a/misc/benchmarking/iozone-fsync-results/mk-ingest-job +++ b/misc/benchmarking/iozone-fsync-results/mk-ingest-job @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # # Called by one of the jenkins matix jobs for every cell of # the matix. This job creates the correct provision-job, diff --git a/misc/benchmarking/iozone-fsync-results/reaper b/misc/benchmarking/iozone-fsync-results/reaper index 80554a4..da1e4d5 100755 --- a/misc/benchmarking/iozone-fsync-results/reaper +++ b/misc/benchmarking/iozone-fsync-results/reaper @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # # Clean out the test-results directory tree. This is called from cron on the # kernel-jenkins.magners system every so often. diff --git a/misc/benchmarking/iozone-ioscheduler-xfs-results/digest b/misc/benchmarking/iozone-ioscheduler-xfs-results/digest index 056b296..17bf682 100755 --- a/misc/benchmarking/iozone-ioscheduler-xfs-results/digest +++ b/misc/benchmarking/iozone-ioscheduler-xfs-results/digest @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # # Take a tree of test results and process it, producing a set of html # reports. diff --git a/misc/benchmarking/iozone-ioscheduler-xfs-results/grinder.py b/misc/benchmarking/iozone-ioscheduler-xfs-results/grinder.py index 316a442..e3d18c9 100644 --- a/misc/benchmarking/iozone-ioscheduler-xfs-results/grinder.py +++ b/misc/benchmarking/iozone-ioscheduler-xfs-results/grinder.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # from os import path, makedirs, listdir, walk diff --git a/misc/benchmarking/iozone-ioscheduler-xfs-results/ingest b/misc/benchmarking/iozone-ioscheduler-xfs-results/ingest index 43a8839..0c9e91d 100755 --- a/misc/benchmarking/iozone-ioscheduler-xfs-results/ingest +++ b/misc/benchmarking/iozone-ioscheduler-xfs-results/ingest @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # # Take a Jenkins test archive tree and process it into the long-term storage # format that we want. This long-term storage format will be added to the diff --git a/misc/benchmarking/iozone-ioscheduler-xfs-results/mk-ingest-job b/misc/benchmarking/iozone-ioscheduler-xfs-results/mk-ingest-job index 29f8d4b..88eb722 100755 --- a/misc/benchmarking/iozone-ioscheduler-xfs-results/mk-ingest-job +++ b/misc/benchmarking/iozone-ioscheduler-xfs-results/mk-ingest-job @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # # Called by one of the jenkins matix jobs for every cell of # the matix. This job creates the correct provision-job, diff --git a/misc/benchmarking/iozone-ioscheduler-xfs-results/reaper b/misc/benchmarking/iozone-ioscheduler-xfs-results/reaper index 80554a4..da1e4d5 100755 --- a/misc/benchmarking/iozone-ioscheduler-xfs-results/reaper +++ b/misc/benchmarking/iozone-ioscheduler-xfs-results/reaper @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # # Clean out the test-results directory tree. This is called from cron on the # kernel-jenkins.magners system every so often. diff --git a/misc/benchmarking/iozone-nolazy-results/digest b/misc/benchmarking/iozone-nolazy-results/digest index 1c1b854..eb3aa7c 100755 --- a/misc/benchmarking/iozone-nolazy-results/digest +++ b/misc/benchmarking/iozone-nolazy-results/digest @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # # Take a tree of test results and process it, producing a set of html # reports. diff --git a/misc/benchmarking/iozone-nolazy-results/grinder.py b/misc/benchmarking/iozone-nolazy-results/grinder.py index 316a442..e3d18c9 100644 --- a/misc/benchmarking/iozone-nolazy-results/grinder.py +++ b/misc/benchmarking/iozone-nolazy-results/grinder.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # from os import path, makedirs, listdir, walk diff --git a/misc/benchmarking/iozone-nolazy-results/ingest b/misc/benchmarking/iozone-nolazy-results/ingest index 47cfd37..0e73a35 100755 --- a/misc/benchmarking/iozone-nolazy-results/ingest +++ b/misc/benchmarking/iozone-nolazy-results/ingest @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # # Take a Jenkins test archive tree and process it into the long-term storage # format that we want. This long-term storage format will be added to the diff --git a/misc/benchmarking/iozone-nolazy-results/mk-ingest-job b/misc/benchmarking/iozone-nolazy-results/mk-ingest-job index 29f8d4b..88eb722 100755 --- a/misc/benchmarking/iozone-nolazy-results/mk-ingest-job +++ b/misc/benchmarking/iozone-nolazy-results/mk-ingest-job @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # # Called by one of the jenkins matix jobs for every cell of # the matix. This job creates the correct provision-job, diff --git a/misc/benchmarking/iozone-nolazy-results/reaper b/misc/benchmarking/iozone-nolazy-results/reaper index 80554a4..da1e4d5 100755 --- a/misc/benchmarking/iozone-nolazy-results/reaper +++ b/misc/benchmarking/iozone-nolazy-results/reaper @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # # Clean out the test-results directory tree. This is called from cron on the # kernel-jenkins.magners system every so often. diff --git a/misc/benchmarking/iozone-results/digest b/misc/benchmarking/iozone-results/digest index 274b2e5..cffa42a 100755 --- a/misc/benchmarking/iozone-results/digest +++ b/misc/benchmarking/iozone-results/digest @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # # Take a tree of test results and process it, producing a set of html # reports. diff --git a/misc/benchmarking/iozone-results/grinder.py b/misc/benchmarking/iozone-results/grinder.py index 316a442..e3d18c9 100644 --- a/misc/benchmarking/iozone-results/grinder.py +++ b/misc/benchmarking/iozone-results/grinder.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # from os import path, makedirs, listdir, walk diff --git a/misc/benchmarking/iozone-results/ingest b/misc/benchmarking/iozone-results/ingest index 8d28219..5ddce88 100755 --- a/misc/benchmarking/iozone-results/ingest +++ b/misc/benchmarking/iozone-results/ingest @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # # Take a Jenkins test archive tree and process it into the long-term storage # format that we want. This long-term storage format will be added to the diff --git a/misc/benchmarking/iozone-results/mk-ingest-job b/misc/benchmarking/iozone-results/mk-ingest-job index 29f8d4b..88eb722 100755 --- a/misc/benchmarking/iozone-results/mk-ingest-job +++ b/misc/benchmarking/iozone-results/mk-ingest-job @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # # Called by one of the jenkins matix jobs for every cell of # the matix. This job creates the correct provision-job, diff --git a/misc/benchmarking/iozone-results/reaper b/misc/benchmarking/iozone-results/reaper index 80554a4..da1e4d5 100755 --- a/misc/benchmarking/iozone-results/reaper +++ b/misc/benchmarking/iozone-results/reaper @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # # Clean out the test-results directory tree. This is called from cron on the # kernel-jenkins.magners system every so often. diff --git a/misc/benchmarking/old-benchmarking/create-result-set b/misc/benchmarking/old-benchmarking/create-result-set index b45f8ad..ee3ed0a 100755 --- a/misc/benchmarking/old-benchmarking/create-result-set +++ b/misc/benchmarking/old-benchmarking/create-result-set @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # from sys import argv diff --git a/misc/benchmarking/tiobench-results/digest b/misc/benchmarking/tiobench-results/digest index 8da22de..8537c72 100755 --- a/misc/benchmarking/tiobench-results/digest +++ b/misc/benchmarking/tiobench-results/digest @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # # Take a tree of test results and process it, producing a set of html # reports. diff --git a/misc/benchmarking/tiobench-results/grinder.py b/misc/benchmarking/tiobench-results/grinder.py index 316a442..e3d18c9 100644 --- a/misc/benchmarking/tiobench-results/grinder.py +++ b/misc/benchmarking/tiobench-results/grinder.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # from os import path, makedirs, listdir, walk diff --git a/misc/benchmarking/tiobench-results/ingest b/misc/benchmarking/tiobench-results/ingest index 0e2d49d..ac35d0c 100755 --- a/misc/benchmarking/tiobench-results/ingest +++ b/misc/benchmarking/tiobench-results/ingest @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # # Take a Jenkins test archive tree and process it into the long-term storage # format that we want. This long-term storage format will be added to the diff --git a/misc/benchmarking/tiobench-results/mk-ingest-job b/misc/benchmarking/tiobench-results/mk-ingest-job index 29f8d4b..88eb722 100755 --- a/misc/benchmarking/tiobench-results/mk-ingest-job +++ b/misc/benchmarking/tiobench-results/mk-ingest-job @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # # Called by one of the jenkins matix jobs for every cell of # the matix. This job creates the correct provision-job, diff --git a/misc/benchmarking/tiobench-results/reaper b/misc/benchmarking/tiobench-results/reaper index 80554a4..da1e4d5 100755 --- a/misc/benchmarking/tiobench-results/reaper +++ b/misc/benchmarking/tiobench-results/reaper @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # # Clean out the test-results directory tree. This is called from cron on the # kernel-jenkins.magners system every so often. diff --git a/misc/bs/bootspeed b/misc/bs/bootspeed index 0ec4ee7..fa9b579 100755 --- a/misc/bs/bootspeed +++ b/misc/bs/bootspeed @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # from os import path, getenv diff --git a/misc/bs/gen-master-index b/misc/bs/gen-master-index index fb5e93a..d2dfa11 100755 --- a/misc/bs/gen-master-index +++ b/misc/bs/gen-master-index @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # from sys import stdout diff --git a/misc/bs/gen-per-system-index b/misc/bs/gen-per-system-index index e93acd2..d776a0e 100755 --- a/misc/bs/gen-per-system-index +++ b/misc/bs/gen-per-system-index @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # from sys import stdout diff --git a/misc/bs/gen-single-run-page b/misc/bs/gen-single-run-page index f1b99b7..b27efa4 100755 --- a/misc/bs/gen-single-run-page +++ b/misc/bs/gen-single-run-page @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # from sys import stdout diff --git a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/buildbot/buildbot_run.py b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/buildbot/buildbot_run.py index e0fda36..0f9d11c 100755 --- a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/buildbot/buildbot_run.py +++ b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/buildbot/buildbot_run.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright (c) 2012 Google Inc. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/gyp b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/gyp index d52e711..3d82e14 100755 --- a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/gyp +++ b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/gyp @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright (c) 2009 Google Inc. All rights reserved. # Use of this source code is governed by a BSD-style license that can be diff --git a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/gyptest.py b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/gyptest.py index d9c814f..c9f7d25 100755 --- a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/gyptest.py +++ b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/gyptest.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright (c) 2012 Google Inc. All rights reserved. # Use of this source code is governed by a BSD-style license that can be diff --git a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/MSVSSettings_test.py b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/MSVSSettings_test.py index 49e8a1d..a34ca73 100755 --- a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/MSVSSettings_test.py +++ b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/MSVSSettings_test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright (c) 2011 Google Inc. All rights reserved. # Use of this source code is governed by a BSD-style license that can be diff --git a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/__init__.py b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/__init__.py index 1402713..a52d4a3 100755 --- a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/__init__.py +++ b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/__init__.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright (c) 2011 Google Inc. All rights reserved. # Use of this source code is governed by a BSD-style license that can be diff --git a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/easy_xml_test.py b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/easy_xml_test.py index a2aa4f2..4ca5bcd 100755 --- a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/easy_xml_test.py +++ b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/easy_xml_test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright (c) 2011 Google Inc. All rights reserved. # Use of this source code is governed by a BSD-style license that can be diff --git a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/generator/msvs_test.py b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/generator/msvs_test.py index 5a69c1c..9aec97d 100755 --- a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/generator/msvs_test.py +++ b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/generator/msvs_test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright (c) 2011 Google Inc. All rights reserved. # Use of this source code is governed by a BSD-style license that can be diff --git a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/generator/ninja_test.py b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/generator/ninja_test.py index af2e6d3..fe2c661 100644 --- a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/generator/ninja_test.py +++ b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/generator/ninja_test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright (c) 2012 Google Inc. All rights reserved. # Use of this source code is governed by a BSD-style license that can be diff --git a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/mac_tool.py b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/mac_tool.py index 42dd6c9..b6f9adb 100755 --- a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/mac_tool.py +++ b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/mac_tool.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright (c) 2012 Google Inc. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/sun_tool.py b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/sun_tool.py index 90d59c8..5b1956f 100755 --- a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/sun_tool.py +++ b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/sun_tool.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright (c) 2011 Google Inc. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/system_test.py b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/system_test.py index 51c71e3..ea68283 100755 --- a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/system_test.py +++ b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/system_test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright (c) 2011 Google Inc. All rights reserved. # Use of this source code is governed by a BSD-style license that can be diff --git a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/samples/samples b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/samples/samples index 804b618..0139666 100755 --- a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/samples/samples +++ b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/samples/samples @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python2 # Copyright (c) 2009 Google Inc. All rights reserved. # Use of this source code is governed by a BSD-style license that can be diff --git a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/setup.py b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/setup.py index ed2b41a..3e34ac3 100755 --- a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/setup.py +++ b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright (c) 2009 Google Inc. All rights reserved. # Use of this source code is governed by a BSD-style license that can be diff --git a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/tools/graphviz.py b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/tools/graphviz.py index 326ae22..553a101 100755 --- a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/tools/graphviz.py +++ b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/tools/graphviz.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright (c) 2011 Google Inc. All rights reserved. # Use of this source code is governed by a BSD-style license that can be diff --git a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/tools/pretty_gyp.py b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/tools/pretty_gyp.py index 3749792..8582c60 100755 --- a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/tools/pretty_gyp.py +++ b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/tools/pretty_gyp.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright (c) 2011 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/tools/pretty_sln.py b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/tools/pretty_sln.py index 7013f2b..2319808 100755 --- a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/tools/pretty_sln.py +++ b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/tools/pretty_sln.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright (c) 2009 Google Inc. All rights reserved. # Use of this source code is governed by a BSD-style license that can be diff --git a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/tools/pretty_vcproj.py b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/tools/pretty_vcproj.py index ba65bf2..aacadfa 100755 --- a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/tools/pretty_vcproj.py +++ b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/tools/pretty_vcproj.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright (c) 2009 Google Inc. All rights reserved. # Use of this source code is governed by a BSD-style license that can be diff --git a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp_addon b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp_addon index b6f2d64..4749d63 100755 --- a/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp_addon +++ b/misc/bs/local/lib/node_modules/npm/node_modules/node-gyp/legacy/tools/gyp_addon @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 import os import sys diff --git a/misc/bs/pbr b/misc/bs/pbr index f0cecfb..5bf3203 100755 --- a/misc/bs/pbr +++ b/misc/bs/pbr @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # from os import getenv, path, listdir, rename diff --git a/misc/bs/upload-results b/misc/bs/upload-results index f1e3d88..6034f0c 100755 --- a/misc/bs/upload-results +++ b/misc/bs/upload-results @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # from os import getenv diff --git a/msgpub b/msgpub index 70aa17e..cacd4b1 100755 --- a/msgpub +++ b/msgpub @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # import sys diff --git a/power b/power index a616eb5..665a31e 100755 --- a/power +++ b/power @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # from os import environ diff --git a/runner b/runner index 7290997..5e3f284 100755 --- a/runner +++ b/runner @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # from os import getenv, path, makedirs, environ diff --git a/test-request b/test-request index 72459c8..716f24f 100755 --- a/test-request +++ b/test-request @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # from argparse import ArgumentParser, RawTextHelpFormatter diff --git a/test-results/gen-hosts-files b/test-results/gen-hosts-files index c54fb09..ecaa207 100755 --- a/test-results/gen-hosts-files +++ b/test-results/gen-hosts-files @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # from sys import argv diff --git a/test-results/gen-per-suite-indexes b/test-results/gen-per-suite-indexes index d0e89f0..824708e 100755 --- a/test-results/gen-per-suite-indexes +++ b/test-results/gen-per-suite-indexes @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # from argparse import ArgumentParser, RawDescriptionHelpFormatter diff --git a/test-results/gen-root-indexes b/test-results/gen-root-indexes index 6a5e06b..1522bfa 100755 --- a/test-results/gen-root-indexes +++ b/test-results/gen-root-indexes @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # from argparse import ArgumentParser, RawDescriptionHelpFormatter diff --git a/test-results/ingest b/test-results/ingest index 55a74ba..ab54949 100755 --- a/test-results/ingest +++ b/test-results/ingest @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # # Take a Jenkins test archive tree and process it into the long-term storage # format that we want. This long-term storage format will be added to the diff --git a/test-results/process-maas-test-results b/test-results/process-maas-test-results index 3e06cbe..30eb587 100755 --- a/test-results/process-maas-test-results +++ b/test-results/process-maas-test-results @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # from os import makedirs, path, listdir diff --git a/test-results/reaper b/test-results/reaper index 2b425f5..749a29b 100755 --- a/test-results/reaper +++ b/test-results/reaper @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # # Clean out the test-results directory tree. This is called from cron on the # kernel-jenkins.magners system every so often. diff --git a/test-results/render b/test-results/render index 941bb83..0192ab3 100755 --- a/test-results/render +++ b/test-results/render @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # from argparse import ArgumentParser, RawDescriptionHelpFormatter diff --git a/test-results/test_results.py b/test-results/test_results.py index 27436cf..bcf6ace 100644 --- a/test-results/test_results.py +++ b/test-results/test_results.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # from lib.log import cdebug, center, cleave diff --git a/ubuntu-kernel-tests-version b/ubuntu-kernel-tests-version index 2bf5460..afac117 100755 --- a/ubuntu-kernel-tests-version +++ b/ubuntu-kernel-tests-version @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 import sys, os diff --git a/unicode-filter b/unicode-filter index 62e0241..b3a1544 100755 --- a/unicode-filter +++ b/unicode-filter @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # import sys diff --git a/yaml.dump b/yaml.dump index f5c3cf8..2db7c0b 100755 --- a/yaml.dump +++ b/yaml.dump @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python2 import argparse import json
Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com> --- dep8-runner | 2 +- info | 2 +- jenkins-job-creator/jjc | 2 +- kmsgq-ircbot | 2 +- lib/benchmarkdb.py | 2 +- lib/cmdline.py | 2 +- lib/cobbler.py | 2 +- lib/configuration.py | 2 +- lib/dbg.py | 2 +- lib/debian.py | 2 +- lib/dlipower.py | 2 +- lib/exceptions.py | 2 +- lib/grinder.py | 2 +- lib/infrastructure.kernel-team | 2 +- lib/job.py | 2 +- lib/kt_cfg.py | 2 +- lib/log.py | 2 +- lib/maas_shell.py | 2 +- lib/provisioning.py | 2 +- lib/shell.py | 2 +- lib/target.py | 2 +- lib/test_attributes.py | 2 +- lib/ubuntu.py | 2 +- lib/utils.py | 2 +- lib3/kernel_series.py | 2 +- lib3/shell.py | 2 +- lib3/utils.py | 2 +- misc/benchmarking/iozone-fsync-results/digest | 2 +- misc/benchmarking/iozone-fsync-results/grinder.py | 2 +- misc/benchmarking/iozone-fsync-results/ingest | 2 +- misc/benchmarking/iozone-fsync-results/mk-ingest-job | 2 +- misc/benchmarking/iozone-fsync-results/reaper | 2 +- misc/benchmarking/iozone-ioscheduler-xfs-results/digest | 2 +- misc/benchmarking/iozone-ioscheduler-xfs-results/grinder.py | 2 +- misc/benchmarking/iozone-ioscheduler-xfs-results/ingest | 2 +- misc/benchmarking/iozone-ioscheduler-xfs-results/mk-ingest-job | 2 +- misc/benchmarking/iozone-ioscheduler-xfs-results/reaper | 2 +- misc/benchmarking/iozone-nolazy-results/digest | 2 +- misc/benchmarking/iozone-nolazy-results/grinder.py | 2 +- misc/benchmarking/iozone-nolazy-results/ingest | 2 +- misc/benchmarking/iozone-nolazy-results/mk-ingest-job | 2 +- misc/benchmarking/iozone-nolazy-results/reaper | 2 +- misc/benchmarking/iozone-results/digest | 2 +- misc/benchmarking/iozone-results/grinder.py | 2 +- misc/benchmarking/iozone-results/ingest | 2 +- misc/benchmarking/iozone-results/mk-ingest-job | 2 +- misc/benchmarking/iozone-results/reaper | 2 +- misc/benchmarking/old-benchmarking/create-result-set | 2 +- misc/benchmarking/tiobench-results/digest | 2 +- misc/benchmarking/tiobench-results/grinder.py | 2 +- misc/benchmarking/tiobench-results/ingest | 2 +- misc/benchmarking/tiobench-results/mk-ingest-job | 2 +- misc/benchmarking/tiobench-results/reaper | 2 +- misc/bs/bootspeed | 2 +- misc/bs/gen-master-index | 2 +- misc/bs/gen-per-system-index | 2 +- misc/bs/gen-single-run-page | 2 +- .../node-gyp/legacy/tools/gyp/buildbot/buildbot_run.py | 2 +- .../node_modules/npm/node_modules/node-gyp/legacy/tools/gyp/gyp | 2 +- .../npm/node_modules/node-gyp/legacy/tools/gyp/gyptest.py | 2 +- .../node-gyp/legacy/tools/gyp/pylib/gyp/MSVSSettings_test.py | 2 +- .../node-gyp/legacy/tools/gyp/pylib/gyp/__init__.py | 2 +- .../node-gyp/legacy/tools/gyp/pylib/gyp/easy_xml_test.py | 2 +- .../node-gyp/legacy/tools/gyp/pylib/gyp/generator/msvs_test.py | 2 +- .../node-gyp/legacy/tools/gyp/pylib/gyp/generator/ninja_test.py | 2 +- .../node-gyp/legacy/tools/gyp/pylib/gyp/mac_tool.py | 2 +- .../node-gyp/legacy/tools/gyp/pylib/gyp/sun_tool.py | 2 +- .../node-gyp/legacy/tools/gyp/pylib/gyp/system_test.py | 2 +- .../npm/node_modules/node-gyp/legacy/tools/gyp/samples/samples | 2 +- .../npm/node_modules/node-gyp/legacy/tools/gyp/setup.py | 2 +- .../node_modules/node-gyp/legacy/tools/gyp/tools/graphviz.py | 2 +- .../node_modules/node-gyp/legacy/tools/gyp/tools/pretty_gyp.py | 2 +- .../node_modules/node-gyp/legacy/tools/gyp/tools/pretty_sln.py | 2 +- .../node-gyp/legacy/tools/gyp/tools/pretty_vcproj.py | 2 +- .../npm/node_modules/node-gyp/legacy/tools/gyp_addon | 2 +- misc/bs/pbr | 2 +- misc/bs/upload-results | 2 +- msgpub | 2 +- power | 2 +- runner | 2 +- test-request | 2 +- test-results/gen-hosts-files | 2 +- test-results/gen-per-suite-indexes | 2 +- test-results/gen-root-indexes | 2 +- test-results/ingest | 2 +- test-results/process-maas-test-results | 2 +- test-results/reaper | 2 +- test-results/render | 2 +- test-results/test_results.py | 2 +- ubuntu-kernel-tests-version | 2 +- unicode-filter | 2 +- yaml.dump | 2 +- 92 files changed, 92 insertions(+), 92 deletions(-)