diff -r 17a5e8190ee0 -r 271c55c49c26 util/minorview.py
--- a/util/minorview.py	Fri Jan 27 11:31:44 2017 -0600
+++ b/util/minorview.py	Fri Jan 27 11:31:45 2017 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 #
 # Copyright (c) 2013 ARM Limited
 # All rights reserved
diff -r 17a5e8190ee0 -r 271c55c49c26 util/o3-pipeview.py
--- a/util/o3-pipeview.py	Fri Jan 27 11:31:44 2017 -0600
+++ b/util/o3-pipeview.py	Fri Jan 27 11:31:45 2017 -0600
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python2
 
 # Copyright (c) 2011 ARM Limited
 # All rights reserved
diff -r 17a5e8190ee0 -r 271c55c49c26 util/oprofile-top.py
--- a/util/oprofile-top.py	Fri Jan 27 11:31:44 2017 -0600
+++ b/util/oprofile-top.py	Fri Jan 27 11:31:45 2017 -0600
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python2
 
 # Copyright (c) 2005 The Regents of The University of Michigan
 # All rights reserved.
diff -r 17a5e8190ee0 -r 271c55c49c26 util/pbs/job.py
--- a/util/pbs/job.py	Fri Jan 27 11:31:44 2017 -0600
+++ b/util/pbs/job.py	Fri Jan 27 11:31:45 2017 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 # Copyright (c) 2005 The Regents of The University of Michigan
 # All rights reserved.
 #
diff -r 17a5e8190ee0 -r 271c55c49c26 util/pbs/send.py
--- a/util/pbs/send.py	Fri Jan 27 11:31:44 2017 -0600
+++ b/util/pbs/send.py	Fri Jan 27 11:31:45 2017 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 # Copyright (c) 2005 The Regents of The University of Michigan
 # All rights reserved.
 #
diff -r 17a5e8190ee0 -r 271c55c49c26 util/protolib.py
--- a/util/protolib.py	Fri Jan 27 11:31:44 2017 -0600
+++ b/util/protolib.py	Fri Jan 27 11:31:45 2017 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 # Copyright (c) 2013 ARM Limited
 # All rights reserved
diff -r 17a5e8190ee0 -r 271c55c49c26 util/qdo
--- a/util/qdo	Fri Jan 27 11:31:44 2017 -0600
+++ b/util/qdo	Fri Jan 27 11:31:45 2017 -0600
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python2
 
 # Copyright (c) 2004-2005, 2007 The Regents of The University of Michigan
 # All rights reserved.
diff -r 17a5e8190ee0 -r 271c55c49c26 util/regress
--- a/util/regress	Fri Jan 27 11:31:44 2017 -0600
+++ b/util/regress	Fri Jan 27 11:31:45 2017 -0600
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python2
 # Copyright (c) 2005-2007 The Regents of The University of Michigan
 # All rights reserved.
 #
diff -r 17a5e8190ee0 -r 271c55c49c26 util/slicc
--- a/util/slicc	Fri Jan 27 11:31:44 2017 -0600
+++ b/util/slicc	Fri Jan 27 11:31:45 2017 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 # Copyright (c) 2009 The Hewlett-Packard Development Company
 # All rights reserved.
 #
diff -r 17a5e8190ee0 -r 271c55c49c26 util/stats/stats.py
--- a/util/stats/stats.py	Fri Jan 27 11:31:44 2017 -0600
+++ b/util/stats/stats.py	Fri Jan 27 11:31:45 2017 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 # Copyright (c) 2003-2004 The Regents of The University of Michigan
 # All rights reserved.
diff -r 17a5e8190ee0 -r 271c55c49c26 util/streamline/m5stats2streamline.py
--- a/util/streamline/m5stats2streamline.py	Fri Jan 27 11:31:44 2017 -0600
+++ b/util/streamline/m5stats2streamline.py	Fri Jan 27 11:31:45 2017 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 # Copyright (c) 2012, 2014 ARM Limited
 # All rights reserved
