git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
5b37ec5
)
shebangs need to point at python2
author
parmentelat
<thierry.parmentelat@inria.fr>
Tue, 11 Dec 2018 08:49:16 +0000
(09:49 +0100)
committer
parmentelat
<thierry.parmentelat@inria.fr>
Tue, 11 Dec 2018 08:49:16 +0000
(09:49 +0100)
30 files changed:
clientbin/getNodes.py
patch
|
blob
|
history
clientbin/getRecord.py
patch
|
blob
|
history
clientbin/setRecord.py
patch
|
blob
|
history
config/sfa-config
patch
|
blob
|
history
sfa/client/sfaadmin.py
patch
|
blob
|
history
sfa/client/sfaresetgids.py
patch
|
blob
|
history
sfa/dummy/dummyaggregate.py
patch
|
blob
|
history
sfa/importer/__init__.py
patch
|
blob
|
history
sfa/planetlab/nodemanager.py
patch
|
blob
|
history
sfa/planetlab/plaggregate.py
patch
|
blob
|
history
sfa/rspecs/pg_rspec_converter.py
patch
|
blob
|
history
sfa/rspecs/rspec.py
patch
|
blob
|
history
sfa/rspecs/rspec_converter.py
patch
|
blob
|
history
sfa/rspecs/sfa_rspec_converter.py
patch
|
blob
|
history
sfa/rspecs/version.py
patch
|
blob
|
history
sfa/server/sfa-start.py
patch
|
blob
|
history
sfa/util/callids.py
patch
|
blob
|
history
sfa/util/config.py
patch
|
blob
|
history
sfa/util/sfalogging.py
patch
|
blob
|
history
sfa/util/xml.py
patch
|
blob
|
history
sfatables/pretty.py
patch
|
blob
|
history
sfatables/runtime.py
patch
|
blob
|
history
sfatables/sfatables
patch
|
blob
|
history
tests/testAll.py
patch
|
blob
|
history
tests/testInterfaces.py
patch
|
blob
|
history
tests/testKeypair.py
patch
|
blob
|
history
tests/testXrn.py
patch
|
blob
|
history
tools/depgraph2dot.py
patch
|
blob
|
history
tools/py2depgraph.py
patch
|
blob
|
history
wsdl/sfa2wsdl.py
patch
|
blob
|
history
diff --git
a/clientbin/getNodes.py
b/clientbin/getNodes.py
index
89689a5
..
5cbf5a3
100644
(file)
--- a/
clientbin/getNodes.py
+++ b/
clientbin/getNodes.py
@@
-1,4
+1,4
@@
-#!/usr/bin/
python
+#!/usr/bin/
env python2
import sys
import os
import sys
import os
diff --git
a/clientbin/getRecord.py
b/clientbin/getRecord.py
index
28608f3
..
97d1794
100755
(executable)
--- a/
clientbin/getRecord.py
+++ b/
clientbin/getRecord.py
@@
-1,4
+1,4
@@
-#!/usr/bin/
python
+#!/usr/bin/
env python2
"""
Filters/Prints record objects
"""
Filters/Prints record objects
diff --git
a/clientbin/setRecord.py
b/clientbin/setRecord.py
index
886b801
..
742cf95
100755
(executable)
--- a/
clientbin/setRecord.py
+++ b/
clientbin/setRecord.py
@@
-1,4
+1,4
@@
-#!/usr/bin/
python
+#!/usr/bin/
env python2
"""
Updates record objects
"""
Updates record objects
diff --git
a/config/sfa-config
b/config/sfa-config
index
93ebc05
..
ab59fe8
100755
(executable)
--- 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.
#
#
# Script for basic access to the SFA configuration file store.
#
diff --git
a/sfa/client/sfaadmin.py
b/sfa/client/sfaadmin.py
index
95e139f
..
edfa9c0
100755
(executable)
--- 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
# pylint: disable=c0111, c0103, w0402, w0622
diff --git
a/sfa/client/sfaresetgids.py
b/sfa/client/sfaresetgids.py
index
d4d46f6
..
dbf548b
100644
(file)
--- 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
from __future__ import print_function
diff --git
a/sfa/dummy/dummyaggregate.py
b/sfa/dummy/dummyaggregate.py
index
dc8384f
..
2e6fc5b
100644
(file)
--- 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
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
babfc04
..
90e15e4
100644
(file)
--- 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
# pylint: disable=c0111, w1201, w0622
diff --git
a/sfa/planetlab/nodemanager.py
b/sfa/planetlab/nodemanager.py
index
eb00fdc
..
db8bc0f
100644
(file)
--- 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"
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/python
2
"
vserver_path = "/vservers/%s" % (sfa_slice)
script_path = "/tmp/"
path = "%(vserver_path)s/%(script_path)s" % locals()
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
0155860
..
a5a3a0e
100644
(file)
--- 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
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
7de30ef
..
0fff41e
100755
(executable)
--- 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
from __future__ import print_function
from lxml import etree
diff --git
a/sfa/rspecs/rspec.py
b/sfa/rspecs/rspec.py
index
5a3bc58
..
fdd9c95
100755
(executable)
--- 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
from __future__ import print_function
diff --git
a/sfa/rspecs/rspec_converter.py
b/sfa/rspecs/rspec_converter.py
index
a24b2de
..
49555c8
100755
(executable)
--- 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
from __future__ import print_function
diff --git
a/sfa/rspecs/sfa_rspec_converter.py
b/sfa/rspecs/sfa_rspec_converter.py
index
6276004
..
297d371
100755
(executable)
--- 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
from __future__ import print_function
diff --git
a/sfa/rspecs/version.py
b/sfa/rspecs/version.py
index
7faf2ab
..
d2ef55e
100644
(file)
--- 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
from sfa.util.sfalogging import logger
diff --git
a/sfa/server/sfa-start.py
b/sfa/server/sfa-start.py
index
1acaca2
..
cb14adb
100755
(executable)
--- 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
#
#
# PlanetLab SFA implementation
#
diff --git
a/sfa/util/callids.py
b/sfa/util/callids.py
index
35c67d4
..
3206886
100644
(file)
--- 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
import threading
import time
diff --git
a/sfa/util/config.py
b/sfa/util/config.py
index
89b63fa
..
013768c
100644
(file)
--- 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
import sys
import os
import time
diff --git
a/sfa/util/sfalogging.py
b/sfa/util/sfalogging.py
index
80d8b3f
..
0789353
100644
(file)
--- 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
"""
A reroutable logger that can handle deep tracebacks
diff --git
a/sfa/util/xml.py
b/sfa/util/xml.py
index
82cee73
..
93d977f
100755
(executable)
--- 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
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
9498aac
..
87e74fb
100644
(file)
--- a/
sfatables/pretty.py
+++ b/
sfatables/pretty.py
@@
-1,4
+1,4
@@
-#!/usr/bin/
python
+#!/usr/bin/
env python2
class Pretty:
rows = []
class Pretty:
rows = []
diff --git
a/sfatables/runtime.py
b/sfatables/runtime.py
index
b7c3444
..
d7eb6d4
100644
(file)
--- a/
sfatables/runtime.py
+++ b/
sfatables/runtime.py
@@
-1,4
+1,4
@@
-#!/usr/bin/
python
+#!/usr/bin/
env python2
import sys
import os
import sys
import os
diff --git
a/sfatables/sfatables
b/sfatables/sfatables
index
a06680b
..
6bf4408
100755
(executable)
--- 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
# 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
1b9a466
..
7664c8a
100755
(executable)
--- 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
from testXrn import *
#from testNamespace import *
# xxx broken-test
diff --git
a/tests/testInterfaces.py
b/tests/testInterfaces.py
index
cf77208
..
1ab8048
100755
(executable)
--- 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
import sys
import os
import random
diff --git
a/tests/testKeypair.py
b/tests/testKeypair.py
index
3d8d40a
..
8d55e86
100755
(executable)
--- a/
tests/testKeypair.py
+++ b/
tests/testKeypair.py
@@
-1,4
+1,4
@@
-#!/usr/bin/
python
+#!/usr/bin/
env python2
import sys
sys.path.append('..')
import sys
sys.path.append('..')
diff --git
a/tests/testXrn.py
b/tests/testXrn.py
index
f681205
..
68506b2
100755
(executable)
--- a/
tests/testXrn.py
+++ b/
tests/testXrn.py
@@
-1,4
+1,4
@@
-#!/usr/bin/
python
+#!/usr/bin/
env python2
import sys
import unittest
import sys
import unittest
diff --git
a/tools/depgraph2dot.py
b/tools/depgraph2dot.py
index
97730aa
..
c9c035b
100755
(executable)
--- 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
# 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
5c03f7f
..
bb3f40f
100755
(executable)
--- 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
# 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
6150092
..
58fa709
100755
(executable)
--- a/
wsdl/sfa2wsdl.py
+++ b/
wsdl/sfa2wsdl.py
@@
-1,4
+1,4
@@
-#!/usr/bin/
python
+#!/usr/bin/
env python2
#
# Sapan Bhatia <sapanb@cs.princeton.edu>
#
#
# Sapan Bhatia <sapanb@cs.princeton.edu>
#