Testing

spyder-ide · Mar 4, 2019 · 31db31d · 31db31d
1 parent cd79ccc
commit 31db31d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/spyder/plugins/variableexplorer/widgets/objecteditor2/objecteditor.py b/spyder/plugins/variableexplorer/widgets/objecteditor2/objecteditor.py
@@ -81,7 +81,7 @@ def __init__(self,
         :param reset: If true the persistent settings, such as column widths,
             are reset.
         """
-        super(ObjectBrowser, self).__init__(parent=parent)
+        QDialog.__init__(self, parent=parent)
 
         self._instance_nr = self._add_instance()
 

diff --git a/spyder/plugins/variableexplorer/widgets/objecteditor2/tree_item.py b/spyder/plugins/variableexplorer/widgets/objecteditor2/tree_item.py
@@ -16,6 +16,7 @@
 import logging
 
 # Local imports
+from spyder.config.base import _
 from spyder.plugins.variableexplorer.widgets.objecteditor2.utils import (
     cut_off_str)
 
@@ -48,19 +49,19 @@ def __init__(self, obj, name, obj_path, is_attribute, parent=None):
     def __str__(self):
         n_children = len(self.child_items)
         if n_children == 0:
-            return "<TreeItem(0x{:x}): {} = {}>".format(
+            return _("<TreeItem(0x{:x}): {} = {}>").format(
                 id(self.obj),
                 self.obj_path,
                 cut_off_str(self.obj, MAX_OBJ_STR_LEN))
         else:
-            return "<TreeItem(0x{:x}): {} ({:d} children)>".format(
+            return _("<TreeItem(0x{:x}): {} ({:d} children)>").format(
                 id(self.obj),
                 self.obj_path,
                 len(self.child_items))
 
     def __repr__(self):
         n_children = len(self.child_items)
-        return "<TreeItem(0x{:x}): {} ({:d} children)>" \
+        return _("<TreeItem(0x{:x}): {} ({:d} children)>") \
             .format(id(self.obj), self.obj_path, n_children)
 
     @property

diff --git a/spyder/plugins/variableexplorer/widgets/tests/test_collectioneditor.py b/spyder/plugins/variableexplorer/widgets/tests/test_collectioneditor.py
@@ -362,6 +362,11 @@ def test_editor_parent_set(monkeypatch):
                               'collectionseditor.TextEditor')
     monkeypatch.setattr(attr_to_patch_textedit, MockTextEditor)
 
+    MockObjectEditor = Mock()
+    attr_to_patch_objecteditor = ('spyder.plugins.variableexplorer.widgets.' +
+                                  'objecteditor2.objecteditor.ObjectBrowser')
+    monkeypatch.setattr(attr_to_patch_objecteditor, MockObjectEditor)
+
     editor_data = [[0, 1, 2, 3, 4],
                    numpy.array([1.0, 42.0, 1337.0]),
                    pandas.DataFrame([[1, 2, 3], [20, 30, 40]]),
@@ -374,7 +379,7 @@ def test_editor_parent_set(monkeypatch):
                                       MockArrayEditor,
                                       MockDataFrameEditor,
                                       MockTextEditor,
-                                      MockCollectionsEditor]):
+                                      MockObjectEditor]):
         col_editor.delegate.createEditor(col_editor.parent(), None,
                                          col_editor.model.createIndex(idx, 3))
         assert mock_class.call_count == 1 + (idx // 3)