eric: comparison eric6/Debugger/VariablesViewer.py

-:fb0ef164f536
+:698ae46f40a4
 Module implementing the variables viewer view based on QTreeView.
 """
 import ast
 import re
+import contextlib
 from PyQt5.QtCore import (
 Qt, QAbstractItemModel, QModelIndex, QCoreApplication,
 QSortFilterProxyModel, pyqtSignal
 )
 import Utilities
 SORT_ROLE = Qt.ItemDataRole.UserRole
-class VariableItem(object):
+class VariableItem:
 """
 Class implementing the data structure for all variable items.
 """
 Type2Indicators = {
 # Python types
 """
 # Python class?
 if dtype.startswith('class '):
 dtype = dtype[7:-1]
 # Qt related stuff?
-elif (dtype.startswith(ConfigQtNames) and
+elif (
-dtype.endswith(ConfigKnownQtTypes)):
+(dtype.startswith(ConfigQtNames) and
-self.hasChildren = True
+dtype.endswith(ConfigKnownQtTypes)) or
+dtype in ('instance', 'class')
-elif dtype in ('instance', 'class'):
+):
 self.hasChildren = True
 # Special Qt types should not be expanded infinite
 elif ".{0}".format(dtype) in ConfigKnownQtTypes:
 self.type = dtype  # It's a Qt type, so skipping translation is ok
 elif dtype == "Shiboken.EnumType":
 self.hasChildren = True
 elif dtype == 'str':
 if VariableItem.rx_nonprintable.search(dvalue) is None:
-try:
+with contextlib.suppress(Exception):
 dvalue = ast.literal_eval(dvalue)
-except Exception:       # secok
-pass
 dvalue = str(dvalue)
 self.value = dvalue
 if len(dvalue) > 2048:     # 2 kB
 @type VariablesViewer
 @param globalScope flag indicating global (True) or local (False)
 variables
 @type bool
 """
-super(VariablesModel, self).__init__()
+super().__init__()
 self.treeView = treeView
 self.proxyModel = treeView.proxyModel
 self.framenr = -1
 self.openItems = []
 self.closedItems = []
-if globalScope:
+visibility = self.tr("Globals") if globalScope else self.tr("Locals")
-visibility = self.tr("Globals")
-else:
-visibility = self.tr("Locals")
 self.rootNode = VariableItem(None, visibility, self.tr("Type"),
 self.tr("Value"))
 self.__globalScope = globalScope
 @param parentIdx item to reset marker
 @type QModelIndex
 @param pathlist full path to the variable
 @type list of str
 """
-if parentIdx.isValid():
+parent = (parentIdx.internalPointer() if parentIdx.isValid()
-parent = parentIdx.internalPointer()
+else self.rootNode)
-else:
-parent = self.rootNode
 parent.newItems.clear()
 parent.changedItems.clear()
 pll = len(pathlist)
 posPaths |= {x for x in self.closedItems if len(x) > pll}
 posPaths = {x[pll] for x in posPaths if x[:pll] == pathlist}
 if posPaths:
 for child in parent.children:
-if child.hasChildren and child.nameWithId in posPaths:
+if (
-if child.currentCount >= 0:
+child.hasChildren and
-# Discard loaded elements and refresh if still expanded
+child.nameWithId in posPaths and
-child.currentCount = -1
+child.currentCount >= 0
-child.populated = False
+):
-row = parent.children.index(child)
+# Discard loaded elements and refresh if still expanded
-newParentIdx = self.index(row, 0, parentIdx)
+child.currentCount = -1
-self.resetModifiedMarker(
+child.populated = False
-newParentIdx, pathlist + (child.nameWithId,))
+row = parent.children.index(child)
+newParentIdx = self.index(row, 0, parentIdx)
+self.resetModifiedMarker(
+newParentIdx, pathlist + (child.nameWithId,))
 self.closedItems = []
 # Little quirk: Refresh all visible items to clear the changed marker
 if parentIdx == QModelIndex():
 @param parent the model parent
 @type QModelIndex
 @return number of rows
 @rtype int
 """
-if parent.isValid():
+node = parent.internalPointer() if parent.isValid() else self.rootNode
-node = parent.internalPointer()
-else:
-node = self.rootNode
 return len(node.children)
 def flags(self, index):
 """
 @rtype QModelIndex
 """
 if not self.hasIndex(row, column, parent):
 return QModelIndex()
-if not parent.isValid():
+node = parent.internalPointer() if parent.isValid() else self.rootNode
-node = self.rootNode
-else:
-node = parent.internalPointer()
 return self.createIndex(row, column, node.children[row])
 def parent(self, child):
 """
 if column == 0:
 # Sort first column with values from third column
 if role == SORT_ROLE:
 return node.sort
 return node.name + node.indicator
-elif column == 1:
-return node.valueShort
-elif column == 2:
-return node.type
-elif column == 3:
-return node.sort
 else:
-return None
+return {
+1: node.valueShort,
+2: node.type,
+3: node.sort
+}.get(column)
 except AttributeError:
 return ['None', '', '', ''][column]
 elif role == Qt.ItemDataRole.BackgroundRole:
 if node in node.parent.changedItems:
 role != Qt.ItemDataRole.DisplayRole or
 orientation != Qt.Orientation.Horizontal
 ):
 return None
-if section == 0:
+return {
-return self.rootNode.name
+0: self.rootNode.name,
-elif section == 1:
+1: self.rootNode.value,
-return self.rootNode.value
+2: self.rootNode.type,
-elif section == 2:
+3: self.rootNode.sort
-return self.rootNode.type
+}.get(section)
-elif section == 3:
-return self.rootNode.sort
-return None
 def __findPendingItem(self, parent=None, pathlist=()):
 """
 Private method to find the next item to request data from debugger.
 Constructor
 @param parent the parent model index
 @type QModelIndex
 """
-super(VariablesProxyModel, self).__init__(parent)
+super().__init__(parent)
 self.setSortRole(SORT_ROLE)
 def hasChildren(self, parent):
 """
 Public method to get a flag if parent has children.
 variables
 @type bool
 @param parent the parent
 @type QWidget
 """
-super(VariablesViewer, self).__init__(parent)
+super().__init__(parent)
 self.__debugViewer = viewer
 self.__globalScope = globalScope
 self.framenr = 0
 @param value current value of the vertical scrollbar
 @type int
 """
 self.varModel.getMore()
-super(VariablesViewer, self).verticalScrollbarValueChanged(value)
+super().verticalScrollbarValueChanged(value)
 def resizeEvent(self, event):
 """
 Protected slot informing about the widget size change.
 @param event information
 @type QResizeEvent
 """
 self.varModel.getMore()
-super(VariablesViewer, self).resizeEvent(event)
+super().resizeEvent(event)
 def __itemDoubleClicked(self, index):
 """
 Private method called if an item was double clicked.

Mercurial Repositories > eric / file comparison

comparison: eric6/Debugger/VariablesViewer.py

eric6/Debugger/VariablesViewer.py