fixes issue #87 #88

Merged
merged 4 commits into from Jun 4, 2013

3 participants

@itziakos
Enthought, Inc. member

This pr fixes issue #87 and provides a tests for regression checking.

@cfarrow cfarrow and 1 other commented on an outdated diff Jun 3, 2013
pyface/tasks/task_layout.py
@@ -3,7 +3,7 @@
import sys
# Enthought library imports.
-from traits.api import Either, Enum, HasStrictTraits, Int, List, Str, This
+from traits.api import Either, Enum, HasStrictTraits, Int, Instance, List, Str, This
@cfarrow
Enthought, Inc. member
cfarrow added a line comment Jun 3, 2013

This is no longer used.

@itziakos
Enthought, Inc. member
itziakos added a line comment Jun 4, 2013

Done

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@cfarrow cfarrow and 1 other commented on an outdated diff Jun 3, 2013
pyface/tasks/task_layout.py
@@ -132,7 +132,8 @@ class Splitter(LayoutContainer):
# The sub-items of the splitter, which are PaneItems, Tabbed layouts, and
# other Splitters.
- items = List(Either(PaneItem, Tabbed, This), pretty_skip=True)
+ items = List(Either(PaneItem, Tabbed,
+ Instance('pyface.tasks.api.Splitter')), pretty_skip=True)
@cfarrow
Enthought, Inc. member
cfarrow added a line comment Jun 3, 2013

This should refer to pyface.tasks.task_layout.Splitter to avoid unnecessarily importing the api module.

@itziakos
Enthought, Inc. member
itziakos added a line comment Jun 4, 2013

Done

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@pberkes

LGTM, modulo Chris' comments

@pberkes

👍

@cfarrow cfarrow merged commit 30d12d5 into master Jun 4, 2013
@cfarrow cfarrow deleted the fix-issue-87 branch Jun 4, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment