Mercurial Repositories > eric / file diff

--- a/eric6/Debugger/VariablesViewer.py	Sat Oct 10 16:03:53 2020 +0200
+++ b/eric6/Debugger/VariablesViewer.py	Sun Oct 11 17:54:52 2020 +0200
@@ -7,11 +7,13 @@
 Module implementing the variables viewer view based on QTreeView.
 """
 
+import ast
+import re
 
-import ast
-    
-from PyQt5.QtCore import (Qt, QAbstractItemModel, QModelIndex, QRegExp,
-                          QCoreApplication, QSortFilterProxyModel, pyqtSignal)
+from PyQt5.QtCore import (
+    Qt, QAbstractItemModel, QModelIndex, QCoreApplication,
+    QSortFilterProxyModel, pyqtSignal
+)
 from PyQt5.QtGui import QBrush, QFontMetrics
 from PyQt5.QtWidgets import QTreeView, QAbstractItemView, QToolTip, QMenu
 
@@ -41,7 +43,7 @@
     }
     
     # Initialize regular expression for unprintable strings
-    rx_nonprintable = QRegExp(r"""(\\x\d\d)+""")
+    rx_nonprintable = re.compile(r"""(\\x\d\d)+""")
     
     noOfItemsStr = QCoreApplication.translate("VariablesViewer", "{0} items")
     unsized = QCoreApplication.translate("VariablesViewer", "unsized")
@@ -194,7 +196,7 @@
             self.hasChildren = True
             
         elif dtype in ['str', 'unicode']:
-            if VariableItem.rx_nonprintable.indexIn(dvalue) == -1:
+            if VariableItem.rx_nonprintable.search(dvalue) is None:
                 try:
                     dvalue = ast.literal_eval(dvalue)
                 except Exception:       # secok