Merge pull request ipython#3450 from ipython/flatten

Flatten IPython.frontend, moving all its components to the top-level of IPython.

This includes a shim module that allows older projects to maintain backwards compatibility while warning them loudly about the change, so they can adapt to the new API.

.gitignore

@@ -5,7 +5,7 @@ _build
 docs/man/*.gz
 docs/source/api/generated
 docs/gh-pages
-IPython/frontend/html/notebook/static/mathjax
+IPython/html/notebook/static/mathjax
 *.py[co]
 __pycache__
 build

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "components"]
-	path = IPython/frontend/html/notebook/static/components
+	path = IPython/html/static/components
 	url = https://github.com/ipython/ipython-components.git

IPython/__init__.py

@@ -44,7 +44,7 @@
 from .core.getipython import get_ipython
 from .core import release
 from .core.application import Application
-from .frontend.terminal.embed import embed
+from .terminal.embed import embed
 
 from .core.error import TryNext
 from .core.interactiveshell import InteractiveShell

IPython/__main__.py

@@ -9,6 +9,6 @@
 #  The full license is in the file COPYING.txt, distributed with this software.
 #-----------------------------------------------------------------------------
 
-from IPython.frontend.terminal.ipapp import launch_new_instance
+from IPython.terminal.ipapp import launch_new_instance
 
 launch_new_instance()

IPython/frontend/consoleapp.py → IPython/consoleapp.py

@@ -2,7 +2,7 @@
 
 This is not a complete console app, as subprocess will not be able to receive
 input, there is no real readline support, among other limitations. This is a
-refactoring of what used to be the IPython/frontend/qt/console/qtconsoleapp.py
+refactoring of what used to be the IPython/qt/console/qtconsoleapp.py
 
 Authors:
 

IPython/core/profileapp.py

@@ -238,10 +238,10 @@ def parse_command_line(self, argv):
     def init_config_files(self):
         super(ProfileCreate, self).init_config_files()
         # use local imports, since these classes may import from here
-        from IPython.frontend.terminal.ipapp import TerminalIPythonApp
+        from IPython.terminal.ipapp import TerminalIPythonApp
         apps = [TerminalIPythonApp]
         try:
-            from IPython.frontend.qt.console.qtconsoleapp import IPythonQtConsoleApp
+            from IPython.qt.console.qtconsoleapp import IPythonQtConsoleApp
         except Exception:
             # this should be ImportError, but under weird circumstances
             # this might be an AttributeError, or possibly others
@@ -250,7 +250,7 @@ def init_config_files(self):
         else:
             apps.append(IPythonQtConsoleApp)
         try:
-            from IPython.frontend.html.notebook.notebookapp import NotebookApp
+            from IPython.html.notebookapp import NotebookApp
         except ImportError:
             pass
         except Exception:

IPython/core/tests/test_display.py

@@ -29,7 +29,7 @@ def test_image_filename_defaults():
                      embed=True)
     nt.assert_raises(ValueError, display.Image)
     nt.assert_raises(ValueError, display.Image, data='this is not an image', format='badformat', embed=True)
-    imgfile = os.path.join(tpath, 'frontend/html/notebook/static/base/images/ipynblogo.png')
+    imgfile = os.path.join(tpath, 'html/static/base/images/ipynblogo.png')
     img = display.Image(filename=imgfile)
     nt.assert_equal('png', img.format)
     nt.assert_is_not_none(img._repr_png_())