diff -r 17a5e8190ee0 -r 271c55c49c26 util/style.py
--- a/util/style.py	Fri Jan 27 11:31:44 2017 -0600
+++ b/util/style.py	Fri Jan 27 11:31:45 2017 -0600
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python2
 #
 # Copyright (c) 2016 ARM Limited
 # All rights reserved
diff -r 17a5e8190ee0 -r 271c55c49c26 util/style/__init__.py
--- a/util/style/__init__.py	Fri Jan 27 11:31:44 2017 -0600
+++ b/util/style/__init__.py	Fri Jan 27 11:31:45 2017 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 #
 # Copyright (c) 2016 ARM Limited
 # All rights reserved
diff -r 17a5e8190ee0 -r 271c55c49c26 util/style/repo.py
--- a/util/style/repo.py	Fri Jan 27 11:31:44 2017 -0600
+++ b/util/style/repo.py	Fri Jan 27 11:31:45 2017 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 #
 # Copyright (c) 2016 ARM Limited
 # All rights reserved
diff -r 17a5e8190ee0 -r 271c55c49c26 util/style/sort_includes.py
--- a/util/style/sort_includes.py	Fri Jan 27 11:31:44 2017 -0600
+++ b/util/style/sort_includes.py	Fri Jan 27 11:31:45 2017 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 #
 # Copyright (c) 2014-2015 ARM Limited
 # All rights reserved
diff -r 17a5e8190ee0 -r 271c55c49c26 util/style/style.py
--- a/util/style/style.py	Fri Jan 27 11:31:44 2017 -0600
+++ b/util/style/style.py	Fri Jan 27 11:31:45 2017 -0600
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python2
 # Copyright (c) 2014, 2016 ARM Limited
 # All rights reserved
 #
diff -r 17a5e8190ee0 -r 271c55c49c26 util/style/verifiers.py
--- a/util/style/verifiers.py	Fri Jan 27 11:31:44 2017 -0600
+++ b/util/style/verifiers.py	Fri Jan 27 11:31:45 2017 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 #
 # Copyright (c) 2014, 2016 ARM Limited
 # All rights reserved
diff -r 17a5e8190ee0 -r 271c55c49c26 util/maint/git-patch-to-hg-patch
--- a/util/maint/git-patch-to-hg-patch	Fri Jan 27 11:31:44 2017 -0600
+++ b/util/maint/git-patch-to-hg-patch	Fri Jan 27 11:31:45 2017 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 #
 # This file originated from the moz-git-tools repo on GitHub
 # (https://github.com/mozilla/moz-git-tools), which contains the
diff -r 17a5e8190ee0 -r 271c55c49c26 util/memtest-soak.py
--- a/util/memtest-soak.py	Fri Jan 27 11:31:44 2017 -0600
+++ b/util/memtest-soak.py	Fri Jan 27 11:31:45 2017 -0600
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python2
 
 # Copyright (c) 2015 ARM Limited
 # All rights reserved
diff -r 17a5e8190ee0 -r 271c55c49c26 ext/mcpat/regression/regression.py
--- a/ext/mcpat/regression/regression.py	Fri Jan 27 11:31:44 2017 -0600
+++ b/ext/mcpat/regression/regression.py	Fri Jan 27 11:31:45 2017 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 # Copyright (c) 2010-2013 Advanced Micro Devices, Inc.
 # All rights reserved.
diff -r 17a5e8190ee0 -r 271c55c49c26 ext/mcpat/regression/verify_output.py
--- a/ext/mcpat/regression/verify_output.py	Fri Jan 27 11:31:44 2017 -0600
+++ b/ext/mcpat/regression/verify_output.py	Fri Jan 27 11:31:45 2017 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 # Copyright (c) 2010-2013 Advanced Micro Devices, Inc.
 # All rights reserved.
diff -r 17a5e8190ee0 -r 271c55c49c26 ext/ply/example/classcalc/calc.py
--- a/ext/ply/example/classcalc/calc.py	Fri Jan 27 11:31:44 2017 -0600
+++ b/ext/ply/example/classcalc/calc.py	Fri Jan 27 11:31:45 2017 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 # -----------------------------------------------------------------------------
 # calc.py
