Repository :
http://git.fedorahosted.org/cgit/cura-tools.git
On branch : openlmi-tools-lmiwbem
---------------------------------------------------------------
commit 7c1e4df136bc8cd7349298da8450c8b4335eb453
Author: Peter Hatina <phatina(a)redhat.com>
Date: Mon Jun 23 15:14:07 2014 +0200
conditional import of CIMError in scripts.common.errors
---------------------------------------------------------------
cli/lmi/scripts/common/errors.py | 7 +++++++
cli/lmi/scripts/common/formatter/__init__.py | 3 +--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/cli/lmi/scripts/common/errors.py b/cli/lmi/scripts/common/errors.py
index 60cd988..b2ef2c9 100644
--- a/cli/lmi/scripts/common/errors.py
+++ b/cli/lmi/scripts/common/errors.py
@@ -16,6 +16,13 @@
Module with predefined exceptions for use in scripts.
"""
+try:
+ import lmiwbem as wbem
+except ImportError:
+ import pywbem as wbem
+
+CIMError = wbem.CIMError
+
class LmiError(Exception):
"""
The base Lmi scripts error.
diff --git a/cli/lmi/scripts/common/formatter/__init__.py
b/cli/lmi/scripts/common/formatter/__init__.py
index add529a..d79ba58 100644
--- a/cli/lmi/scripts/common/formatter/__init__.py
+++ b/cli/lmi/scripts/common/formatter/__init__.py
@@ -23,7 +23,6 @@ expects different argument, please refer to doc string of particular
class.
import itertools
import locale
import os
-import pywbem
from lmi.scripts.common import errors
from lmi.scripts.common.formatter import command as fcmd
@@ -442,7 +441,7 @@ class ErrorFormatter(ListFormatter):
def print_row(self, data):
if isinstance(data, Exception):
- if isinstance(data, pywbem.CIMError):
+ if isinstance(data, errors.CIMError):
self.print_text_row("%s: %s" % (data.args[1], data.message))
elif not isinstance(data, errors.LmiFailed):
self.print_text_row("(%s) %s" % (data.__class__.__name__,