From 12c5ac0b379b3c0e3eeb43eacfeacf317a44ec65 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Mon, 24 Oct 2011 16:08:25 +0200 Subject: [PATCH] remove svn keywords one last time and for good (hopefully) --- sfa/init.d/sfa-cm | 3 --- sfa/managers/vini/topology.py | 4 ---- sfa/methods/CreateGid.py | 2 -- sfa/methods/GetTicket.py | 2 -- sfa/methods/RedeemTicket.py | 2 -- sfa/methods/Register.py | 2 -- sfa/methods/RegisterPeerObject.py | 3 --- sfa/methods/Resolve.py | 2 -- sfa/methods/Start.py | 3 --- sfa/methods/Stop.py | 3 --- sfa/methods/register_peer_object.py | 3 --- sfa/methods/reset_slice.py | 3 --- sfa/server/component.py | 4 ---- sfa/server/registry.py | 4 ---- sfa/server/slicemgr.py | 3 --- sfa/trust/credential_legacy.py | 3 --- sfa/util/componentserver.py | 3 --- sfa/util/config.py | 3 --- sfa/util/policy.py | 3 --- sfa/util/record.py | 3 --- sfa/util/specdict.py | 3 --- 21 files changed, 61 deletions(-) diff --git a/sfa/init.d/sfa-cm b/sfa/init.d/sfa-cm index e3bbd966..eea507cf 100755 --- a/sfa/init.d/sfa-cm +++ b/sfa/init.d/sfa-cm @@ -6,9 +6,6 @@ # # description: Wraps PLCAPI into the SFA compliant API # -# $Id: sfa 14304 2009-07-06 20:19:51Z thierry $ -# $URL: https://svn.planet-lab.org/svn/sfa/trunk/sfa/init.d/sfa $ -# # Source config . /etc/sfa/sfa_config diff --git a/sfa/managers/vini/topology.py b/sfa/managers/vini/topology.py index b905c2f1..7ec3e95c 100644 --- a/sfa/managers/vini/topology.py +++ b/sfa/managers/vini/topology.py @@ -1,8 +1,4 @@ #!/usr/bin/python - -# $Id: topology.py 14181 2009-07-01 19:46:07Z acb $ -# $URL: https://svn.planet-lab.org/svn/NodeManager-topo/trunk/topology.py $ - # # Links in the physical topology, gleaned from looking at the Internet2 # topology map. Link (a, b) connects sites with IDs a and b. diff --git a/sfa/methods/CreateGid.py b/sfa/methods/CreateGid.py index 7c1bf8ac..b25fbd16 100644 --- a/sfa/methods/CreateGid.py +++ b/sfa/methods/CreateGid.py @@ -1,5 +1,3 @@ -### $Id: register.py 16477 2010-01-05 16:31:37Z thierry $ -### $URL: https://svn.planet-lab.org/svn/sfa/trunk/sfa/methods/register.py $ from sfa.util.xrn import urn_to_hrn from sfa.util.method import Method diff --git a/sfa/methods/GetTicket.py b/sfa/methods/GetTicket.py index e175cfe9..3a250d57 100644 --- a/sfa/methods/GetTicket.py +++ b/sfa/methods/GetTicket.py @@ -1,5 +1,3 @@ -### $Id: get_ticket.py 17732 2010-04-19 21:10:45Z tmack $ -### $URL: https://svn.planet-lab.org/svn/sfa/trunk/sfa/methods/get_ticket.py $ import time from sfa.util.faults import * from sfa.util.xrn import urn_to_hrn diff --git a/sfa/methods/RedeemTicket.py b/sfa/methods/RedeemTicket.py index f66e90cf..3aff1e75 100644 --- a/sfa/methods/RedeemTicket.py +++ b/sfa/methods/RedeemTicket.py @@ -1,5 +1,3 @@ -### $Id: reset_slice.py 15428 2009-10-23 15:28:03Z tmack $ -### $URL: https://svn.planet-lab.org/svn/sfa/trunk/sfacomponent/methods/reset_slice.py $ import xmlrpclib from sfa.util.faults import * from sfa.util.method import Method diff --git a/sfa/methods/Register.py b/sfa/methods/Register.py index 6f61870a..f4b78018 100644 --- a/sfa/methods/Register.py +++ b/sfa/methods/Register.py @@ -1,5 +1,3 @@ -### $Id: register.py 16477 2010-01-05 16:31:37Z thierry $ -### $URL: https://svn.planet-lab.org/svn/sfa/trunk/sfa/methods/register.py $ from sfa.trust.certificate import Keypair, convert_public_key from sfa.trust.gid import * diff --git a/sfa/methods/RegisterPeerObject.py b/sfa/methods/RegisterPeerObject.py index 864b1d53..11fd1bdf 100644 --- a/sfa/methods/RegisterPeerObject.py +++ b/sfa/methods/RegisterPeerObject.py @@ -1,6 +1,3 @@ -### $Id: register.py 15001 2009-09-11 20:18:54Z tmack $ -### $URL: https://svn.planet-lab.org/svn/sfa/trunk/sfa/methods/register.py $ - from sfa.trust.certificate import Keypair, convert_public_key from sfa.trust.gid import * diff --git a/sfa/methods/Resolve.py b/sfa/methods/Resolve.py index 49104b28..36b2bde0 100644 --- a/sfa/methods/Resolve.py +++ b/sfa/methods/Resolve.py @@ -1,5 +1,3 @@ -### $Id: resolve.py 17157 2010-02-21 04:19:34Z tmack $ -### $URL: https://svn.planet-lab.org/svn/sfa/trunk/sfa/methods/resolve.py $ import traceback import types from sfa.util.faults import * diff --git a/sfa/methods/Start.py b/sfa/methods/Start.py index e1ca60e9..e119f3cf 100644 --- a/sfa/methods/Start.py +++ b/sfa/methods/Start.py @@ -1,6 +1,3 @@ -### $Id: stop_slice.py 17732 2010-04-19 21:10:45Z tmack $ -### $URL: https://svn.planet-lab.org/svn/sfa/trunk/sfa/methods/stop_slice.py $ - from sfa.util.faults import * from sfa.util.xrn import urn_to_hrn from sfa.util.method import Method diff --git a/sfa/methods/Stop.py b/sfa/methods/Stop.py index 579a77d6..cdae0fcf 100644 --- a/sfa/methods/Stop.py +++ b/sfa/methods/Stop.py @@ -1,6 +1,3 @@ -### $Id: stop_slice.py 17732 2010-04-19 21:10:45Z tmack $ -### $URL: https://svn.planet-lab.org/svn/sfa/trunk/sfa/methods/stop_slice.py $ - from sfa.util.faults import * from sfa.util.xrn import urn_to_hrn from sfa.util.method import Method diff --git a/sfa/methods/register_peer_object.py b/sfa/methods/register_peer_object.py index e89f18bd..484fae50 100644 --- a/sfa/methods/register_peer_object.py +++ b/sfa/methods/register_peer_object.py @@ -1,6 +1,3 @@ -### $Id: register.py 15001 2009-09-11 20:18:54Z tmack $ -### $URL: https://svn.planet-lab.org/svn/sfa/trunk/sfa/methods/register.py $ - from sfa.trust.certificate import Keypair, convert_public_key from sfa.trust.gid import * diff --git a/sfa/methods/reset_slice.py b/sfa/methods/reset_slice.py index 9d02364c..a4e9c5e2 100644 --- a/sfa/methods/reset_slice.py +++ b/sfa/methods/reset_slice.py @@ -1,6 +1,3 @@ -### $Id: reset_slices.py 15428 2009-10-23 15:28:03Z tmack $ -### $URL: https://svn.planet-lab.org/svn/sfa/trunk/sfa/methods/reset_slices.py $ - from sfa.util.faults import * from sfa.util.xrn import urn_to_hrn from sfa.util.method import Method diff --git a/sfa/server/component.py b/sfa/server/component.py index c83ac4af..1dc66523 100644 --- a/sfa/server/component.py +++ b/sfa/server/component.py @@ -1,10 +1,6 @@ # # Component is a SfaServer that implements the Component interface # -### $Id: -### $URL: -# - import tempfile import os import time diff --git a/sfa/server/registry.py b/sfa/server/registry.py index 0536c5c1..b2548113 100644 --- a/sfa/server/registry.py +++ b/sfa/server/registry.py @@ -1,10 +1,6 @@ # # Registry is a SfaServer that implements the Registry interface # -### $Id$ -### $URL$ -# - from sfa.util.server import SfaServer from sfa.util.faults import * from sfa.util.xrn import hrn_to_urn diff --git a/sfa/server/slicemgr.py b/sfa/server/slicemgr.py index 8842eaef..c0fbd6a1 100644 --- a/sfa/server/slicemgr.py +++ b/sfa/server/slicemgr.py @@ -1,6 +1,3 @@ -### $Id$ -### $URL$ - import os import sys import datetime diff --git a/sfa/trust/credential_legacy.py b/sfa/trust/credential_legacy.py index 8ba90b29..dda7096f 100644 --- a/sfa/trust/credential_legacy.py +++ b/sfa/trust/credential_legacy.py @@ -5,9 +5,6 @@ # certificate that stores a tuple of parameters. ## -### $Id: credential.py 17477 2010-03-25 16:49:34Z jkarlin $ -### $URL: svn+ssh://svn.planet-lab.org/svn/sfa/branches/geni-api/sfa/trust/credential.py $ - import xmlrpclib from sfa.util.faults import * diff --git a/sfa/util/componentserver.py b/sfa/util/componentserver.py index 9fa40f97..98373ec3 100644 --- a/sfa/util/componentserver.py +++ b/sfa/util/componentserver.py @@ -6,9 +6,6 @@ # TODO: investigate ways to combine this with existing PLC server? ## -### $Id$ -### $URL$ - import sys import traceback import threading diff --git a/sfa/util/config.py b/sfa/util/config.py index 42d2c87c..cf2cca9b 100644 --- a/sfa/util/config.py +++ b/sfa/util/config.py @@ -14,9 +14,6 @@ # Note that SFA does not access any of the PLC databases directly via # a mysql connection; All PLC databases are accessed via PLCAPI. -### $Id$ -### $URL$ - import os.path import traceback diff --git a/sfa/util/policy.py b/sfa/util/policy.py index aa68f430..196c71ee 100644 --- a/sfa/util/policy.py +++ b/sfa/util/policy.py @@ -1,6 +1,3 @@ -### $Id$ -### $URL$ - import os from sfa.util.storage import * diff --git a/sfa/util/record.py b/sfa/util/record.py index f5252d62..7cfc752e 100644 --- a/sfa/util/record.py +++ b/sfa/util/record.py @@ -4,9 +4,6 @@ # TODO: Use existing PLC database methods? or keep this separate? ## -### $Id$ -### $URL$ - from types import StringTypes from sfa.trust.gid import * diff --git a/sfa/util/specdict.py b/sfa/util/specdict.py index 7a6ff97a..2138e876 100644 --- a/sfa/util/specdict.py +++ b/sfa/util/specdict.py @@ -10,9 +10,6 @@ # SpecDict.plc_fields defines a one to one mapping of plc attribute to rspec # attribute -### $Id$ -### $URL$ - from types import StringTypes, ListType class SpecDict(dict): -- 2.43.0