eric: comparison Debugger/VariablesViewer.py

-:74e000797a93
+:f1e9eebd5469
 pass
 from PyQt5.QtCore import Qt, QRegExp, qVersion, QCoreApplication
 from PyQt5.QtWidgets import QTreeWidget, QTreeWidgetItem, QAbstractItemView, \
 QMenu
-from PyQt5.QtGui import QTextDocument   # __IGNORE_WARNING__
 from E5Gui.E5Application import e5App
-from DebugClients.Python3.DebugConfig import ConfigVarTypeStrings
 from .Config import ConfigVarTypeDispStrings
 import Preferences
 import Utilities
 class VariableItem(QTreeWidgetItem):
 """
 Class implementing the data structure for variable items.
 """
+Indicators = ("()", "[]", "{:}", "{}")      # __IGNORE_WARNING_M613__
+Type2Indicators = {
+# Python types
+'list': '[]',
+'tuple': '()',
+'dict': '{:}',                          # __IGNORE_WARNING_M613__
+'set': '{}',                            # __IGNORE_WARNING_M613__
+'frozenset': '{}',                      # __IGNORE_WARNING_M613__
+}
 def __init__(self, parent, dvar, dvalue, dtype):
 """
 Constructor
 @param parent reference to the parent item
 @param dvar variable name (string)
 @param dvalue value string (string)
 @param dtype type string (string)
 """
+dvar, self.__varID = VariableItem.extractId(dvar)
 self.__value = dvalue
 if len(dvalue) > 2048:     # 1024 * 2
 dvalue = QCoreApplication.translate(
 "VariableItem", "<double click to show value>")
 self.__tooltip = dvalue
 Public method to return the value of the item.
 @return value of the item (string)
 """
 return self.__value
+def getId(self):
+"""
+Public method to get the ID string.
+@return ID string
+@rtype str
+"""
+return self.__varID
+@classmethod
+def extractId(cls, var):
+"""
+Class method to extract the ID string from a variable text.
+@param var variable text
+@type str
+@return tuple containing the variable text without ID and the ID string
+@rtype tuple of two str
+"""
+if " (ID:" in var:
+dvar, varID = var.rsplit(None, 1)
+if varID.endswith(VariableItem.Indicators):
+varID, indicators = VariableItem.extractIndicators(varID)
+dvar += indicators
+else:
+dvar = var
+varID = None
+return dvar, varID
+@classmethod
+def extractIndicators(cls, var):
+"""
+Class method to extract the indicator string from a variable text.
+@param var variable text
+@type str
+@return tuple containing the variable text without indicators and the
+indicator string
+@rtype tuple of two str
+"""
+for indicator in VariableItem.Indicators:
+if var.endswith(indicator):
+return var[:-len(indicator)], indicator
+return var, ""
+def _buildKey(self):
+"""
+Protected method to build the access key for the variable.
+@return access key
+@type str
+"""
+indicators = ""
+txt = self.text(0)
+if txt.endswith(VariableItem.Indicators):
+txt, indicators = VariableItem.extractIndicators(txt)
+if self.__varID:
+txt = "{0} {1}{2}".format(txt, self.__varID, indicators)
+else:
+txt = "{0}{1}".format(txt, indicators)
+return txt
 def data(self, column, role):
 """
 Public method to return the data for the requested role.
 This implementation changes the original behavior in a way, that the
 Public method to expand the item.
 """
 self.deleteChildren()
 self.populated = True
-pathlist = [self.text(0)]
+pathlist = [self._buildKey()]
 par = self.parent()
 # step 1: get a pathlist up to the requested variable
 while par is not None:
-pathlist.insert(0, par.text(0))
+pathlist.insert(0, par._buildKey())
 par = par.parent()
 # step 2: request the variable from the debugger
 filter = e5App().getObject("DebugUI").variablesFilter(self.globalScope)
 e5App().getObject("DebugServer").remoteClientVariable(
 Array elements have numbers as names, but the key must be
 right justified and zero filled to 6 decimal places. Then
 element 2 will have a key of '000002' and appear before
 element 10 with a key of '000010'
 """
