From 31cc4fa991896f000abb106916662923f37bc3a6 Mon Sep 17 00:00:00 2001 From: parmentelat Date: Tue, 11 Dec 2018 09:49:16 +0100 Subject: [PATCH] shebangs need to point at python2 --- clientbin/getNodes.py | 2 +- clientbin/getRecord.py | 2 +- clientbin/setRecord.py | 2 +- config/sfa-config | 2 +- sfa/client/sfaadmin.py | 2 +- sfa/client/sfaresetgids.py | 2 +- sfa/dummy/dummyaggregate.py | 2 +- sfa/importer/__init__.py | 2 +- sfa/planetlab/nodemanager.py | 2 +- sfa/planetlab/plaggregate.py | 2 +- sfa/rspecs/pg_rspec_converter.py | 2 +- sfa/rspecs/rspec.py | 2 +- sfa/rspecs/rspec_converter.py | 2 +- sfa/rspecs/sfa_rspec_converter.py | 2 +- sfa/rspecs/version.py | 2 +- sfa/server/sfa-start.py | 2 +- sfa/util/callids.py | 2 +- sfa/util/config.py | 2 +- sfa/util/sfalogging.py | 2 +- sfa/util/xml.py | 2 +- sfatables/pretty.py | 2 +- sfatables/runtime.py | 2 +- sfatables/sfatables | 2 +- tests/testAll.py | 2 +- tests/testInterfaces.py | 2 +- tests/testKeypair.py | 2 +- tests/testXrn.py | 2 +- tools/depgraph2dot.py | 2 +- tools/py2depgraph.py | 2 +- wsdl/sfa2wsdl.py | 2 +- 30 files changed, 30 insertions(+), 30 deletions(-) diff --git a/clientbin/getNodes.py b/clientbin/getNodes.py index 89689a5b..5cbf5a37 100644 --- a/clientbin/getNodes.py +++ b/clientbin/getNodes.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 import sys import os diff --git a/clientbin/getRecord.py b/clientbin/getRecord.py index 28608f3f..97d17942 100755 --- a/clientbin/getRecord.py +++ b/clientbin/getRecord.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 """ Filters/Prints record objects diff --git a/clientbin/setRecord.py b/clientbin/setRecord.py index 886b8014..742cf95d 100755 --- a/clientbin/setRecord.py +++ b/clientbin/setRecord.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 """ Updates record objects diff --git a/config/sfa-config b/config/sfa-config index 93ebc051..ab59fe80 100755 --- a/config/sfa-config +++ b/config/sfa-config @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 # # Script for basic access to the SFA configuration file store. # diff --git a/sfa/client/sfaadmin.py b/sfa/client/sfaadmin.py index 95e139f7..edfa9c09 100755 --- a/sfa/client/sfaadmin.py +++ b/sfa/client/sfaadmin.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 # pylint: disable=c0111, c0103, w0402, w0622 diff --git a/sfa/client/sfaresetgids.py b/sfa/client/sfaresetgids.py index d4d46f6a..dbf548ba 100644 --- a/sfa/client/sfaresetgids.py +++ b/sfa/client/sfaresetgids.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 from __future__ import print_function diff --git a/sfa/dummy/dummyaggregate.py b/sfa/dummy/dummyaggregate.py index dc8384fc..2e6fc5b0 100644 --- a/sfa/dummy/dummyaggregate.py +++ b/sfa/dummy/dummyaggregate.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 from sfa.util.xrn import Xrn, hrn_to_urn, urn_to_hrn from sfa.util.sfatime import utcparse, datetime_to_string from sfa.util.sfalogging import logger diff --git a/sfa/importer/__init__.py b/sfa/importer/__init__.py index babfc04f..90e15e40 100644 --- a/sfa/importer/__init__.py +++ b/sfa/importer/__init__.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 # pylint: disable=c0111, w1201, w0622 diff --git a/sfa/planetlab/nodemanager.py b/sfa/planetlab/nodemanager.py index eb00fdcf..db8bc0ff 100644 --- a/sfa/planetlab/nodemanager.py +++ b/sfa/planetlab/nodemanager.py @@ -18,7 +18,7 @@ class NodeManager: method = self.method sfa_slice_prefix = self.config.SFA_CM_SLICE_PREFIX sfa_slice = sfa_slice_prefix + "_sfacm" - python = "/usr/bin/python" + python = "/usr/bin/python2" vserver_path = "/vservers/%s" % (sfa_slice) script_path = "/tmp/" path = "%(vserver_path)s/%(script_path)s" % locals() diff --git a/sfa/planetlab/plaggregate.py b/sfa/planetlab/plaggregate.py index 01558602..a5a3a0ee 100644 --- a/sfa/planetlab/plaggregate.py +++ b/sfa/planetlab/plaggregate.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 from collections import defaultdict from sfa.util.xrn import Xrn, hrn_to_urn, urn_to_hrn, get_authority, get_leaf from sfa.util.sfatime import utcparse, datetime_to_string diff --git a/sfa/rspecs/pg_rspec_converter.py b/sfa/rspecs/pg_rspec_converter.py index 7de30efd..0fff41eb 100755 --- a/sfa/rspecs/pg_rspec_converter.py +++ b/sfa/rspecs/pg_rspec_converter.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 from __future__ import print_function from lxml import etree diff --git a/sfa/rspecs/rspec.py b/sfa/rspecs/rspec.py index 5a3bc58b..fdd9c957 100755 --- a/sfa/rspecs/rspec.py +++ b/sfa/rspecs/rspec.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 from __future__ import print_function diff --git a/sfa/rspecs/rspec_converter.py b/sfa/rspecs/rspec_converter.py index a24b2def..49555c83 100755 --- a/sfa/rspecs/rspec_converter.py +++ b/sfa/rspecs/rspec_converter.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 from __future__ import print_function diff --git a/sfa/rspecs/sfa_rspec_converter.py b/sfa/rspecs/sfa_rspec_converter.py index 62760048..297d371b 100755 --- a/sfa/rspecs/sfa_rspec_converter.py +++ b/sfa/rspecs/sfa_rspec_converter.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 from __future__ import print_function diff --git a/sfa/rspecs/version.py b/sfa/rspecs/version.py index 7faf2abe..d2ef55ea 100644 --- a/sfa/rspecs/version.py +++ b/sfa/rspecs/version.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 from sfa.util.sfalogging import logger diff --git a/sfa/server/sfa-start.py b/sfa/server/sfa-start.py index 1acaca2a..cb14adb3 100755 --- a/sfa/server/sfa-start.py +++ b/sfa/server/sfa-start.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 # # PlanetLab SFA implementation # diff --git a/sfa/util/callids.py b/sfa/util/callids.py index 35c67d4d..3206886b 100644 --- a/sfa/util/callids.py +++ b/sfa/util/callids.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 import threading import time diff --git a/sfa/util/config.py b/sfa/util/config.py index 89b63fa4..013768cc 100644 --- a/sfa/util/config.py +++ b/sfa/util/config.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 import sys import os import time diff --git a/sfa/util/sfalogging.py b/sfa/util/sfalogging.py index 80d8b3f7..07893534 100644 --- a/sfa/util/sfalogging.py +++ b/sfa/util/sfalogging.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 """ A reroutable logger that can handle deep tracebacks diff --git a/sfa/util/xml.py b/sfa/util/xml.py index 82cee736..93d977f0 100755 --- a/sfa/util/xml.py +++ b/sfa/util/xml.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 from lxml import etree from sfa.util.faults import InvalidXML from sfa.rspecs.elements.element import Element diff --git a/sfatables/pretty.py b/sfatables/pretty.py index 9498aac1..87e74fbd 100644 --- a/sfatables/pretty.py +++ b/sfatables/pretty.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 class Pretty: rows = [] diff --git a/sfatables/runtime.py b/sfatables/runtime.py index b7c3444d..d7eb6d49 100644 --- a/sfatables/runtime.py +++ b/sfatables/runtime.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 import sys import os diff --git a/sfatables/sfatables b/sfatables/sfatables index a06680b6..6bf4408b 100755 --- a/sfatables/sfatables +++ b/sfatables/sfatables @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 # This file parses an sfatables command and generates XML files that parameterize # matches and targets. Each such XML file defines a rule. Rules are dropped in directories diff --git a/tests/testAll.py b/tests/testAll.py index 1b9a4667..7664c8a7 100755 --- a/tests/testAll.py +++ b/tests/testAll.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 from testXrn import * #from testNamespace import * # xxx broken-test diff --git a/tests/testInterfaces.py b/tests/testInterfaces.py index cf772089..1ab8048e 100755 --- a/tests/testInterfaces.py +++ b/tests/testInterfaces.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 import sys import os import random diff --git a/tests/testKeypair.py b/tests/testKeypair.py index 3d8d40ad..8d55e861 100755 --- a/tests/testKeypair.py +++ b/tests/testKeypair.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 import sys sys.path.append('..') diff --git a/tests/testXrn.py b/tests/testXrn.py index f6812055..68506b21 100755 --- a/tests/testXrn.py +++ b/tests/testXrn.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 import sys import unittest diff --git a/tools/depgraph2dot.py b/tools/depgraph2dot.py index 97730aa0..c9c035bd 100755 --- a/tools/depgraph2dot.py +++ b/tools/depgraph2dot.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 # Copyright 2004 Toby Dickenson # # Permission is hereby granted, free of charge, to any person obtaining diff --git a/tools/py2depgraph.py b/tools/py2depgraph.py index 5c03f7f2..bb3f40f2 100755 --- a/tools/py2depgraph.py +++ b/tools/py2depgraph.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 # Copyright 2004,2009 Toby Dickenson # # Permission is hereby granted, free of charge, to any person obtaining diff --git a/wsdl/sfa2wsdl.py b/wsdl/sfa2wsdl.py index 61500924..58fa7093 100755 --- a/wsdl/sfa2wsdl.py +++ b/wsdl/sfa2wsdl.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 # # Sapan Bhatia # -- 2.43.0