From: Thierry Parmentelat Date: Fri, 3 Jul 2009 12:22:07 +0000 (+0000) Subject: no more __init__ created for now X-Git-Tag: sfa-0.9-0@14641~186 X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=2217e1bde1013a6031c3661ed26fb3e14371edee no more __init__ created for now --- diff --git a/Makefile b/Makefile index cd53bb50..b56aa92b 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,8 @@ keyconvert-clean: .PHONY: keyconvert keyconvert-install keyconvert-clean ########## -python: index +python: + echo 'nothing to do for python - no __init__ generated anymore' python-install: python setup.py install --root=$(DESTDIR) --record=GENI_INSTALLED_FILES diff --git a/component/component.py b/component/component.py index a0ffe473..97b45324 100644 --- a/component/component.py +++ b/component/component.py @@ -10,14 +10,15 @@ import os import sys from xmlrpclib import ServerProxy -from cert import * -from gid import * -from geniserver import * -from excep import * -from trustedroot import * -from misc import * -from record import * -from geniticket import * +from geni.trust.certificate import * +from geni.trust.gid import * +from geni.trust.trustedroot import * + +from geni.util.geniserver import * +from geni.util.faults import * +from geni.util.misc import * +from geni.util.record import * +from geni.util.geniticket import * ## # ComponentManager is a GeniServer that serves slice and diff --git a/geni/methods/get_credential.py b/geni/methods/get_credential.py index 80195580..aa9b25fd 100644 --- a/geni/methods/get_credential.py +++ b/geni/methods/get_credential.py @@ -1,13 +1,13 @@ ### $Id$ ### $URL$ +from geni.trust.credential import * +from geni.trust.rights import * 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.util.record import GeniRecord -from geni.trust.credential import * -from geni.trust.rights import * from geni.util.debug import log class get_credential(Method): diff --git a/geni/methods/get_ticket.py b/geni/methods/get_ticket.py index 9c2062b9..e8495b7b 100644 --- a/geni/methods/get_ticket.py +++ b/geni/methods/get_ticket.py @@ -1,11 +1,11 @@ ### $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 from geni.util.geniticket import * class get_ticket(Method): diff --git a/geni/methods/register.py b/geni/methods/register.py index aeb47c61..dcb7752b 100644 --- a/geni/methods/register.py +++ b/geni/methods/register.py @@ -1,15 +1,15 @@ ### $Id$ ### $URL$ +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 from geni.util.parameter import Parameter, Mixed from geni.util.auth import Auth from geni.util.record import GeniRecord -from geni.trust.certificate import Keypair, convert_public_key -from geni.trust.gid import * from geni.util.debug import log -from geni.util.misc import * class register(Method): """ diff --git a/geni/util/auth.py b/geni/util/auth.py index 0849fe09..ed02451f 100644 --- a/geni/util/auth.py +++ b/geni/util/auth.py @@ -7,11 +7,11 @@ import time -from geni.util.faults import * from geni.trust.credential import Credential from geni.trust.trustedroot import TrustedRootList -from geni.util.hierarchy import Hierarchy from geni.trust.rights import RightList +from geni.util.faults import * +from geni.util.hierarchy import Hierarchy from geni.util.genitable import * from geni.util.config import * from geni.util.misc import * diff --git a/tests/client/testAggregate.py b/tests/client/testAggregate.py index ef917517..1c0d437e 100644 --- a/tests/client/testAggregate.py +++ b/tests/client/testAggregate.py @@ -1,6 +1,7 @@ +from pprint import pprint + from geni.util.geniclient import * from geni.trust.credential import * -from pprint import pprint cred = Credential(filename = 'tmack.pl.sa.cred') slicehrn = 'planetlab.us.pl.tmack' diff --git a/tests/testCert.py b/tests/testCert.py index 37e468b5..043de101 100644 --- a/tests/testCert.py +++ b/tests/testCert.py @@ -1,6 +1,6 @@ import unittest import xmlrpclib -from cert import * +from geni.trust.certificate import * class TestCert(unittest.TestCase): def setUp(self): diff --git a/tests/testCred.py b/tests/testCred.py index b1d97b71..1de98381 100644 --- a/tests/testCred.py +++ b/tests/testCred.py @@ -1,7 +1,7 @@ import unittest -from credential import * -from rights import * -from gid import * +from geni.trust.credential import * +from geni.trust.rights import * +from geni.trust.gid import * class TestCred(unittest.TestCase): def setUp(self): diff --git a/tests/testGid.py b/tests/testGid.py index cec0d923..f725ed04 100644 --- a/tests/testGid.py +++ b/tests/testGid.py @@ -1,7 +1,7 @@ import unittest import xmlrpclib -from cert import * -from gid import * +from geni.trust.certificate import * +from geni.trust.gid import * class TestGid(unittest.TestCase): def setUp(self): diff --git a/tests/testHierarchy.py b/tests/testHierarchy.py index 618c1cdd..78e53c10 100644 --- a/tests/testHierarchy.py +++ b/tests/testHierarchy.py @@ -1,8 +1,8 @@ import unittest import os -from excep import * -from hierarchy import * -from config import * +from geni.util.faults import * +from geni.util.hierarchy import * +from geni.util.config import * BASEDIR = "test_hierarchy" PURGE_BASEDIR = "rm -rf test_hierarchy" diff --git a/tests/testKeypair.py b/tests/testKeypair.py index 6562316f..8330c2c6 100644 --- a/tests/testKeypair.py +++ b/tests/testKeypair.py @@ -1,7 +1,7 @@ import unittest import xmlrpclib import base64 -from cert import * +from geni.trust.certificate import * class TestKeypair(unittest.TestCase): def setUp(self): diff --git a/tests/testMisc.py b/tests/testMisc.py index a6ea9df6..20bf1fd8 100644 --- a/tests/testMisc.py +++ b/tests/testMisc.py @@ -1,5 +1,5 @@ import unittest -from misc import * +from geni.util.misc import * class TestMisc(unittest.TestCase): def setUp(self): diff --git a/tests/testRecord.py b/tests/testRecord.py index 2f83e057..03a060c6 100644 --- a/tests/testRecord.py +++ b/tests/testRecord.py @@ -1,9 +1,9 @@ import unittest import xmlrpclib -from record import * -from cert import * -from gid import * -from config import * +from geni.trust.certificate import * +from geni.trust.gid import * +from geni.trust.config import * +from geni.util.record import * class TestRecord(unittest.TestCase): def setUp(self): diff --git a/tests/testRights.py b/tests/testRights.py index a9c29a0b..2479d4a8 100644 --- a/tests/testRights.py +++ b/tests/testRights.py @@ -1,5 +1,5 @@ import unittest -from rights import * +from geni.trust.rights import * class TestRight(unittest.TestCase): def setUp(self):