remove appnope from external

make it a dependency on OS X

IPython/kernel/zmq/eventloops.py

@@ -11,19 +11,14 b' import zmq'
 
 from IPython.config.application import Application
 from IPython.utils import io
-
-
-def _on_os_x_10_9():
-    import platform
-    from distutils.version import LooseVersion as V
-    return sys.platform == 'darwin' and V(platform.mac_ver()[0]) >= V('10.9')
+from IPython.lib.inputhook import _use_appnope
 
 def _notify_stream_qt(kernel, stream):
     
     from IPython.external.qt_for_kernel import QtCore
     
-    if _on_os_x_10_9() and kernel._darwin_app_nap:
-        from IPython.external.appnope import nope_scope as context
+    if _use_appnope() and kernel._darwin_app_nap:
+        from appnope import nope_scope as context
     else:
         from IPython.core.interactiveshell import NoOpContext as context
 
@@ -93,10 +88,10 b' def loop_wx(kernel):'
     import wx
     from IPython.lib.guisupport import start_event_loop_wx
     
-    if _on_os_x_10_9() and kernel._darwin_app_nap:
+    if _use_appnope() and kernel._darwin_app_nap:
         # we don't hook up App Nap contexts for Wx,
         # just disable it outright.
-        from IPython.external.appnope import nope
+        from appnope import nope
         nope()
 
     doi = kernel.do_one_iteration

IPython/lib/inputhook.py

@@ -3,16 +3,8 b''
 Inputhook management for GUI event loop integration.
 """
 
-#-----------------------------------------------------------------------------
-#  Copyright (C) 2008-2011  The IPython Development Team
-#
-#  Distributed under the terms of the BSD License.  The full license is in
-#  the file COPYING, distributed as part of this software.
-#-----------------------------------------------------------------------------
-
-#-----------------------------------------------------------------------------
-# Imports
-#-----------------------------------------------------------------------------
+# Copyright (c) IPython Development Team.
+# Distributed under the terms of the Modified BSD License.
 
 try:
     import ctypes
@@ -21,6 +13,7 b' except ImportError:'
 except SystemError: # IronPython issue, 2/8/2014
     ctypes = None
 import os
+import platform
 import sys
 from distutils.version import LooseVersion as V
 
@@ -57,8 +50,14 b' def _stdin_ready_nt():'
 
 def _stdin_ready_other():
     """Return True, assuming there's something to read on stdin."""
-    return True #
+    return True
+
+def _use_appnope():
+    """Should we use appnope for dealing with OS X app nap?
 
+    Checks if we are on OS X 10.9 or greater.
+    """
+    return sys.platform == 'darwin' and V(platform.mac_ver()[0]) >= V('10.9')
 
 def _ignore_CTRL_C_posix():
     """Ignore CTRL+C (SIGINT)."""
@@ -317,9 +316,10 b' class WxInputHook(InputHookBase):'
             raise ValueError("requires wxPython >= 2.8, but you have %s" % wx.__version__)
         
         from IPython.lib.inputhookwx import inputhook_wx
-        from IPython.external.appnope import nope
         self.manager.set_inputhook(inputhook_wx)
-        nope()
+        if _use_appnope():
+            from appnope import nope
+            nope()
 
         import wx
         if app is None:
@@ -334,8 +334,9 b' class WxInputHook(InputHookBase):'
 
         This restores appnapp on OS X
         """
-        from IPython.external.appnope import nap
-        nap()
+        if _use_appnope():
+            from appnope import nap
+            nap()
 
 @inputhook_manager.register('qt', 'qt4')
 class Qt4InputHook(InputHookBase):
@@ -362,10 +363,11 b' class Qt4InputHook(InputHookBase):'
             app = QtGui.QApplication(sys.argv)
         """
         from IPython.lib.inputhookqt4 import create_inputhook_qt4
-        from IPython.external.appnope import nope
-        app, inputhook_qt4 = create_inputhook_qt4(self.manager, app)
+        app, inputhook_qt4 = create_inputhook_qt4(self, app)
         self.manager.set_inputhook(inputhook_qt4)
-        nope()
+        if _use_appnope():
+            from appnope import nope
+            nope()
 
         return app
 
@@ -374,8 +376,9 b' class Qt4InputHook(InputHookBase):'
 
         This restores appnapp on OS X
         """
-        from IPython.external.appnope import nap
-        nap()
+        if _use_appnope():
+            from appnope import nap
+            nap()
 
 
 @inputhook_manager.register('qt5')

setup.py

@@ -275,6 +275,7 b' install_requires = ['
 
 # add readline
 if sys.platform == 'darwin':
+    install_requires.append('appnope')
     if 'bdist_wheel' in sys.argv[1:] or not setupext.check_for_readline():
         install_requires.append('gnureadline')
 elif sys.platform.startswith('win'):

setupbase.py

@@ -670,7 +670,7 b' def get_bdist_wheel():'
                     if found:
                         lis.pop(idx)
                 
-                for pkg in ("gnureadline", "pyreadline", "mock", "terminado"):
+                for pkg in ("gnureadline", "pyreadline", "mock", "appnope", "terminado"):
                     _remove_startswith(requires, pkg)
                 requires.append("gnureadline; sys.platform == 'darwin' and platform.python_implementation == 'CPython'")
                 requires.append("terminado (>=0.3.3); extra == 'notebook' and sys.platform != 'win32'")
@@ -678,6 +678,7 b' def get_bdist_wheel():'
                 requires.append("pyreadline (>=2.0); extra == 'terminal' and sys.platform == 'win32' and platform.python_implementation == 'CPython'")
                 requires.append("pyreadline (>=2.0); extra == 'all' and sys.platform == 'win32' and platform.python_implementation == 'CPython'")
                 requires.append("mock; extra == 'test' and python_version < '3.3'")
+                requires.append("appnope; sys.platform == 'darwin'")
                 for r in requires:
                     pkg_info['Requires-Dist'] = r
                 write_pkg_info(metadata_path, pkg_info)