diff --git a/XSConsoleCurses.py b/XSConsoleCurses.py index 46a0e78..59db922 100644 --- a/XSConsoleCurses.py +++ b/XSConsoleCurses.py @@ -278,11 +278,11 @@ def Snapshot(self): if self.title != "": retVal.append(self.title) if self.hasBox: - for i in range(1, self.ySize-1): - retVal.append(self.win.instr(i, 1, self.xSize-2)) + for i in range(1, self.ySize - 1): + retVal.append(self.win.instr(i, 1, self.xSize - 2).decode('utf-8')) else: for i in range(self.ySize): - retVal.append(self.win.instr(i, 0, self.xSize)) + retVal.append(self.win.instr(i, 0, self.xSize).decode('utf-8')) return retVal diff --git a/plugins-base/XSFeatureSRCommon.py b/plugins-base/XSFeatureSRCommon.py index 83390de..f6a7370 100644 --- a/plugins-base/XSFeatureSRCommon.py +++ b/plugins-base/XSFeatureSRCommon.py @@ -211,7 +211,7 @@ def UpdateFieldsINITIAL(self): pane.ResetFields() sr = HotAccessor().sr[self.srHandle] - srName = sr.name_label(None).encode('utf-8') + srName = sr.name_label(None) if srName is None: pane.AddTitleField(Lang("The Virtual Machine is no longer present")) else: @@ -226,7 +226,7 @@ def UpdateFieldsCONFIRM(self): pane.ResetFields() sr = HotAccessor().sr[self.srHandle] - srName = sr.name_label(None).encode('utf-8') + srName = sr.name_label(None) if srName is None: pane.AddTitleField(Lang("The Storage Repository is no longer present")) else: @@ -282,7 +282,7 @@ def Commit(self): Layout.Inst().PopDialogue() operationName = SRUtils.OperationName(self.operation) - srName = HotAccessor().sr[self.srHandle].name_label(Lang('')).encode('utf-8') + srName = HotAccessor().sr[self.srHandle].name_label(Lang('')) messagePrefix = operationName + Lang(' operation on ') + srName + ' ' Layout.Inst().TransientBanner(messagePrefix+Lang('in progress...')) try: diff --git a/plugins-base/XSFeatureVMCommon.py b/plugins-base/XSFeatureVMCommon.py index 20b3955..a1a78d1 100644 --- a/plugins-base/XSFeatureVMCommon.py +++ b/plugins-base/XSFeatureVMCommon.py @@ -169,7 +169,7 @@ def UpdateFieldsINITIAL(self): pane.ResetFields() vm = HotAccessor().guest_vm[self.vmHandle] - vmName = vm.name_label(None).encode('utf-8') + vmName = vm.name_label(None) if vmName is None: pane.AddTitleField(Lang("The Virtual Machine is no longer present")) else: @@ -190,7 +190,7 @@ def UpdateFieldsCONFIRM(self): pane.ResetFields() vm = HotAccessor().vm[self.vmHandle] - vmName = vm.name_label(None).encode('utf-8') + vmName = vm.name_label(None) if vmName is None: pane.AddTitleField(Lang("The Virtual Machine is no longer present")) else: @@ -252,7 +252,7 @@ def Commit(self): Layout.Inst().PopDialogue() operationName = VMUtils.OperationName(self.operation) - vmName = HotAccessor().guest_vm[self.vmHandle].name_label(Lang('')).encode('utf-8') + vmName = HotAccessor().guest_vm[self.vmHandle].name_label(Lang('')) messagePrefix = operationName + Lang(' operation on ') + vmName + ' ' try: task = VMUtils.AsyncOperation(self.operation, self.vmHandle, *self.opParams)