[cura-tools] master: introduce LmiReturnValue::use_display_hook (70ff302)

Repository : http://git.fedorahosted.org/cgit/cura-tools.git

On branch  : master
>

commit 70ff30224279b527085e3e78497d06377f61906c
Author: Peter Hatina 
Date:   Thu Dec 6 11:53:43 2012 +0100

introduce LmiReturnValue::use_display_hook
>

cli-tools/lmi-shell.py            |    3 ++-
 cli-tools/lmi/lmi_client_base.py  |   16 +++++++++++++---
 cli-tools/lmi/lmi_client_shell.py |    1 +
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/cli-tools/lmi-shell.py b/cli-tools/lmi-shell.py
index abefe0d..927d65d 100755
--- a/cli-tools/lmi-shell.py
+++ b/cli-tools/lmi-shell.py
@@ -31,7 +31,8 @@ def _lmi_displayhook(o):
     if o is None:
         return
     __builtin__._ = None
-    if isinstance(o, LmiReturnValue):
+    if isinstance(o, LmiReturnValue) and o.use_display_hook:
+        o.use_display_hook = False
         if o.rval == 0 or (o.rval == 4096 and o.instance_classname == "LMI_PowerManagementService"):
             result_str = "ok"
         else:
diff --git a/cli-tools/lmi/lmi_client_base.py b/cli-tools/lmi/lmi_client_base.py
index 0186fc2..0bc23ff 100644
--- a/cli-tools/lmi/lmi_client_base.py
+++ b/cli-tools/lmi/lmi_client_base.py
@@ -28,20 +28,30 @@ class LmiReturnValue(_RValue):
         return self._properties.keys()

@property
+    def use_display_hook(self):
+        return self._properties["use_display_hook"]
+    
+    @use_display_hook.setter
+    def use_display_hook(self, value):
+        self._properties["use_display_hook"] = value
+    
+    @property
     def instance_classname(self):
         return self._properties["instance"].classname if self._properties["instance"] else ""

def __new__(self, **kwargs):
-        self._properties = {}
+        properties = { "use_display_hook" : False }
         keys_to_pop = []
         for (key, value) in kwargs.iteritems():
             if key in ("rval", "rparams", "errorstr"):
                 continue
-            self._properties[key] = value
+            properties[key] = value
             keys_to_pop.append(key)
         for key in keys_to_pop:
             kwargs.pop(key)
-        return _RValue.__new__(self, **kwargs)
+        rval = _RValue.__new__(self, **kwargs)
+        rval._properties = properties
+        return rval

class LmiBaseClient(object):
     def __init__(self, hostname, username = "", password = ""):
diff --git a/cli-tools/lmi/lmi_client_shell.py b/cli-tools/lmi/lmi_client_shell.py
index b40b5df..3dc7d9d 100644
--- a/cli-tools/lmi/lmi_client_shell.py
+++ b/cli-tools/lmi/lmi_client_shell.py
@@ -416,6 +416,7 @@ class _LmiInstance(BaseObject):
             return LmiReturnValue(
                 hostname = return_value.hostname,
                 instance = return_value.instance,
+                use_display_hook = True,
                 rval = return_value.rval,
                 rparams = lmi_rparams,
                 errorstr = return_value.errorstr)