Merge branch 'upstreammaster'

[sfa.git] / sfa / methods / RegisterPeerObject.py

diff --git a/sfa/methods/RegisterPeerObject.py b/sfa/methods/RegisterPeerObject.py
index e4cea96..2eec2f5 100644 (file)
--- a/sfa/methods/RegisterPeerObject.py
+++ b/sfa/methods/RegisterPeerObject.py
@@ -1,17 +1,9 @@
-### $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 *
-
-from sfa.util.faults import *
-from sfa.util.namespace import get_authority
+from sfa.util.faults import SfaInvalidArgument
+from sfa.util.xrn import get_authority
 from sfa.util.method import Method
 from sfa.util.parameter import Parameter, Mixed
 from sfa.util.record import SfaRecord
 from sfa.util.table import SfaTable
-from sfa.trust.auth import Auth
-from sfa.trust.gid import create_uuid
 from sfa.trust.credential import Credential
 
 class RegisterPeerObject(Method):