From 61d74d31fa5b70de4a874d3f704dbb7c0397a183 Mon Sep 17 00:00:00 2001 From: Aaron Ayres Date: Wed, 19 May 2021 17:17:54 -0500 Subject: [PATCH 1/5] call HasPrivateTraits.__init__() in GroupEditor.__init__ --- traitsui/qt4/ui_panel.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/traitsui/qt4/ui_panel.py b/traitsui/qt4/ui_panel.py index 683b0fbe4..f74caeea0 100644 --- a/traitsui/qt4/ui_panel.py +++ b/traitsui/qt4/ui_panel.py @@ -28,7 +28,7 @@ from pyface.qt import QtCore, QtGui -from traits.api import Any, Instance, Undefined +from traits.api import Any, Instance, Undefined, HasPrivateTraits from traits.observation.api import match from traitsui.api import Group @@ -1259,6 +1259,7 @@ class GroupEditor(Editor): def __init__(self, **traits): """ Initialise the object. """ + HasPrivateTraits.__init__(self, **traits) self.trait_set(**traits) From 94428bcdab44b70b2060c5e33bb0558868e988ce Mon Sep 17 00:00:00 2001 From: Aaron Ayres Date: Wed, 19 May 2021 17:20:50 -0500 Subject: [PATCH 2/5] alphabetize imports --- traitsui/qt4/ui_panel.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/traitsui/qt4/ui_panel.py b/traitsui/qt4/ui_panel.py index f74caeea0..3c37168a6 100644 --- a/traitsui/qt4/ui_panel.py +++ b/traitsui/qt4/ui_panel.py @@ -28,7 +28,7 @@ from pyface.qt import QtCore, QtGui -from traits.api import Any, Instance, Undefined, HasPrivateTraits +from traits.api import Any, Instance, HasPrivateTraits, Undefined from traits.observation.api import match from traitsui.api import Group From 7a817dc0c39b07a88cad3ff417412dd22c10c8bc Mon Sep 17 00:00:00 2001 From: Aaron Ayres Date: Wed, 19 May 2021 17:21:23 -0500 Subject: [PATCH 3/5] alphabetize imports (for real this time) --- traitsui/qt4/ui_panel.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/traitsui/qt4/ui_panel.py b/traitsui/qt4/ui_panel.py index 3c37168a6..517c4ef4e 100644 --- a/traitsui/qt4/ui_panel.py +++ b/traitsui/qt4/ui_panel.py @@ -28,7 +28,7 @@ from pyface.qt import QtCore, QtGui -from traits.api import Any, Instance, HasPrivateTraits, Undefined +from traits.api import Any, HasPrivateTraits, Instance, Undefined from traits.observation.api import match from traitsui.api import Group From e72258fdce1973c576f6def86cba486c20ca24eb Mon Sep 17 00:00:00 2001 From: Aaron Ayres Date: Mon, 21 Jun 2021 07:03:43 -0500 Subject: [PATCH 4/5] add comment on why we call HasPrivateTraits.__init__ --- traitsui/qt4/ui_panel.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/traitsui/qt4/ui_panel.py b/traitsui/qt4/ui_panel.py index 517c4ef4e..18ef6b870 100644 --- a/traitsui/qt4/ui_panel.py +++ b/traitsui/qt4/ui_panel.py @@ -1259,6 +1259,9 @@ class GroupEditor(Editor): def __init__(self, **traits): """ Initialise the object. """ + # We intentionally don't want to call Editor.__init__ here as + # GroupEditor does its own thing. However, we still want Traits + # machinery to be set up properly. HasPrivateTraits.__init__(self, **traits) self.trait_set(**traits) From 64849e904e4bf910708c136428b600fda3ba832d Mon Sep 17 00:00:00 2001 From: Aaron Ayres Date: Mon, 21 Jun 2021 07:18:52 -0500 Subject: [PATCH 5/5] add changelog entry --- docs/releases/upcoming/1674.bugfix.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 docs/releases/upcoming/1674.bugfix.rst diff --git a/docs/releases/upcoming/1674.bugfix.rst b/docs/releases/upcoming/1674.bugfix.rst new file mode 100644 index 000000000..1183d8ef5 --- /dev/null +++ b/docs/releases/upcoming/1674.bugfix.rst @@ -0,0 +1 @@ +Call HasPrivateTraits.__init__() in GroupEditor.__init__ (#1674) \ No newline at end of file