Skip to content

Use appnope in qt and wx gui support from the terminal; closes #6189 - #6321

Merged
minrk merged 1 commit into
ipython:2.xfrom
efiring:fix_nap_qt_wx
Aug 17, 2014
Merged

minrk merged 1 commit into
ipython:2.xfrom
efiring:fix_nap_qt_wx

Conversation

@efiring

@efiring efiring commented Aug 16, 2014

Copy link
Copy Markdown
Contributor

On Mavericks, the qt and wx gui support was unusable from the
ipython console in a terminal. Using nope() in enable_qt4 and
enable_wx, and reversing with nap() in disable_qt4 and disable_wx,
solves the problem.

…n#6189

On Mavericks, the qt and wx gui support was unusable from the
ipython console in a terminal.  Using nope() in enable_qt4 and
enable_wx, and reversing with nap() in disable_qt4 and disable_wx,
solves the problem.
@efiring

efiring commented Aug 16, 2014

Copy link
Copy Markdown
Contributor Author

I have tested this only with qt, not with wx.

@jenshnielsen

Copy link
Copy Markdown
Contributor

Confirming that this resolves the issue with both the wx and qt event loop integration.

Comment thread IPython/lib/inputhook.py

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this wants to be wrapped in a check for OS X 10.9, as in loop_wx (skip the kernel._ part, since that doesn't apply in inputhook).

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This check is already included in appnap.init; nope() and nap() are dummied out if not in OS X 10.9.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fair enough. I forgot I had done that.

@minrk

minrk commented Aug 16, 2014

Copy link
Copy Markdown
Member

This makes perfect sense. I made one comment about protecting the use of appnope to only OS X ≥ 10.9 like we do elsewhere, but otherwise AOK.

We do try to avoid whitespace-stripping commits, but this one is small enough that I don't mind.

@minrk minrk added this to the 2.3 milestone Aug 17, 2014
minrk added a commit that referenced this pull request Aug 17, 2014
Use appnope in qt and wx gui support from the terminal; closes #6189
@minrk
minrk merged commit 9d6cfce into ipython:2.x Aug 17, 2014
@minrk

minrk commented Aug 17, 2014

Copy link
Copy Markdown
Member

Oh, crap. I didn't realize this was a PR against 2.x until too late. I shouldn't have merged it. We don't normally accept any PRs against 2.x, we only accept PRs against master, which we later backport to 2.x.

@minrk

minrk commented Aug 17, 2014

Copy link
Copy Markdown
Member

Opened against master as #6325.

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants