Merge pull request #8135 from takluyver/bigsplit-qtconsole

Split out the Qt console

IPython/qt.py

@@ -0,0 +1,22
+"""
+Shim to maintain backwards compatibility with old IPython.qt imports.
+"""
+# Copyright (c) IPython Development Team.
+# Distributed under the terms of the Modified BSD License.
+
+from __future__ import print_function
+
+# Stdlib
+import sys
+import types
+from warnings import warn
+
+warn("The `IPython.qt` package has been deprecated. "
+     "You should import from jupyter_qtconsole instead.")
+
+from IPython.utils.shimmodule import ShimModule
+
+# Unconditionally insert the shim into sys.modules so that further import calls
+# trigger the custom attribute access above
+
+sys.modules['IPython.qt'] = ShimModule('qt', mirror='jupyter_qtconsole')

IPython/utils/shimmodule.py

@@ -0,0 +1,43
+"""A shim module for deprecated imports
+"""
+# Copyright (c) IPython Development Team.
+# Distributed under the terms of the Modified BSD License.
+
+import types
+
+class ShimModule(types.ModuleType):
+
+    def __init__(self, *args, **kwargs):
+        self._mirror = kwargs.pop("mirror")
+        super(ShimModule, self).__init__(*args, **kwargs)
+
+    def __getattr__(self, key):
+        # Use the equivalent of import_item(name), see below
+        name = "%s.%s" % (self._mirror, key)
+
+        # NOTE: the code below is copied *verbatim* from
+        # importstring.import_item. For some very strange reason that makes no
+        # sense to me, if we call it *as a function*, it doesn't work.  This
+        # has something to do with the deep bowels of the import machinery and
+        # I couldn't find a way to make the code work as a standard function
+        # call.  But at least since it's an unmodified copy of import_item,
+        # which is used extensively and has a test suite, we can be reasonably
+        # confident this is OK.  If anyone finds how to call the function, all
+        # the below could be replaced simply with:
+        #
+        # from IPython.utils.importstring import import_item
+        # return import_item('MIRROR.' + key)
+
+        parts = name.rsplit('.', 1)
+        if len(parts) == 2:
+            # called with 'foo.bar....'
+            package, obj = parts
+            module = __import__(package, fromlist=[obj])
+            try:
+                pak = module.__dict__[obj]
+            except KeyError:
+                raise AttributeError(obj)
+            return pak
+        else:
+            # called with un-dotted string
+            return __import__(parts[0])

.travis.yml

@@ -1,38 +1,38
 # http://travis-ci.org/#!/ipython/ipython
 language: python
 python:
     - 3.4
     - 2.7
 sudo: false
 env:
   global:
     - PATH=$TRAVIS_BUILD_DIR/pandoc:$PATH
   matrix:
     - GROUP=
     - GROUP=js/base
     - GROUP=js/notebook
     - GROUP=js/services
     - GROUP=js/tree
     - GROUP=js/widgets
 before_install:
     - 'if [[ $GROUP != js* ]]; then wget https://7de4dfdec62155b49b44-d726a73613a1989d29b147f20996e7c1.ssl.cf2.rackcdn.com/pandoc-1.12.3-linux-debian-x86_64.zip && unzip pandoc-1.12.3-linux-debian-x86_64.zip; fi'
     - 'if [[ $GROUP == js* ]]; then wget https://7de4dfdec62155b49b44-d726a73613a1989d29b147f20996e7c1.ssl.cf2.rackcdn.com/mathjax.zip; fi'
     - 'if [[ $GROUP == js* ]]; then npm install -g casperjs; fi'
     - git clone --quiet --depth 1 https://github.com/minrk/travis-wheels travis-wheels
     - 'if [[ $GROUP != js* ]]; then COVERAGE="--coverage xml"; fi'
 install:
-    - pip install -f travis-wheels/wheelhouse file://$PWD#egg=ipython[all] coveralls
+    - pip install -f travis-wheels/wheelhouse -e file://$PWD#egg=ipython[all] coveralls
 before_script:
     - 'if [[ $GROUP == js* ]]; then python -m IPython.external.mathjax mathjax.zip; fi'
 script:
     - cd /tmp && iptest $GROUP $COVERAGE && cd -
 
 matrix:
     include:
         - python: 3.3
           env: GROUP=
 
 after_success:
     - cp /tmp/ipy_coverage.xml ./
     - cp /tmp/.coverage ./
     - coveralls

IPython/frontend.py

@@ -1,79 +1,31
 """
 Shim to maintain backwards compatibility with old frontend imports.
 
 We have moved all contents of the old `frontend` subpackage into top-level
 subpackages (`html`, `qt` and `terminal`), and flattened the notebook into
 just `IPython.html`, formerly `IPython.frontend.html.notebook`.
 
 This will let code that was making `from IPython.frontend...` calls continue
 working, though a warning will be printed.
 """
 
-#-----------------------------------------------------------------------------
-#  Copyright (c) 2013, IPython Development Team.
-#
-#  Distributed under the terms of the Modified BSD License.
-#
-#  The full license is in the file COPYING.txt, distributed with this software.
-#-----------------------------------------------------------------------------
+# Copyright (c) IPython Development Team.
+# Distributed under the terms of the Modified BSD License.
 
-#-----------------------------------------------------------------------------
-# Imports
-#-----------------------------------------------------------------------------
 from __future__ import print_function
 
 # Stdlib
 import sys
 import types
 from warnings import warn
 
 warn("The top-level `frontend` package has been deprecated. "
      "All its subpackages have been moved to the top `IPython` level.")
 
-#-----------------------------------------------------------------------------
-# Class declarations
-#-----------------------------------------------------------------------------
-
-class ShimModule(types.ModuleType):
-    
-    def __init__(self, *args, **kwargs):
-        self._mirror = kwargs.pop("mirror")
-        super(ShimModule, self).__init__(*args, **kwargs)
-
-    def __getattr__(self, key):
-        # Use the equivalent of import_item(name), see below
-        name = "%s.%s" % (self._mirror, key)
-
-        # NOTE: the code below is copied *verbatim* from
-        # importstring.import_item. For some very strange reason that makes no
-        # sense to me, if we call it *as a function*, it doesn't work.  This
-        # has something to do with the deep bowels of the import machinery and
-        # I couldn't find a way to make the code work as a standard function
-        # call.  But at least since it's an unmodified copy of import_item,
-        # which is used extensively and has a test suite, we can be reasonably
-        # confident this is OK.  If anyone finds how to call the function, all
-        # the below could be replaced simply with:
-        #
-        # from IPython.utils.importstring import import_item
-        # return import_item('MIRROR.' + key)
-        
-        parts = name.rsplit('.', 1)
-        if len(parts) == 2:
-            # called with 'foo.bar....'
-            package, obj = parts
-            module = __import__(package, fromlist=[obj])
-            try:
-                pak = module.__dict__[obj]
-            except KeyError:
-                raise AttributeError(obj)
-            return pak
-        else:
-            # called with un-dotted string
-            return __import__(parts[0])
-
+from IPython.utils.shimmodule import ShimModule
 
 # Unconditionally insert the shim into sys.modules so that further import calls
 # trigger the custom attribute access above
 
 sys.modules['IPython.frontend.html.notebook'] = ShimModule('notebook', mirror='IPython.html')
 sys.modules['IPython.frontend'] = ShimModule('frontend', mirror='IPython')