-col0Str = self.text(0)[:-2]  # strip off [], () or {}
+# strip off [], () or {}
-indicator = self.text(0)[-2:]
+col0Str, indicators = VariableItem.extractIndicators(self.text(0))
-self.setText(0, "{0:6d}{1}".format(int(col0Str), indicator))
+self.setText(0, "{0:6d}{1}".format(int(col0Str), indicators))
 class VariablesViewer(QTreeWidget):
 """
 Class implementing the variables viewer widget.
 """
 super(VariablesViewer, self).__init__(parent)
 self.__debugViewer = viewer
 self.__globalScope = globalScope
-self.indicators = {
-# Python types
-'list': '[]',
-'tuple': '()',
-'dict': '{}',                  # __IGNORE_WARNING__
-}
 self.rx_class = QRegExp('<.*(instance|object) at 0x.*>')
 self.rx_class2 = QRegExp('class .*')
 self.rx_class3 = QRegExp('<class .* at 0x.*>')
 self.dvar_rx_class1 = QRegExp(
 if node is None:
 count = self.topLevelItemCount()
 else:
 count = node.childCount()
+if column == 0:
+searchStr = VariableItem.extractId(slist[0])[0]
+else:
+searchStr = slist[0]
 for index in range(count):
 if node is None:
 itm = self.topLevelItem(index)
 else:
 itm = node.child(index)
-if itm.text(column) == slist[0]:
+if itm.text(column) == searchStr:
 if len(slist) > 1:
 itm = self.__findItem(slist[1:], column, itm)
 return itm
 return None
 @return The item that was added to the listview (QTreeWidgetItem).
 """
 if parent is None:
 parent = self
 try:
-dvar = '{0}{1}'.format(var, self.indicators[vtype])
+dvar = '{0}{1}'.format(var, VariableItem.Type2Indicators[vtype])
 except KeyError:
 dvar = var
 dvtype = self.__getDispType(vtype)
-if vtype in ['list', 'Array', 'tuple', 'dict', 'Hash']:
+if vtype in ['list', 'tuple', 'dict', 'set', 'frozenset']:
 itm = self.__generateItem(parent, dvar,
 self.tr("{0} items").format(value),
 dvtype, True)
 elif vtype in ['unicode', 'str']:
 if self.rx_nonprintable.indexIn(value) != -1:
 @param vtype the type, the display string should be looked up for
 (string)
 @return displaystring (string)
 """
 try:
-i = ConfigVarTypeStrings.index(vtype)
+dvtype = self.tr(ConfigVarTypeDispStrings[vtype])
-dvtype = self.tr(ConfigVarTypeDispStrings[i])
+except KeyError:
-except ValueError:
 if vtype == 'classobj':
-dvtype = self.tr(ConfigVarTypeDispStrings[
+dvtype = self.tr(ConfigVarTypeDispStrings['instance'])
-ConfigVarTypeStrings.index('instance')])
 else:
 dvtype = vtype
 return dvtype
 def __refreshView(self):
 if not val:
 return  # do not display anything, if the variable has no value
 vtype = itm.text(2)
-name = itm.text(0)
+name = VariableItem.extractIndicators(itm.text(0).strip())[0]
-if name[-2:] in ['[]', '{}', '()']:         # __IGNORE_WARNING__
-name = name[:-2]
 par = itm.parent()
 nlist = [name]
 # build up the fully qualified name
 while par is not None:
-pname = par.text(0)
+pname, indicators = VariableItem.extractIndicators(
-if pname[-2:] in ['[]', '{}', '()']:    # __IGNORE_WARNING__
+par.text(0).strip())
+if indicators:
 if nlist[0].endswith("."):
 nlist[0] = '[{0}].'.format(nlist[0][:-1])
 else:
 nlist[0] = '[{0}]'.format(nlist[0])
-nlist.insert(0, pname[:-2])
+nlist.insert(0, pname)
 else:
 nlist.insert(0, '{0}.'.format(pname))
 par = par.parent()
 name = ''.join(nlist)

Mercurial Repositories > eric / file comparison

comparison: Debugger/VariablesViewer.py

Debugger/VariablesViewer.py