no more __init__ created for now

diff --git a/Makefile b/Makefile
index cd53bb5..b56aa92 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,8 @@ keyconvert-clean:
 .PHONY: keyconvert keyconvert-install 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
 
 python-install:
        python setup.py install --root=$(DESTDIR) --record=GENI_INSTALLED_FILES

diff --git a/component/component.py b/component/component.py
index a0ffe47..97b4532 100644 (file)
--- a/component/component.py
+++ b/component/component.py
@@ -10,14 +10,15 @@ import os
 import sys
 from xmlrpclib import ServerProxy
 
 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
 
 ##
 # ComponentManager is a GeniServer that serves slice and

diff --git a/geni/methods/get_credential.py b/geni/methods/get_credential.py
index 8019558..aa9b25f 100644 (file)
--- a/geni/methods/get_credential.py
+++ b/geni/methods/get_credential.py
@@ -1,13 +1,13 @@
 ### $Id$
 ### $URL$
 
 ### $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.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):
 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 9c2062b..e8495b7 100644 (file)
--- a/geni/methods/get_ticket.py
+++ b/geni/methods/get_ticket.py
@@ -1,11 +1,11 @@
 ### $Id$
 ### $URL$
 
 ### $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.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):
 from geni.util.geniticket import *
 
 class get_ticket(Method):

diff --git a/geni/methods/register.py b/geni/methods/register.py
index aeb47c6..dcb7752 100644 (file)
--- a/geni/methods/register.py
+++ b/geni/methods/register.py
@@ -1,15 +1,15 @@
 ### $Id$
 ### $URL$
 
 ### $Id$
 ### $URL$
 

+from geni.trust.certificate import Keypair, convert_public_key
+from geni.trust.gid import *

 from geni.util.faults 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.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.debug import log

-from geni.util.misc import *

 
 class register(Method):
     """
 
 class register(Method):
     """

diff --git a/geni/util/auth.py b/geni/util/auth.py
index 0849fe0..ed02451 100644 (file)
--- a/geni/util/auth.py
+++ b/geni/util/auth.py
@@ -7,11 +7,11 @@
 
 import time
 
 
 import time
 

-from geni.util.faults import *

 from geni.trust.credential import Credential
 from geni.trust.trustedroot import TrustedRootList
 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.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 *
 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 ef91751..1c0d437 100644 (file)
--- 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 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'
 
 cred = Credential(filename = 'tmack.pl.sa.cred')
 slicehrn = 'planetlab.us.pl.tmack'

diff --git a/tests/testCert.py b/tests/testCert.py
index 37e468b..043de10 100644 (file)
--- a/tests/testCert.py
+++ b/tests/testCert.py
@@ -1,6 +1,6 @@
 import unittest
 import xmlrpclib
 import unittest
 import xmlrpclib

-from cert import *
+from geni.trust.certificate import *

 
 class TestCert(unittest.TestCase):
    def setUp(self):
 
 class TestCert(unittest.TestCase):
    def setUp(self):

diff --git a/tests/testCred.py b/tests/testCred.py
index b1d97b7..1de9838 100644 (file)
--- a/tests/testCred.py
+++ b/tests/testCred.py
@@ -1,7 +1,7 @@
 import unittest
 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):
 
 class TestCred(unittest.TestCase):
    def setUp(self):

diff --git a/tests/testGid.py b/tests/testGid.py
index cec0d92..f725ed0 100644 (file)
--- a/tests/testGid.py
+++ b/tests/testGid.py
@@ -1,7 +1,7 @@
 import unittest
 import xmlrpclib
 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):
 
 class TestGid(unittest.TestCase):
    def setUp(self):

diff --git a/tests/testHierarchy.py b/tests/testHierarchy.py
index 618c1cd..78e53c1 100644 (file)
--- a/tests/testHierarchy.py
+++ b/tests/testHierarchy.py
@@ -1,8 +1,8 @@
 import unittest
 import os
 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"
 
 BASEDIR = "test_hierarchy"
 PURGE_BASEDIR = "rm -rf test_hierarchy"

diff --git a/tests/testKeypair.py b/tests/testKeypair.py
index 6562316..8330c2c 100644 (file)
--- a/tests/testKeypair.py
+++ b/tests/testKeypair.py
@@ -1,7 +1,7 @@
 import unittest
 import xmlrpclib
 import base64
 import unittest
 import xmlrpclib
 import base64

-from cert import *
+from geni.trust.certificate import *

 
 class TestKeypair(unittest.TestCase):
    def setUp(self):
 
 class TestKeypair(unittest.TestCase):
    def setUp(self):

diff --git a/tests/testMisc.py b/tests/testMisc.py
index a6ea9df..20bf1fd 100644 (file)
--- a/tests/testMisc.py
+++ b/tests/testMisc.py
@@ -1,5 +1,5 @@
 import unittest
 import unittest

-from misc import *
+from geni.util.misc import *

 
 class TestMisc(unittest.TestCase):
    def setUp(self):
 
 class TestMisc(unittest.TestCase):
    def setUp(self):

diff --git a/tests/testRecord.py b/tests/testRecord.py
index 2f83e05..03a060c 100644 (file)
--- a/tests/testRecord.py
+++ b/tests/testRecord.py
@@ -1,9 +1,9 @@
 import unittest
 import xmlrpclib
 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):
 
 class TestRecord(unittest.TestCase):
     def setUp(self):

diff --git a/tests/testRights.py b/tests/testRights.py
index a9c29a0..2479d4a 100644 (file)
--- a/tests/testRights.py
+++ b/tests/testRights.py
@@ -1,5 +1,5 @@
 import unittest
 import unittest

-from rights import *
+from geni.trust.rights import *

 
 class TestRight(unittest.TestCase):
    def setUp(self):
 
 class TestRight(unittest.TestCase):
    def setUp(self):