Repository :
http://git.fedorahosted.org/cgit/cura-tools.git
On branch : master
---------------------------------------------------------------
commit 3f1cf96d4f615018b491b01fdc889348e33cfb96
Author: Peter Hatina <phatina(a)redhat.com>
Date: Fri Aug 2 12:02:14 2013 +0200
make LMI* classes available in the shell by default
---------------------------------------------------------------
cli/lmi/shell/LMIConsole.py | 25 +++++++++++++++++++++++++
cli/lmi/shell/__init__.py | 5 ++++-
2 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/cli/lmi/shell/LMIConsole.py b/cli/lmi/shell/LMIConsole.py
index d59d362..cb9f1cd 100644
--- a/cli/lmi/shell/LMIConsole.py
+++ b/cli/lmi/shell/LMIConsole.py
@@ -19,10 +19,19 @@ import code
import readline
import __builtin__
+from LMIUtil import LMIPassByRef
+from LMIIndication import LMIIndication
+from LMIIndicationListener import LMIIndicationListener
+from LMIBaseClient import LMIBaseClient
+from LMIShellClient import LMIShellClient
+from LMIShellConfig import LMIShellConfig
+from LMIShellOptions import LMIShellOptions
+from LMISubscription import LMISubscription
from LMICompleter import LMICompleter
from LMIConnection import LMIConnection
from LMIShellConfig import LMIShellConfig
from LMIReturnValue import LMIReturnValue
+from LMIObjectFactory import LMIObjectFactory
from LMIConnection import connect
@@ -69,7 +78,23 @@ class LMIConsole(code.InteractiveConsole):
SHELL_PS1 = "> "
SHELL_PS2 = "... "
DEFAULT_LOCALS = {
+ "__name__" : "__main__",
+ "LMIPassByRef" : LMIPassByRef,
+ "LMIIndication" : LMIIndication,
+ "LMIIndicationListener" : LMIIndicationListener,
+ "LMIReturnValue" : LMIReturnValue,
+ "LMIBaseClient" : LMIBaseClient,
+ "LMIShellClient" : LMIShellClient,
+ "LMIShellConfig" : LMIShellConfig,
+ "LMIShellOptions" : LMIShellOptions,
+ "LMISubscription" : LMISubscription,
"LMIConnection" : LMIConnection,
+ "LMINamespace" : LMIObjectFactory().LMINamespace,
+ "LMINamespaceRoot" : LMIObjectFactory().LMINamespaceRoot,
+ "LMIClass" : LMIObjectFactory().LMIClass,
+ "LMIInstance" : LMIObjectFactory().LMIInstance,
+ "LMIInstanceName" : LMIObjectFactory().LMIInstanceName,
+ "LMIMethod" : LMIObjectFactory().LMIMethod,
"use_exceptions" : lmi_set_use_exceptions
}
diff --git a/cli/lmi/shell/__init__.py b/cli/lmi/shell/__init__.py
index 8a20af5..271da23 100644
--- a/cli/lmi/shell/__init__.py
+++ b/cli/lmi/shell/__init__.py
@@ -19,7 +19,6 @@ LMIShell
__version__ = "0.6"
-from LMIConsole import LMIConsole
from LMIExceptions import *
from LMIUtil import LMIPassByRef
from LMIIndication import LMIIndication
@@ -50,3 +49,7 @@ LMIObjectFactory().register(LMIClass)
LMIObjectFactory().register(LMIInstance)
LMIObjectFactory().register(LMIInstanceName)
LMIObjectFactory().register(LMIMethod)
+
+# LMIConsole depends on LMIObjectFactory and needs to be imported after
+# LMIObjectFactory has all wrapper classes registered.
+from LMIConsole import LMIConsole