git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed geni.util.config package import
[sfa.git]
/
geni
/
registry.py
diff --git
a/geni/registry.py
b/geni/registry.py
index
880be62
..
61408e6
100644
(file)
--- a/
geni/registry.py
+++ b/
geni/registry.py
@@
-18,8
+18,7
@@
from geni.util.genitable import GeniTable
from geni.util.geniticket import Ticket
from geni.util.excep import *
from geni.util.misc import *
from geni.util.geniticket import Ticket
from geni.util.excep import *
from geni.util.misc import *
-
-from util.config import *
+from geni.util.config import *
##
# Convert geni fields to PLC fields for use when registering up updating
##
# Convert geni fields to PLC fields for use when registering up updating
@@
-103,7
+102,7
@@
class Registry(GeniServer):
# Connect to a remote shell via XMLRPC
def connect_remote_shell(self):
# Connect to a remote shell via XMLRPC
def connect_remote_shell(self):
- import remoteshell
+
from geni.util
import remoteshell
self.shell = remoteshell.RemoteShell()
##
self.shell = remoteshell.RemoteShell()
##