Repository :
http://git.fedorahosted.org/cgit/cura-tools.git
On branch : openlmi-tools-lmiwbem
---------------------------------------------------------------
commit 0d76857517f10fc4940d0e6c11aaf353a7d7fe42
Author: Peter Hatina <phatina(a)redhat.com>
Date: Fri May 23 15:16:19 2014 +0200
switch to absolute imports
---------------------------------------------------------------
cli/lmi/shell/LMIBaseClient.py | 10 +++---
cli/lmi/shell/LMIClass.py | 36 ++++++++++++------------
cli/lmi/shell/LMICompleter.py | 18 ++++++------
cli/lmi/shell/LMIConsole.py | 40 ++++++++++++++--------------
cli/lmi/shell/LMIDecorators.py | 10 +++---
cli/lmi/shell/LMIFormatter.py | 4 +-
cli/lmi/shell/LMIIndicationListener.py | 2 +-
cli/lmi/shell/LMIInstance.py | 26 +++++++++---------
cli/lmi/shell/LMIInstanceName.py | 4 +-
cli/lmi/shell/LMIJob.py | 2 +-
cli/lmi/shell/LMIMethod.py | 46 ++++++++++++++++----------------
cli/lmi/shell/LMINamespace.py | 10 +++---
cli/lmi/shell/LMIShellClient.py | 6 ++--
cli/lmi/shell/LMIShellOptions.py | 2 +-
cli/lmi/shell/LMIUtil.py | 2 +-
cli/lmi/shell/__init__.py | 42 ++++++++++++++--------------
16 files changed, 130 insertions(+), 130 deletions(-)
diff --git a/cli/lmi/shell/LMIBaseClient.py b/cli/lmi/shell/LMIBaseClient.py
index c46a5f7..ac0e7de 100644
--- a/cli/lmi/shell/LMIBaseClient.py
+++ b/cli/lmi/shell/LMIBaseClient.py
@@ -18,13 +18,13 @@ import urlparse
from lmi.shell.compat import *
-from LMIReturnValue import LMIReturnValue
-from LMIUtil import lmi_raise_or_dump_exception
-from LMIUtil import lmi_instance_to_path
+from lmi.shell.LMIReturnValue import LMIReturnValue
+from lmi.shell.LMIUtil import lmi_raise_or_dump_exception
+from lmi.shell.LMIUtil import lmi_instance_to_path
-from LMIDecorators import lmi_process_cim_exceptions
+from lmi.shell.LMIDecorators import lmi_process_cim_exceptions
-from LMIExceptions import LMIFilterError
+from lmi.shell.LMIExceptions import LMIFilterError
class LMIBaseClient(object):
"""
diff --git a/cli/lmi/shell/LMIClass.py b/cli/lmi/shell/LMIClass.py
index ecc074f..0b3d856 100644
--- a/cli/lmi/shell/LMIClass.py
+++ b/cli/lmi/shell/LMIClass.py
@@ -17,24 +17,24 @@ import sys
from lmi.shell.compat import *
-from LMIBaseObject import LMIWrapperBaseObject
-from LMIBaseClient import LMIBaseClient
-from LMIFormatter import LMIClassFormatter
-from LMIConstantValues import LMIConstantValuesParamProp
-from LMIObjectFactory import LMIObjectFactory
-
-from LMIExceptions import LMIUnknownPropertyError
-
-from LMIDecorators import lmi_class_fetch_lazy
-from LMIDecorators import lmi_process_cim_exceptions
-from LMIDecorators import lmi_return_val_if_fail
-from LMIDecorators import lmi_return_if_fail
-
-from LMIUtil import lmi_cast_to_cim
-from LMIUtil import lmi_get_use_exceptions
-from LMIUtil import lmi_set_use_exceptions
-from LMIUtil import lmi_raise_or_dump_exception
-from LMIUtil import lmi_transform_to_lmi
+from lmi.shell.LMIBaseObject import LMIWrapperBaseObject
+from lmi.shell.LMIBaseClient import LMIBaseClient
+from lmi.shell.LMIFormatter import LMIClassFormatter
+from lmi.shell.LMIConstantValues import LMIConstantValuesParamProp
+from lmi.shell.LMIObjectFactory import LMIObjectFactory
+
+from lmi.shell.LMIExceptions import LMIUnknownPropertyError
+
+from lmi.shell.LMIDecorators import lmi_class_fetch_lazy
+from lmi.shell.LMIDecorators import lmi_process_cim_exceptions
+from lmi.shell.LMIDecorators import lmi_return_val_if_fail
+from lmi.shell.LMIDecorators import lmi_return_if_fail
+
+from lmi.shell.LMIUtil import lmi_cast_to_cim
+from lmi.shell.LMIUtil import lmi_get_use_exceptions
+from lmi.shell.LMIUtil import lmi_set_use_exceptions
+from lmi.shell.LMIUtil import lmi_raise_or_dump_exception
+from lmi.shell.LMIUtil import lmi_transform_to_lmi
class LMIClass(LMIWrapperBaseObject):
"""
diff --git a/cli/lmi/shell/LMICompleter.py b/cli/lmi/shell/LMICompleter.py
index b7efbf2..a2d56ea 100644
--- a/cli/lmi/shell/LMICompleter.py
+++ b/cli/lmi/shell/LMICompleter.py
@@ -17,15 +17,15 @@ import keyword
import os.path
import rlcompleter
-from LMIReturnValue import LMIReturnValue
-from LMIConstantValues import LMIConstantValues
-from LMINamespace import LMINamespace
-from LMINamespace import LMINamespaceRoot
-from LMIClass import LMIClass
-from LMIInstance import LMIInstance
-from LMIInstanceName import LMIInstanceName
-from LMIMethod import LMIMethod
-from LMIConnection import LMIConnection
+from lmi.shell.LMIReturnValue import LMIReturnValue
+from lmi.shell.LMIConstantValues import LMIConstantValues
+from lmi.shell.LMINamespace import LMINamespace
+from lmi.shell.LMINamespace import LMINamespaceRoot
+from lmi.shell.LMIClass import LMIClass
+from lmi.shell.LMIInstance import LMIInstance
+from lmi.shell.LMIInstanceName import LMIInstanceName
+from lmi.shell.LMIMethod import LMIMethod
+from lmi.shell.LMIConnection import LMIConnection
class LMICompleter(rlcompleter.Completer):
"""
diff --git a/cli/lmi/shell/LMIConsole.py b/cli/lmi/shell/LMIConsole.py
index 7582f8e..325828e 100644
--- a/cli/lmi/shell/LMIConsole.py
+++ b/cli/lmi/shell/LMIConsole.py
@@ -19,30 +19,30 @@ import code
import readline
import __builtin__
-from LMIUtil import LMIPassByRef
-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 lmi.shell.LMIUtil import LMIPassByRef
+from lmi.shell.LMIIndicationListener import LMIIndicationListener
+from lmi.shell.LMIBaseClient import LMIBaseClient
+from lmi.shell.LMIShellClient import LMIShellClient
+from lmi.shell.LMIShellConfig import LMIShellConfig
+from lmi.shell.LMIShellOptions import LMIShellOptions
+from lmi.shell.LMISubscription import LMISubscription
+from lmi.shell.LMICompleter import LMICompleter
+from lmi.shell.LMIConnection import LMIConnection
+from lmi.shell.LMIShellConfig import LMIShellConfig
+from lmi.shell.LMIReturnValue import LMIReturnValue
+from lmi.shell.LMIObjectFactory import LMIObjectFactory
-from LMIConnection import connect as connect_internal
+from lmi.shell.LMIConnection import connect as connect_internal
-from LMIExceptions import CIMError
-from LMIExceptions import ConnectionError
+from lmi.shell.LMIExceptions import CIMError
+from lmi.shell.LMIExceptions import ConnectionError
-from LMIUtil import lmi_set_use_exceptions
-from LMIUtil import lmi_get_use_exceptions
-from LMIUtil import lmi_associators
-from LMIUtil import lmi_isinstance
+from lmi.shell.LMIUtil import lmi_set_use_exceptions
+from lmi.shell.LMIUtil import lmi_get_use_exceptions
+from lmi.shell.LMIUtil import lmi_associators
+from lmi.shell.LMIUtil import lmi_isinstance
-from LMIHelper import LMIHelper
+from lmi.shell.LMIHelper import LMIHelper
class LMIConsole(code.InteractiveConsole):
"""
diff --git a/cli/lmi/shell/LMIDecorators.py b/cli/lmi/shell/LMIDecorators.py
index eecb7a3..e5c6180 100644
--- a/cli/lmi/shell/LMIDecorators.py
+++ b/cli/lmi/shell/LMIDecorators.py
@@ -17,12 +17,12 @@ from functools import wraps
from lmi.shell.compat import *
-from LMIReturnValue import LMIReturnValue
-from LMIUtil import lmi_raise_or_dump_exception
+from lmi.shell.LMIReturnValue import LMIReturnValue
+from lmi.shell.LMIUtil import lmi_raise_or_dump_exception
-from LMIExceptions import CIMError
-from LMIExceptions import ConnectionError
-from LMIExceptions import LMIDeletedObjectError
+from lmi.shell.LMIExceptions import CIMError
+from lmi.shell.LMIExceptions import ConnectionError
+from lmi.shell.LMIExceptions import LMIDeletedObjectError
class lmi_return_expr_if_fail(object):
"""
diff --git a/cli/lmi/shell/LMIFormatter.py b/cli/lmi/shell/LMIFormatter.py
index b61b0e9..c8193a6 100644
--- a/cli/lmi/shell/LMIFormatter.py
+++ b/cli/lmi/shell/LMIFormatter.py
@@ -20,9 +20,9 @@ import tempfile
import subprocess
from textwrap import TextWrapper
-from LMIUtil import lmi_raise_or_dump_exception
+from lmi.shell.LMIUtil import lmi_raise_or_dump_exception
-from LMIExceptions import LMINoPagerError
+from lmi.shell.LMIExceptions import LMINoPagerError
def _is_executable(fpath):
"""
diff --git a/cli/lmi/shell/LMIIndicationListener.py
b/cli/lmi/shell/LMIIndicationListener.py
index 9e21c9a..6d1fcba 100644
--- a/cli/lmi/shell/LMIIndicationListener.py
+++ b/cli/lmi/shell/LMIIndicationListener.py
@@ -20,7 +20,7 @@ import string
from lmi.shell.compat import *
-from LMIExceptions import LMIHandlerNamePatternError
+from lmi.shell.LMIExceptions import LMIHandlerNamePatternError
class LMIIndicationListener(wbem.CIMIndicationListener):
"""
diff --git a/cli/lmi/shell/LMIInstance.py b/cli/lmi/shell/LMIInstance.py
index a9555ac..118d45c 100644
--- a/cli/lmi/shell/LMIInstance.py
+++ b/cli/lmi/shell/LMIInstance.py
@@ -17,21 +17,21 @@ import sys
from lmi.shell.compat import *
-from LMIBaseObject import LMIWrapperBaseObject
-from LMIFormatter import LMIInstanceFormatter
-from LMIFormatter import LMIMofFormatter
-from LMIObjectFactory import LMIObjectFactory
-from LMIReturnValue import LMIReturnValue
-
-from LMIDecorators import lmi_possibly_deleted
-from LMIDecorators import lmi_return_expr_if_fail
-from LMIDecorators import lmi_return_val_if_fail
-from LMIDecorators import lmi_return_if_fail
-
-from LMIUtil import lmi_cast_to_cim
-from LMIUtil import lmi_cast_to_lmi
-from LMIUtil import lmi_transform_to_lmi
-from LMIUtil import lmi_wrap_cim_method
+from lmi.shell.LMIBaseObject import LMIWrapperBaseObject
+from lmi.shell.LMIFormatter import LMIInstanceFormatter
+from lmi.shell.LMIFormatter import LMIMofFormatter
+from lmi.shell.LMIObjectFactory import LMIObjectFactory
+from lmi.shell.LMIReturnValue import LMIReturnValue
+
+from lmi.shell.LMIDecorators import lmi_possibly_deleted
+from lmi.shell.LMIDecorators import lmi_return_expr_if_fail
+from lmi.shell.LMIDecorators import lmi_return_val_if_fail
+from lmi.shell.LMIDecorators import lmi_return_if_fail
+
+from lmi.shell.LMIUtil import lmi_cast_to_cim
+from lmi.shell.LMIUtil import lmi_cast_to_lmi
+from lmi.shell.LMIUtil import lmi_transform_to_lmi
+from lmi.shell.LMIUtil import lmi_wrap_cim_method
class LMIInstance(LMIWrapperBaseObject):
"""
diff --git a/cli/lmi/shell/LMIInstanceName.py b/cli/lmi/shell/LMIInstanceName.py
index 95f5a10..b802b9f 100644
--- a/cli/lmi/shell/LMIInstanceName.py
+++ b/cli/lmi/shell/LMIInstanceName.py
@@ -17,8 +17,8 @@ import sys
from lmi.shell.compat import *
-from LMIBaseObject import LMIWrapperBaseObject
-from LMIUtil import lmi_transform_to_lmi
+from lmi.shell.LMIBaseObject import LMIWrapperBaseObject
+from lmi.shell.LMIUtil import lmi_transform_to_lmi
class LMIInstanceName(LMIWrapperBaseObject):
"""
diff --git a/cli/lmi/shell/LMIJob.py b/cli/lmi/shell/LMIJob.py
index 7ce7333..b2c9df2 100644
--- a/cli/lmi/shell/LMIJob.py
+++ b/cli/lmi/shell/LMIJob.py
@@ -15,7 +15,7 @@
from lmi.shell.compat import *
-from LMIObjectFactory import LMIObjectFactory
+from lmi.shell.LMIObjectFactory import LMIObjectFactory
# NOTE: the enumeration comes from DMTF standard.
JOB_STATE_COMPLETED, \
diff --git a/cli/lmi/shell/LMIMethod.py b/cli/lmi/shell/LMIMethod.py
index b479d5f..c612641 100644
--- a/cli/lmi/shell/LMIMethod.py
+++ b/cli/lmi/shell/LMIMethod.py
@@ -23,32 +23,32 @@ import collections
from lmi.shell.compat import *
-from LMIBaseObject import LMIWrapperBaseObject
-from LMIBaseClient import LMIBaseClient
-from LMIShellConfig import LMIShellConfig
-from LMIObjectFactory import LMIObjectFactory
-from LMIFormatter import LMIMethodFormatter
-from LMIFormatter import LMIMofFormatter
-from LMIReturnValue import LMIReturnValue
-from LMIConstantValues import LMIConstantValuesParamProp
-from LMIConstantValues import LMIConstantValuesMethodReturnType
-from LMIIndicationListener import LMIIndicationListener
-
-from LMIJob import lmi_is_job_finished
-from LMIJob import lmi_is_job_completed
-from LMIJob import lmi_is_job_terminated
-from LMIJob import lmi_is_job_killed
-from LMIJob import lmi_is_job_exception
-from LMIJob import JOB_NOT_FINISHED
-from LMIJob import JOB_FINISH_DELAYED
-from LMIJob import JOB_FINISH_EARLY
-
-from LMIUtil import LMIPassByRef
-from LMIUtil import lmi_raise_or_dump_exception
-from LMIUtil import lmi_transform_to_cim_param
-from LMIUtil import lmi_transform_to_lmi
-
-from LMIExceptions import *
+from lmi.shell.LMIBaseObject import LMIWrapperBaseObject
+from lmi.shell.LMIBaseClient import LMIBaseClient
+from lmi.shell.LMIShellConfig import LMIShellConfig
+from lmi.shell.LMIObjectFactory import LMIObjectFactory
+from lmi.shell.LMIFormatter import LMIMethodFormatter
+from lmi.shell.LMIFormatter import LMIMofFormatter
+from lmi.shell.LMIReturnValue import LMIReturnValue
+from lmi.shell.LMIConstantValues import LMIConstantValuesParamProp
+from lmi.shell.LMIConstantValues import LMIConstantValuesMethodReturnType
+from lmi.shell.LMIIndicationListener import LMIIndicationListener
+
+from lmi.shell.LMIJob import lmi_is_job_finished
+from lmi.shell.LMIJob import lmi_is_job_completed
+from lmi.shell.LMIJob import lmi_is_job_terminated
+from lmi.shell.LMIJob import lmi_is_job_killed
+from lmi.shell.LMIJob import lmi_is_job_exception
+from lmi.shell.LMIJob import JOB_NOT_FINISHED
+from lmi.shell.LMIJob import JOB_FINISH_DELAYED
+from lmi.shell.LMIJob import JOB_FINISH_EARLY
+
+from lmi.shell.LMIUtil import LMIPassByRef
+from lmi.shell.LMIUtil import lmi_raise_or_dump_exception
+from lmi.shell.LMIUtil import lmi_transform_to_cim_param
+from lmi.shell.LMIUtil import lmi_transform_to_lmi
+
+from lmi.shell.LMIExceptions import *
logger = logging.getLogger(__name__)
diff --git a/cli/lmi/shell/LMINamespace.py b/cli/lmi/shell/LMINamespace.py
index 4fc41ff..7f66d58 100644
--- a/cli/lmi/shell/LMINamespace.py
+++ b/cli/lmi/shell/LMINamespace.py
@@ -17,12 +17,12 @@ import sys
import LMIExceptions
-from LMIBaseObject import LMIWrapperBaseObject
-from LMIBaseClient import LMIBaseClient
+from lmi.shell.LMIBaseObject import LMIWrapperBaseObject
+from lmi.shell.LMIBaseClient import LMIBaseClient
-from LMIUtil import lmi_wrap_cim_namespace
-from LMIUtil import lmi_wrap_cim_class
-from LMIUtil import lmi_transform_to_lmi
+from lmi.shell.LMIUtil import lmi_wrap_cim_namespace
+from lmi.shell.LMIUtil import lmi_wrap_cim_class
+from lmi.shell.LMIUtil import lmi_transform_to_lmi
class LMINamespace(LMIWrapperBaseObject):
"""
diff --git a/cli/lmi/shell/LMIShellClient.py b/cli/lmi/shell/LMIShellClient.py
index dd8f47f..71009db 100644
--- a/cli/lmi/shell/LMIShellClient.py
+++ b/cli/lmi/shell/LMIShellClient.py
@@ -13,9 +13,9 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <
http://www.gnu.org/licenses/>.
-from LMIBaseClient import LMIBaseClient
-from LMIReturnValue import LMIReturnValue
-from LMIShellCache import LMIShellCache
+from lmi.shell.LMIBaseClient import LMIBaseClient
+from lmi.shell.LMIReturnValue import LMIReturnValue
+from lmi.shell.LMIShellCache import LMIShellCache
class LMIShellClient(LMIBaseClient):
"""
diff --git a/cli/lmi/shell/LMIShellOptions.py b/cli/lmi/shell/LMIShellOptions.py
index 8ee0d6d..5d93d5e 100644
--- a/cli/lmi/shell/LMIShellOptions.py
+++ b/cli/lmi/shell/LMIShellOptions.py
@@ -17,7 +17,7 @@ import os
import sys
import argparse
-from LMIShellVersion import __version__
+from lmi.shell.LMIShellVersion import __version__
class LMIShellOptionsHelpWithVersionFormatter(argparse.HelpFormatter):
"""
diff --git a/cli/lmi/shell/LMIUtil.py b/cli/lmi/shell/LMIUtil.py
index bef71b1..cb41d83 100644
--- a/cli/lmi/shell/LMIUtil.py
+++ b/cli/lmi/shell/LMIUtil.py
@@ -20,7 +20,7 @@ import logging
from lmi.shell import wbem
-from LMIObjectFactory import LMIObjectFactory
+from lmi.shell.LMIObjectFactory import LMIObjectFactory
# By default, the LMIShell does not use exceptions; LMIReturnValue
# is used instead (with proper error string).
diff --git a/cli/lmi/shell/__init__.py b/cli/lmi/shell/__init__.py
index cfb4d5e..c34a76d 100644
--- a/cli/lmi/shell/__init__.py
+++ b/cli/lmi/shell/__init__.py
@@ -22,32 +22,32 @@ import sys
from lmi.shell.LMIShellLogger import lmi_init_logger
lmi_init_logger()
-from LMIShellVersion import __version__
+from lmi.shell.LMIShellVersion import __version__
from lmi.shell.compat import *
-from LMIExceptions import *
-from LMIUtil import LMIPassByRef
-from LMIIndicationListener import LMIIndicationListener
-from LMIReturnValue import LMIReturnValue
-from LMIBaseClient import LMIBaseClient
-from LMIShellClient import LMIShellClient
-from LMIShellConfig import LMIShellConfig
-from LMIShellOptions import LMIShellOptions
-from LMISubscription import LMISubscription
-from LMINamespace import LMINamespace
-from LMINamespace import LMINamespaceRoot
-from LMIConstantValues import LMIConstantValues
-from LMIClass import LMIClass
-from LMIInstanceName import LMIInstanceName
-from LMIMethod import LMIMethod
-from LMIInstance import LMIInstance
-from LMIConnection import LMIConnection
+from lmi.shell.LMIExceptions import *
+from lmi.shell.LMIUtil import LMIPassByRef
+from lmi.shell.LMIIndicationListener import LMIIndicationListener
+from lmi.shell.LMIReturnValue import LMIReturnValue
+from lmi.shell.LMIBaseClient import LMIBaseClient
+from lmi.shell.LMIShellClient import LMIShellClient
+from lmi.shell.LMIShellConfig import LMIShellConfig
+from lmi.shell.LMIShellOptions import LMIShellOptions
+from lmi.shell.LMISubscription import LMISubscription
+from lmi.shell.LMINamespace import LMINamespace
+from lmi.shell.LMINamespace import LMINamespaceRoot
+from lmi.shell.LMIConstantValues import LMIConstantValues
+from lmi.shell.LMIClass import LMIClass
+from lmi.shell.LMIInstanceName import LMIInstanceName
+from lmi.shell.LMIMethod import LMIMethod
+from lmi.shell.LMIInstance import LMIInstance
+from lmi.shell.LMIConnection import LMIConnection
-from LMIConnection import connect
+from lmi.shell.LMIConnection import connect
# Register LMI wrapper classes into a LMIObjectFactory to avoid circular dependency
# between those classes.
-from LMIObjectFactory import LMIObjectFactory
+from lmi.shell.LMIObjectFactory import LMIObjectFactory
LMIObjectFactory().register(LMINamespace)
LMIObjectFactory().register(LMINamespaceRoot)
LMIObjectFactory().register(LMIClass)
@@ -57,4 +57,4 @@ LMIObjectFactory().register(LMIMethod)
# LMIConsole depends on LMIObjectFactory and needs to be imported after
# LMIObjectFactory has all wrapper classes registered.
-from LMIConsole import LMIConsole
+from lmi.shell.LMIConsole import LMIConsole