From: Thierry Parmentelat Date: Fri, 3 Jul 2009 13:17:39 +0000 (+0000) Subject: fewer import * for certificate X-Git-Tag: sfa-0.9-0@14641~181 X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=f39e2750d151c303aee06fe91391b1b275fc375f fewer import * for certificate --- diff --git a/component/component.py b/component/component.py index 97b45324..bb80d025 100644 --- a/component/component.py +++ b/component/component.py @@ -10,7 +10,7 @@ import os import sys from xmlrpclib import ServerProxy -from geni.trust.certificate import * +from geni.trust.certificate import Certificate, Keypair from geni.trust.gid import * from geni.trust.trustedroot import * diff --git a/geni/client/genidump.py b/geni/client/genidump.py index 49365ed5..8c3be7d1 100644 --- a/geni/client/genidump.py +++ b/geni/client/genidump.py @@ -8,16 +8,15 @@ import xmlrpclib from types import StringTypes, ListType from optparse import OptionParser -from geni.trust.certificate import Keypair, Certificate +from geni.trust.certificate import Certificate from geni.trust.credential import Credential -from geni.util.geniclient import GeniClient, ServerException from geni.trust.gid import create_uuid + +from geni.util.geniclient import GeniClient, ServerException from geni.util.record import GeniRecord from geni.util.rspec import Rspec def determine_geni_filekind(fn): - from geni.trust.certificate import Certificate - cert = Certificate(filename = fn) data = cert.get_data() diff --git a/geni/client/sfi.py b/geni/client/sfi.py index c09842e5..43bbb982 100755 --- a/geni/client/sfi.py +++ b/geni/client/sfi.py @@ -11,8 +11,9 @@ from optparse import OptionParser from geni.trust.certificate import Keypair, Certificate from geni.trust.credential import Credential -from geni.util.geniclient import GeniClient, ServerException from geni.trust.gid import create_uuid + +from geni.util.geniclient import GeniClient, ServerException from geni.util.record import * from geni.util.rspec import Rspec diff --git a/geni/methods/create_gid.py b/geni/methods/create_gid.py index 0a8b54b4..e4560b49 100644 --- a/geni/methods/create_gid.py +++ b/geni/methods/create_gid.py @@ -1,11 +1,12 @@ ### $Id$ ### $URL$ +from geni.trust.certificate import Keypair + from geni.util.faults import * from geni.util.method import Method from geni.util.parameter import Parameter, Mixed from geni.util.auth import Auth -from geni.trust.certificate import Keypair class create_gid(Method): """ diff --git a/geni/methods/get_ticket.py b/geni/methods/get_ticket.py index e8495b7b..600bfeb8 100644 --- a/geni/methods/get_ticket.py +++ b/geni/methods/get_ticket.py @@ -1,7 +1,6 @@ ### $Id$ ### $URL$ -from geni.trust.certificate import Keypair from geni.util.faults import * from geni.util.method import Method from geni.util.parameter import Parameter, Mixed diff --git a/geni/methods/register.py b/geni/methods/register.py index dcb7752b..11a42297 100644 --- a/geni/methods/register.py +++ b/geni/methods/register.py @@ -3,6 +3,7 @@ from geni.trust.certificate import Keypair, convert_public_key from geni.trust.gid import * + from geni.util.faults import * from geni.util.misc import * from geni.util.method import Method diff --git a/geni/plc/sfa-import-plc.py b/geni/plc/sfa-import-plc.py index 2035564b..0163e8aa 100755 --- a/geni/plc/sfa-import-plc.py +++ b/geni/plc/sfa-import-plc.py @@ -21,8 +21,9 @@ import getopt import sys import tempfile -from geni.trust.certificate import * +from geni.trust.certificate import convert_public_key, Keypair from geni.trust.trustedroot import * + from geni.util.hierarchy import * from geni.util.record import * from geni.util.genitable import * diff --git a/geni/server/sfa-server.py b/geni/server/sfa-server.py index 5ce9a470..5e3fc0c5 100644 --- a/geni/server/sfa-server.py +++ b/geni/server/sfa-server.py @@ -37,15 +37,16 @@ slicemgr_port=12347 import os, os.path from optparse import OptionParser -from geni.util.hierarchy import Hierarchy from geni.trust.trustedroot import TrustedRootList from geni.trust.certificate import Keypair, Certificate -from geni.util.config import Config from geni.server.registry import Registry from geni.server.aggregate import Aggregate from geni.server.slicemgr import SliceMgr +from geni.util.config import Config +from geni.util.hierarchy import Hierarchy + # after http://www.erlenstar.demon.co.uk/unix/faq_2.html def daemon(): """Daemonize the current process.""" diff --git a/geni/trust/credential.py b/geni/trust/credential.py index bda1b02d..04c16052 100644 --- a/geni/trust/credential.py +++ b/geni/trust/credential.py @@ -10,7 +10,7 @@ import xmlrpclib -from geni.trust.certificate import * +from geni.trust.certificate import Certificate from geni.trust.rights import * from geni.trust.gid import * diff --git a/geni/trust/gid.py b/geni/trust/gid.py index 711f5434..d744cf9c 100644 --- a/geni/trust/gid.py +++ b/geni/trust/gid.py @@ -9,7 +9,7 @@ import xmlrpclib import uuid -from geni.trust.certificate import * +from geni.trust.certificate import Certificate ## # Create a new uuid. Returns the UUID as a string. diff --git a/geni/util/geniserver.py b/geni/util/geniserver.py index 0273fe21..b1dd436e 100644 --- a/geni/util/geniserver.py +++ b/geni/util/geniserver.py @@ -21,8 +21,9 @@ import SimpleXMLRPCServer from OpenSSL import SSL -from geni.trust.certificate import * +from geni.trust.certificate import Keypair, Certificate from geni.trust.credential import * + from geni.util.faults import * from geni.util.api import GeniAPI from geni.util.debug import log diff --git a/geni/util/geniticket.py b/geni/util/geniticket.py index 3e225636..0c9d2c62 100644 --- a/geni/util/geniticket.py +++ b/geni/util/geniticket.py @@ -8,7 +8,7 @@ import xmlrpclib -from geni.trust.certificate import * +from geni.trust.certificate import Certificate from geni.trust.rights import * from geni.trust.gid import * diff --git a/geni/util/hierarchy.py b/geni/util/hierarchy.py index b38f50f4..267ac502 100644 --- a/geni/util/hierarchy.py +++ b/geni/util/hierarchy.py @@ -18,9 +18,10 @@ import os import report -from geni.trust.certificate import * +from geni.trust.certificate import KeyPair from geni.trust.credential import * from geni.trust.gid import * + from geni.util.misc import * from geni.util.config import * from geni.util.geniticket import * diff --git a/tests/testAll.py b/tests/testAll.py old mode 100644 new mode 100755 diff --git a/tests/testCert.py b/tests/testCert.py old mode 100644 new mode 100755 index 043de101..0b835257 --- a/tests/testCert.py +++ b/tests/testCert.py @@ -1,6 +1,6 @@ import unittest import xmlrpclib -from geni.trust.certificate import * +from geni.trust.certificate import Certificate, Keypair class TestCert(unittest.TestCase): def setUp(self): diff --git a/tests/testCred.py b/tests/testCred.py old mode 100644 new mode 100755 diff --git a/tests/testGid.py b/tests/testGid.py old mode 100644 new mode 100755 index f725ed04..67c113b7 --- a/tests/testGid.py +++ b/tests/testGid.py @@ -1,6 +1,6 @@ import unittest import xmlrpclib -from geni.trust.certificate import * +from geni.trust.certificate import Keypair from geni.trust.gid import * class TestGid(unittest.TestCase): diff --git a/tests/testHierarchy.py b/tests/testHierarchy.py old mode 100644 new mode 100755 diff --git a/tests/testKeypair.py b/tests/testKeypair.py old mode 100644 new mode 100755 index 8330c2c6..f4c5c4e2 --- a/tests/testKeypair.py +++ b/tests/testKeypair.py @@ -1,7 +1,11 @@ +#!/usr/bin/python +import sys +sys.path.append('..') + import unittest import xmlrpclib import base64 -from geni.trust.certificate import * +from geni.trust.certificate import Keypair class TestKeypair(unittest.TestCase): def setUp(self): diff --git a/tests/testMisc.py b/tests/testMisc.py old mode 100644 new mode 100755 diff --git a/tests/testRecord.py b/tests/testRecord.py old mode 100644 new mode 100755 index 03a060c6..61561547 --- a/tests/testRecord.py +++ b/tests/testRecord.py @@ -1,6 +1,5 @@ import unittest import xmlrpclib -from geni.trust.certificate import * from geni.trust.gid import * from geni.trust.config import * from geni.util.record import * diff --git a/tests/testRights.py b/tests/testRights.py old mode 100644 new mode 100755