diff -r 17a5e8190ee0 -r 271c55c49c26 ext/ply/example/newclasscalc/calc.py
--- a/ext/ply/example/newclasscalc/calc.py	Fri Jan 27 11:31:44 2017 -0600
+++ b/ext/ply/example/newclasscalc/calc.py	Fri Jan 27 11:31:45 2017 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 # -----------------------------------------------------------------------------
 # calc.py
diff -r 17a5e8190ee0 -r 271c55c49c26 src/unittest/genini.py
--- a/src/unittest/genini.py	Fri Jan 27 11:31:44 2017 -0600
+++ b/src/unittest/genini.py	Fri Jan 27 11:31:45 2017 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 # Copyright (c) 2005 The Regents of The University of Michigan
 # All rights reserved.
 #
diff -r 17a5e8190ee0 -r 271c55c49c26 tests/testing/__init__.py
--- a/tests/testing/__init__.py	Fri Jan 27 11:31:44 2017 -0600
+++ b/tests/testing/__init__.py	Fri Jan 27 11:31:45 2017 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 #
 # Copyright (c) 2016 ARM Limited
 # All rights reserved
diff -r 17a5e8190ee0 -r 271c55c49c26 tests/testing/helpers.py
--- a/tests/testing/helpers.py	Fri Jan 27 11:31:44 2017 -0600
+++ b/tests/testing/helpers.py	Fri Jan 27 11:31:45 2017 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 #
 # Copyright (c) 2016 ARM Limited
 # All rights reserved
diff -r 17a5e8190ee0 -r 271c55c49c26 tests/testing/results.py
--- a/tests/testing/results.py	Fri Jan 27 11:31:44 2017 -0600
+++ b/tests/testing/results.py	Fri Jan 27 11:31:45 2017 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 #
 # Copyright (c) 2016 ARM Limited
 # All rights reserved
diff -r 17a5e8190ee0 -r 271c55c49c26 tests/testing/tests.py
--- a/tests/testing/tests.py	Fri Jan 27 11:31:44 2017 -0600
+++ b/tests/testing/tests.py	Fri Jan 27 11:31:45 2017 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 #
 # Copyright (c) 2016 ARM Limited
 # All rights reserved
diff -r 17a5e8190ee0 -r 271c55c49c26 tests/testing/units.py
--- a/tests/testing/units.py	Fri Jan 27 11:31:44 2017 -0600
+++ b/tests/testing/units.py	Fri Jan 27 11:31:45 2017 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 #
 # Copyright (c) 2016 ARM Limited
 # All rights reserved
diff -r 17a5e8190ee0 -r 271c55c49c26 tests/tests.py
--- a/tests/tests.py	Fri Jan 27 11:31:44 2017 -0600
+++ b/tests/tests.py	Fri Jan 27 11:31:45 2017 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 #
 # Copyright (c) 2016 ARM Limited
 # All rights reserved
diff -r 17a5e8190ee0 -r 271c55c49c26 util/batch/job.py
--- a/util/batch/job.py	Fri Jan 27 11:31:44 2017 -0600
+++ b/util/batch/job.py	Fri Jan 27 11:31:45 2017 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 # Copyright (c) 2006 The Regents of The University of Michigan
 # All rights reserved.
 #
diff -r 17a5e8190ee0 -r 271c55c49c26 util/batch/send.py
--- a/util/batch/send.py	Fri Jan 27 11:31:44 2017 -0600
+++ b/util/batch/send.py	Fri Jan 27 11:31:45 2017 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 # Copyright (c) 2006 The Regents of The University of Michigan
 # All rights reserved.
 #
diff -r 17a5e8190ee0 -r 271c55c49c26 util/checkpoint-tester.py
--- a/util/checkpoint-tester.py	Fri Jan 27 11:31:44 2017 -0600
+++ b/util/checkpoint-tester.py	Fri Jan 27 11:31:45 2017 -0600
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python2
 
 # Copyright (c) 2010 Advanced Micro Devices, Inc.
 # All rights reserved.
diff -r 17a5e8190ee0 -r 271c55c49c26 util/compile
--- a/util/compile	Fri Jan 27 11:31:44 2017 -0600
+++ b/util/compile	Fri Jan 27 11:31:45 2017 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 # Copyright (c) 2006 The Regents of The University of Michigan
 # All rights reserved.
 #
diff -r 17a5e8190ee0 -r 271c55c49c26 util/cpt_upgrader.py
--- a/util/cpt_upgrader.py	Fri Jan 27 11:31:44 2017 -0600
+++ b/util/cpt_upgrader.py	Fri Jan 27 11:31:45 2017 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 # Copyright (c) 2012-2013,2015 ARM Limited
 # All rights reserved
diff -r 17a5e8190ee0 -r 271c55c49c26 util/decode_inst_dep_trace.py
--- a/util/decode_inst_dep_trace.py	Fri Jan 27 11:31:44 2017 -0600
+++ b/util/decode_inst_dep_trace.py	Fri Jan 27 11:31:45 2017 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 # Copyright (c) 2013 - 2015 ARM Limited
 # All rights reserved
diff -r 17a5e8190ee0 -r 271c55c49c26 util/decode_inst_trace.py
--- a/util/decode_inst_trace.py	Fri Jan 27 11:31:44 2017 -0600
+++ b/util/decode_inst_trace.py	Fri Jan 27 11:31:45 2017 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 # Copyright (c) 2013-2014 ARM Limited
 # All rights reserved
diff -r 17a5e8190ee0 -r 271c55c49c26 util/decode_packet_trace.py
--- a/util/decode_packet_trace.py	Fri Jan 27 11:31:44 2017 -0600
+++ b/util/decode_packet_trace.py	Fri Jan 27 11:31:45 2017 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 # Copyright (c) 2013-2014 ARM Limited
 # All rights reserved
diff -r 17a5e8190ee0 -r 271c55c49c26 util/dram_lat_mem_rd_plot.py
--- a/util/dram_lat_mem_rd_plot.py	Fri Jan 27 11:31:44 2017 -0600
+++ b/util/dram_lat_mem_rd_plot.py	Fri Jan 27 11:31:45 2017 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 # Copyright (c) 2015 ARM Limited
 # All rights reserved
diff -r 17a5e8190ee0 -r 271c55c49c26 util/dram_sweep_plot.py
--- a/util/dram_sweep_plot.py	Fri Jan 27 11:31:44 2017 -0600
+++ b/util/dram_sweep_plot.py	Fri Jan 27 11:31:45 2017 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 # Copyright (c) 2014 ARM Limited
 # All rights reserved
diff -r 17a5e8190ee0 -r 271c55c49c26 util/encode_inst_dep_trace.py
--- a/util/encode_inst_dep_trace.py	Fri Jan 27 11:31:44 2017 -0600
+++ b/util/encode_inst_dep_trace.py	Fri Jan 27 11:31:45 2017 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 # Copyright (c) 2015 ARM Limited
 # All rights reserved
diff -r 17a5e8190ee0 -r 271c55c49c26 util/encode_packet_trace.py
--- a/util/encode_packet_trace.py	Fri Jan 27 11:31:44 2017 -0600
+++ b/util/encode_packet_trace.py	Fri Jan 27 11:31:45 2017 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 # Copyright (c) 2013-2014 ARM Limited
 # All rights reserved
diff -r 17a5e8190ee0 -r 271c55c49c26 util/find_copyrights.py
--- a/util/find_copyrights.py	Fri Jan 27 11:31:44 2017 -0600
+++ b/util/find_copyrights.py	Fri Jan 27 11:31:45 2017 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 import os
 import re
diff -r 17a5e8190ee0 -r 271c55c49c26 util/git-pre-commit.py
--- a/util/git-pre-commit.py	Fri Jan 27 11:31:44 2017 -0600
+++ b/util/git-pre-commit.py	Fri Jan 27 11:31:45 2017 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 #
 # Copyright (c) 2016 ARM Limited
 # All rights reserved
diff -r 17a5e8190ee0 -r 271c55c49c26 util/hgstyle.py
--- a/util/hgstyle.py	Fri Jan 27 11:31:44 2017 -0600
+++ b/util/hgstyle.py	Fri Jan 27 11:31:45 2017 -0600
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python2
 # Copyright (c) 2014 ARM Limited
 # All rights reserved
 #