Merge remote-tracking branch 'upstream/master'

IPython/html/static/tree/js/newnotebook.js

@@ -0,0 +1,135 b''
+// Copyright (c) IPython Development Team.
+// Distributed under the terms of the Modified BSD License.
+
+define([
+    'jquery',
+    'base/js/namespace',
+    'base/js/utils',
+    'base/js/dialog',
+], function ($, IPython, utils, dialog) {
+    "use strict";
+    
+    var NewNotebookWidget = function (selector, options) {
+        this.selector = selector;
+        this.base_url = options.base_url;
+        this.notebook_path = options.notebook_path;
+        this.contents = options.contents;
+        this.default_kernel = null;
+        this.config = options.config;
+        this.kernelspecs = {};
+        if (this.selector !== undefined) {
+            this.element = $(selector);
+            this.request_kernelspecs();
+        }
+        this.bind_events();
+    };
+    
+    NewNotebookWidget.prototype.bind_events = function () {
+        var that = this;
+        this.element.find('#new_notebook').click(function () {
+            that.new_notebook();
+        });
+    };
+    
+    NewNotebookWidget.prototype.request_kernelspecs = function () {
+        /** request and then load kernel specs */
+        var url = utils.url_join_encode(this.base_url, 'api/kernelspecs');
+        utils.promising_ajax(url).then($.proxy(this._load_kernelspecs, this));
+    };
+    
+    NewNotebookWidget.prototype._load_kernelspecs = function (data) {
+        /** load kernelspec list */
+        var that = this;
+        this.kernelspecs = data.kernelspecs;
+        var menu = this.element.find("#new-notebook-menu");
+        var keys = Object.keys(data.kernelspecs).sort(function (a, b) {
+            var da = data.kernelspecs[a].display_name;
+            var db = data.kernelspecs[b].display_name;
+            if (da === db) {
+                return 0;
+            } else if (da > db) {
+                return 1;
+            } else {
+                return -1;
+            }
+        });
+        for (var i = 0; i < keys.length; i++) {
+            var ks = this.kernelspecs[keys[i]];
+            var li = $("<li>")
+                .attr("id", "kernel-" +ks.name)
+                .data('kernelspec', ks).append(
+                    $('<a>')
+                        .attr('href', '#')
+                        .click($.proxy(this.new_notebook, this, ks.name))
+                        .text(ks.display_name)
+                        .attr('title', 'Create a new notebook with ' + ks.display_name)
+                );
+            menu.append(li);
+        }
+        this.config.loaded.then(function () {
+            that._load_default_kernelspec(data['default']);
+        });
+    };
+    
+    NewNotebookWidget.prototype._load_default_kernelspec = function (default_name) {
+        /** load default kernelspec name from config, if defined */
+        if (this.config.data.NewNotebookWidget &&
+            this.config.data.NewNotebookWidget.default_kernel &&
+            this.kernelspecs[this.config.data.NewNotebookWidget.default_kernel] !== undefined
+        ) {
+            default_name = this.config.data.NewNotebookWidget.default_kernel;
+        }
+        this.set_default_kernel(default_name);
+    };
+
+    NewNotebookWidget.prototype.set_default_kernel = function (kernel_name) {
+        /** select the current default kernel */
+        this.default_kernel = kernel_name;
+        this.config.update({
+            NewNotebookWidget: {
+                default_kernel: kernel_name
+            }
+        });
+        var spec = this.kernelspecs[kernel_name];
+        var display_name;
+        if (spec) {
+            display_name = spec.display_name;
+            this.element.find("#current-kernel")
+                .text(display_name)
+                .attr('title', display_name + " is the default kernel for new notebooks");
+        } else {
+            display_name = 'default kernel';
+        }
+        this.element.find("#new_notebook").attr('title',
+            'Create a new notebook with ' + display_name
+        );
+    };
+    
+    NewNotebookWidget.prototype.new_notebook = function (kernel_name) {
+        /** create and open a new notebook */
+        var that = this;
+        kernel_name = kernel_name || this.default_kernel;
+        var w = window.open();
+        this.contents.new_untitled(that.notebook_path, {type: "notebook"}).then(
+            function (data) {
+                var url = utils.url_join_encode(
+                    that.base_url, 'notebooks', data.path
+                );
+                if (kernel_name) {
+                    url += "?kernel_name=" + kernel_name;
+                }
+                w.location = url;
+            },
+            function (error) {
+                w.close();
+                dialog.modal({
+                    title : 'Creating Notebook Failed',
+                    body : "The error was: " + error.message,
+                    buttons : {'OK' : {'class' : 'btn-primary'}}
+                });
+            }
+        );
+    };
+    
+    return {'NewNotebookWidget': NewNotebookWidget};
+});

IPython/core/debugger.py

@@ -277,7 +277,7 b' class Pdb(OldPdb):'
             try:
                 OldPdb.interaction(self, frame, traceback)
             except KeyboardInterrupt:
-                self.shell.write("\nKeyboardInterrupt\n")
+                self.shell.write('\n' + self.shell.get_exception_only())
                 break
             else:
                 break

IPython/core/formatters.py

@@ -40,38 +40,21 b' else:'
 #-----------------------------------------------------------------------------
 
 
-def _valid_formatter(f):
-    """Return whether an object is a valid formatter
-    
-    Cases checked:
+def _safe_get_formatter_method(obj, name):
+    """Safely get a formatter method
     
-    - bound methods             OK
-    - unbound methods           NO
-    - callable with zero args   OK
+    - Classes cannot have formatter methods, only instance
+    - protect against proxy objects that claim to have everything
     """
-    if f is None:
-        return False
-    elif isinstance(f, type(str.find)):
-        # unbound methods on compiled classes have type method_descriptor
-        return False
-    elif isinstance(f, types.BuiltinFunctionType):
-        # bound methods on compiled classes have type builtin_function
-        return True
-    elif callable(f):
-        # anything that works with zero args should be okay
-        try:
-            inspect.getcallargs(f)
-        except Exception:
-            return False
-        else:
-            return True
-    return False
-
-def _safe_get_formatter_method(obj, name):
-    """Safely get a formatter method"""
+    if inspect.isclass(obj):
+        # repr methods only make sense on instances, not classes
+        return None
     method = pretty._safe_getattr(obj, name, None)
-    # formatter methods must be bound
-    if _valid_formatter(method):
+    if callable(method):
+        # obj claims to have repr method...
+        if callable(pretty._safe_getattr(obj, '_ipython_canary_method_should_not_exist_', None)):
+            # ...but don't trust proxy objects that claim to have everything
+            return None
         return method
 
 

IPython/core/interactiveshell.py

@@ -22,6 +22,7 b' import re'
 import runpy
 import sys
 import tempfile
+import traceback
 import types
 import subprocess
 from io import open as io_open
@@ -1786,6 +1787,15 b' class InteractiveShell(SingletonConfigurable):'
         """
         self.write_err("UsageError: %s" % exc)
     
+    def get_exception_only(self, exc_tuple=None):
+        """
+        Return as a string (ending with a newline) the exception that
+        just occurred, without any traceback.
+        """
+        etype, value, tb = self._get_exc_info(exc_tuple)
+        msg = traceback.format_exception_only(etype, value)
+        return ''.join(msg)
+
     def showtraceback(self, exc_tuple=None, filename=None, tb_offset=None,
                       exception_only=False):
         """Display the exception that just occurred.
@@ -1838,7 +1848,7 b' class InteractiveShell(SingletonConfigurable):'
                 self._showtraceback(etype, value, stb)
 
         except KeyboardInterrupt:
-            self.write_err("\nKeyboardInterrupt\n")
+            self.write_err('\n' + self.get_exception_only())
 
     def _showtraceback(self, etype, evalue, stb):
         """Actually show a traceback.
@@ -1993,7 +2003,7 b' class InteractiveShell(SingletonConfigurable):'
                     continue
 
     @skip_doctest
-    def set_next_input(self, s):
+    def set_next_input(self, s, replace=False):
         """ Sets the 'default' input string for the next command line.
 
         Requires readline.
@@ -2355,7 +2365,7 b' class InteractiveShell(SingletonConfigurable):'
                 try:
                     ec = os.system(cmd)
                 except KeyboardInterrupt:
-                    self.write_err("\nKeyboardInterrupt\n")
+                    self.write_err('\n' + self.get_exception_only())
                     ec = -2
         else:
             cmd = py3compat.unicode_to_str(cmd)
@@ -2374,7 +2384,7 b' class InteractiveShell(SingletonConfigurable):'
                 ec = subprocess.call(cmd, shell=True, executable=executable)
             except KeyboardInterrupt:
                 # intercept control-C; a long traceback is not useful here
-                self.write_err("\nKeyboardInterrupt\n")
+                self.write_err('\n' + self.get_exception_only())
                 ec = 130
             if ec > 128:
                 ec = -(ec - 128)

IPython/core/magics/code.py

@@ -353,7 +353,9 b' class CodeMagics(Magics):'
                 print('Operation cancelled.')
                 return
 
-        self.shell.set_next_input(contents)
+        contents = "# %load {}\n".format(arg_s) + contents
+
+        self.shell.set_next_input(contents, replace=True)
 
     @staticmethod
     def _find_edit_target(shell, args, opts, last_call):

IPython/core/magics/osm.py

@@ -165,7 +165,6 b' class OSMagics(Magics):'
 
         path = [os.path.abspath(os.path.expanduser(p)) for p in
             os.environ.get('PATH','').split(os.pathsep)]
-        path = filter(os.path.isdir,path)
 
         syscmdlist = []
         # Now define isexec in a cross platform manner.
@@ -189,8 +188,12 b' class OSMagics(Magics):'
             # the innermost part
             if os.name == 'posix':
                 for pdir in path:
-                    os.chdir(pdir)
-                    for ff in os.listdir(pdir):
+                    try:
+                        os.chdir(pdir)
+                        dirlist = os.listdir(pdir)
+                    except OSError:
+                        continue
+                    for ff in dirlist:
                         if isexec(ff):
                             try:
                                 # Removes dots from the name since ipython
@@ -205,8 +208,12 b' class OSMagics(Magics):'
             else:
                 no_alias = Alias.blacklist
                 for pdir in path:
-                    os.chdir(pdir)
-                    for ff in os.listdir(pdir):
+                    try:
+                        os.chdir(pdir)
+                        dirlist = os.listdir(pdir)
+                    except OSError:
+                        continue
+                    for ff in dirlist:
                         base, ext = os.path.splitext(ff)
                         if isexec(ff) and base.lower() not in no_alias:
                             if ext.lower() == '.exe':

IPython/core/tests/test_formatters.py

@@ -314,7 +314,6 b' def test_print_method_bound():'
     class MyHTML(object):
         def _repr_html_(self):
             return "hello"
-
     with capture_output() as captured:
         result = f(MyHTML)
     nt.assert_is(result, None)
@@ -325,6 +324,44 b' def test_print_method_bound():'
     nt.assert_equal(result, "hello")
     nt.assert_equal(captured.stderr, "")
 
+def test_print_method_weird():
+
+    class TextMagicHat(object):
+        def __getattr__(self, key):
+            return key
+
+    f = HTMLFormatter()
+    
+    text_hat = TextMagicHat()
+    nt.assert_equal(text_hat._repr_html_, '_repr_html_')
+    with capture_output() as captured:
+        result = f(text_hat)
+    
+    nt.assert_is(result, None)
+    nt.assert_not_in("FormatterWarning", captured.stderr)
+
+    class CallableMagicHat(object):
+        def __getattr__(self, key):
+            return lambda : key
+    
+    call_hat = CallableMagicHat()
+    with capture_output() as captured:
+        result = f(call_hat)
+    
+    nt.assert_equal(result, None)
+
+    class BadReprArgs(object):
+        def _repr_html_(self, extra, args):
+            return "html"
+    
+    bad = BadReprArgs()
+    with capture_output() as captured:
+        result = f(bad)
+    
+    nt.assert_is(result, None)
+    nt.assert_not_in("FormatterWarning", captured.stderr)
+
+
 def test_format_config():
     """config objects don't pretend to support fancy reprs with lazy attrs"""
     f = HTMLFormatter()

IPython/core/tests/test_interactiveshell.py

@@ -482,6 +482,24 b' class InteractiveShellTestCase(unittest.TestCase):'
         mod = ip.new_main_mod(u'%s.py' % name, name)
         self.assertEqual(mod.__name__, name)
 
+    def test_get_exception_only(self):
+        try:
+            raise KeyboardInterrupt
+        except KeyboardInterrupt:
+            msg = ip.get_exception_only()
+        self.assertEqual(msg, 'KeyboardInterrupt\n')
+
+        class DerivedInterrupt(KeyboardInterrupt):
+            pass
+        try:
+            raise DerivedInterrupt("foo")
+        except KeyboardInterrupt:
+            msg = ip.get_exception_only()
+        if sys.version_info[0] <= 2:
+            self.assertEqual(msg, 'DerivedInterrupt: foo\n')
+        else:
+            self.assertEqual(msg, 'IPython.core.tests.test_interactiveshell.DerivedInterrupt: foo\n')
+
 class TestSafeExecfileNonAsciiPath(unittest.TestCase):
 
     @onlyif_unicode_paths

IPython/core/ultratb.py

@@ -245,14 +245,16 b' def fix_frame_records_filenames(records):'
     """
     fixed_records = []
     for frame, filename, line_no, func_name, lines, index in records:
-        # Look inside the frame's globals dictionary for __file__, which should
-        # be better.
-        better_fn = frame.f_globals.get('__file__', None)
-        if isinstance(better_fn, str):
-            # Check the type just in case someone did something weird with
-            # __file__. It might also be None if the error occurred during
-            # import.
-            filename = better_fn
+        # Look inside the frame's globals dictionary for __file__,
+        # which should be better. However, keep Cython filenames since
+        # we prefer the source filenames over the compiled .so file.
+        if not filename.endswith(('.pyx', '.pxd', '.pxi')):
+            better_fn = frame.f_globals.get('__file__', None)
+            if isinstance(better_fn, str):
+                # Check the type just in case someone did something weird with
+                # __file__. It might also be None if the error occurred during
+                # import.
+                filename = better_fn
         fixed_records.append((frame, filename, line_no, func_name, lines, index))
     return fixed_records
 
@@ -722,15 +724,23 b' class VerboseTB(TBTools):'
             #print '*** record:',file,lnum,func,lines,index  # dbg
             if not file:
                 file = '?'
-            elif not (file.startswith(str("<")) and file.endswith(str(">"))):
-                # Guess that filenames like <string> aren't real filenames, so
-                # don't call abspath on them.
-                try:
-                    file = abspath(file)
-                except OSError:
-                    # Not sure if this can still happen: abspath now works with
-                    # file names like <string>
-                    pass
+            elif file.startswith(str("<")) and file.endswith(str(">")):
+                # Not a real filename, no problem...
+                pass
+            elif not os.path.isabs(file):
+                # Try to make the filename absolute by trying all
+                # sys.path entries (which is also what linecache does)
+                for dirname in sys.path:
+                    try:
+                        fullname = os.path.join(dirname, file)
+                        if os.path.isfile(fullname):
+                            file = os.path.abspath(fullname)
+                            break
+                    except Exception:
+                        # Just in case that sys.path contains very
+                        # strange entries...
+                        pass
+
             file = py3compat.cast_unicode(file, util_path.fs_encoding)
             link = tpl_link % file
             args, varargs, varkw, locals = inspect.getargvalues(frame)

IPython/html/services/contents/filemanager.py

@@ -611,9 +611,9 b' class FileContentsManager(ContentsManager):'
         return "Serving notebooks from local directory: %s" % self.root_dir
 
     def get_kernel_path(self, path, model=None):
-        """Return the initial working dir a kernel associated with a given notebook"""
+        """Return the initial API path of  a kernel associated with a given notebook"""
         if '/' in path:
             parent_dir = path.rsplit('/', 1)[0]
         else:
             parent_dir = ''
-        return self._get_os_path(parent_dir)
+        return parent_dir

IPython/html/services/contents/manager.py

@@ -187,8 +187,12 b' class ContentsManager(LoggingConfigurable):'
         
         KernelManagers can turn this value into a filesystem path,
         or ignore it altogether.
+
+        The default value here will start kernels in the directory of the
+        notebook server. FileContentsManager overrides this to use the
+        directory containing the notebook.
         """
-        return path
+        return ''
 
     def increment_filename(self, filename, path='', insert=''):
         """Increment a filename until it is unique.

IPython/html/services/kernels/kernelmanager.py

@@ -54,14 +54,10 b' class MappingKernelManager(MultiKernelManager):'
 
     def cwd_for_path(self, path):
         """Turn API path into absolute OS path."""
-        # short circuit for NotebookManagers that pass in absolute paths
-        if os.path.exists(path):
-            return path
-
         os_path = to_os_path(path, self.root_dir)
         # in the case of notebooks and kernels not being on the same filesystem,
         # walk up to root_dir if the paths don't exist
-        while not os.path.exists(os_path) and os_path != self.root_dir:
+        while not os.path.isdir(os_path) and os_path != self.root_dir:
             os_path = os.path.dirname(os_path)
         return os_path
 

IPython/html/services/kernelspecs/handlers.py

@@ -7,8 +7,6 b' from tornado import web'
 
 from ...base.handlers import IPythonHandler, json_errors
 
-from IPython.kernel.kernelspec import _pythonfirst
-
 
 class MainKernelSpecHandler(IPythonHandler):
     SUPPORTED_METHODS = ('GET',)
@@ -17,18 +15,21 b' class MainKernelSpecHandler(IPythonHandler):'
     @json_errors
     def get(self):
         ksm = self.kernel_spec_manager
-        results = []
-        for kernel_name in sorted(ksm.find_kernel_specs(), key=_pythonfirst):
+        km = self.kernel_manager
+        model = {}
+        model['default'] = km.default_kernel_name
+        model['kernelspecs'] = specs = {}
+        for kernel_name in ksm.find_kernel_specs():
             try:
                 d = ksm.get_kernel_spec(kernel_name).to_dict()
             except Exception:
                 self.log.error("Failed to load kernel spec: '%s'", kernel_name, exc_info=True)
                 continue
             d['name'] = kernel_name
-            results.append(d)
+            specs[kernel_name] = d
 
         self.set_header("Content-Type", 'application/json')
-        self.finish(json.dumps(results))
+        self.finish(json.dumps(model))
 
 
 class KernelSpecHandler(IPythonHandler):

IPython/html/services/kernelspecs/tests/test_kernelspecs_api.py

@@ -78,16 +78,22 b' class APITest(NotebookTestBase):'
         with open(pjoin(bad_kernel_dir, 'kernel.json'), 'w') as f:
             f.write("garbage")
         
-        specs = self.ks_api.list().json()
-        assert isinstance(specs, list)
+        model = self.ks_api.list().json()
+        assert isinstance(model, dict)
+        self.assertEqual(model['default'], NATIVE_KERNEL_NAME)
+        specs = model['kernelspecs']
+        assert isinstance(specs, dict)
         # 2: the sample kernelspec created in setUp, and the native Python kernel
         self.assertGreaterEqual(len(specs), 2)
         
         shutil.rmtree(bad_kernel_dir)
     
     def test_list_kernelspecs(self):
-        specs = self.ks_api.list().json()
-        assert isinstance(specs, list)
+        model = self.ks_api.list().json()
+        assert isinstance(model, dict)
+        self.assertEqual(model['default'], NATIVE_KERNEL_NAME)
+        specs = model['kernelspecs']
+        assert isinstance(specs, dict)
 
         # 2: the sample kernelspec created in setUp, and the native Python kernel
         self.assertGreaterEqual(len(specs), 2)
@@ -98,8 +104,8 b' class APITest(NotebookTestBase):'
         def is_default_kernelspec(s):
             return s['name'] == NATIVE_KERNEL_NAME and s['display_name'].startswith("IPython")
 
-        assert any(is_sample_kernelspec(s) for s in specs), specs
-        assert any(is_default_kernelspec(s) for s in specs), specs
+        assert any(is_sample_kernelspec(s) for s in specs.values()), specs
+        assert any(is_default_kernelspec(s) for s in specs.values()), specs
 
     def test_get_kernelspec(self):
         spec = self.ks_api.kernel_spec_info('Sample').json()  # Case insensitive

IPython/html/static/base/js/page.js

@@ -4,14 +4,17 b''
 define([
     'base/js/namespace',
     'jquery',
-], function(IPython, $){
+    'base/js/events',
+], function(IPython, $, events){
     "use strict";
 
     var Page = function () {
         this.bind_events();
+        this._resize_header();
     };
 
     Page.prototype.bind_events = function () {
+        events.on('resize-header.Page', $.proxy(this._resize_header, this));
     };
 
     Page.prototype.show = function () {
@@ -41,6 +44,11 b' define(['
         $('div#site').css('display','block');
     };
 
+    Page.prototype._resize_header = function() {
+        // Update the header's size.
+        $('#header-spacer').height($('#header').height());
+    };
+
     // Register self in the global namespace for convenience.
     IPython.Page = Page;
     return {'Page': Page};

IPython/html/static/base/js/utils.js

@@ -541,7 +541,16 b' define(['
         if (navigator.appVersion.indexOf("Linux")!=-1) OSName="Linux";
         return OSName;
     })();
-
+    
+    var get_url_param = function (name) {
+        // get a URL parameter. I cannot believe we actually need this.
+        // Based on http://stackoverflow.com/a/25359264/938949
+        var match = new RegExp('[\?&]' + name + '=([^&]*)').exec(window.location.search);
+        if (match){
+            return decodeURIComponent(match[1] || '');
+        }
+    };
+    
     var is_or_has = function (a, b) {
         /**
          * Is b a child of a or a itself?
@@ -632,6 +641,7 b' define(['
          * Like $.ajax, but returning an ES6 promise. success and error settings
          * will be ignored.
          */
+        settings = settings || {};
         return new Promise(function(resolve, reject) {
             settings.success = function(data, status, jqXHR) {
                 resolve(data);
@@ -766,6 +776,33 b' define(['
         };
     };
 
+    var typeset = function(element, text) {
+        /**
+         * Apply MathJax rendering to an element, and optionally set its text
+         *
+         * If MathJax is not available, make no changes.
+         *
+         * Returns the output any number of typeset elements, or undefined if
+         * MathJax was not available.
+         *
+         * Parameters
+         * ----------
+         * element: Node, NodeList, or jQuery selection
+         * text: option string
+         */
+        if(!window.MathJax){
+            return;
+        }
+        var $el = element.jquery ? element : $(element);
+        if(arguments.length > 1){
+            $el.text(text);
+        }
+        return $el.map(function(){
+            // MathJax takes a DOM node: $.map makes `this` the context
+            return MathJax.Hub.Queue(["Typeset", MathJax.Hub, this]);
+        });
+    };
+
     var utils = {
         regex_split : regex_split,
         uuid : uuid,
@@ -786,6 +823,7 b' define(['
         from_absolute_cursor_pos : from_absolute_cursor_pos,
         browser : browser,
         platform: platform,
+        get_url_param: get_url_param,
         is_or_has : is_or_has,
         is_focused : is_focused,
         mergeopt: mergeopt,
@@ -799,6 +837,7 b' define(['
         load_class: load_class,
         resolve_promises_dict: resolve_promises_dict,
         reject: reject,
+        typeset: typeset,
     };
 
     // Backwards compatability.

IPython/html/static/base/less/page.less

@@ -20,11 +20,33 b' body {'
 div#header {
     /* Initially hidden to prevent FLOUC */
     display: none;
-    margin-bottom: 0px;
-    padding-left: 30px;
-    padding-bottom: 5px;
-    border-bottom: 1px solid @navbar-default-border;
-    .border-box-sizing();
+    margin-bottom: -6px;
+    position: fixed;
+    top: 0;
+    width: 100%;
+    background-color: @body-bg;
+    min-height: 31px;
+
+    /* Display over codemirror */
+    z-index: 100;
+
+    #header-container {
+        margin-bottom: 0px;
+        padding-left: 30px;
+        padding-bottom: 5px;
+        .border-box-sizing();
+    }
+
+    .header-bar {
+        width: 100%;
+        height: 0px;
+        border-bottom: 1px solid @navbar-default-border;
+    }
+}
+
+#header-spacer {
+    width: 100%;
+    visibility: hidden;
 }
 
 #ipython_notebook {

IPython/html/static/notebook/js/cell.js

@@ -220,10 +220,7 b' define(['
      * @method typeset
      */
     Cell.prototype.typeset = function () {
-        if (window.MathJax) {
-            var cell_math = this.element.get(0);
-            MathJax.Hub.Queue(["Typeset", MathJax.Hub, cell_math]);
-        }
+        utils.typeset(this.element);
     };
 
     /**

IPython/html/static/notebook/js/codecell.js

@@ -389,7 +389,7 b' define(['
      * @private
      */
     CodeCell.prototype._handle_set_next_input = function (payload) {
-        var data = {'cell': this, 'text': payload.text};
+        var data = {'cell': this, 'text': payload.text, replace: payload.replace};
         this.events.trigger('set_next_input.Notebook', data);
     };
 

IPython/html/static/notebook/js/kernelselector.js

@@ -25,16 +25,27 b' define(['
     
     KernelSelector.prototype.request_kernelspecs = function() {
         var url = utils.url_join_encode(this.notebook.base_url, 'api/kernelspecs');
-        $.ajax(url, {success: $.proxy(this._got_kernelspecs, this)});
+        utils.promising_ajax(url).then($.proxy(this._got_kernelspecs, this));
     };
     
-    KernelSelector.prototype._got_kernelspecs = function(data, status, xhr) {
-        this.kernelspecs = {};
+    KernelSelector.prototype._got_kernelspecs = function(data) {
+        this.kernelspecs = data.kernelspecs;
         var menu = this.element.find("#kernel_selector");
         var change_kernel_submenu = $("#menu-change-kernel-submenu");
-        for (var i = 0; i < data.length; i++) {
-            var ks = data[i];
-            this.kernelspecs[ks.name] = ks;
+        var keys = Object.keys(data.kernelspecs).sort(function (a, b) {
+            // sort by display_name
+            var da = data.kernelspecs[a].display_name;
+            var db = data.kernelspecs[b].display_name;
+            if (da === db) {
+                return 0;
+            } else if (da > db) {
+                return 1;
+            } else {
+                return -1;
+            }
+        });
+        for (var i = 0; i < keys.length; i++) {
+            var ks = this.kernelspecs[keys[i]];
             var ksentry = $("<li>").attr("id", "kernel-" +ks.name).append($('<a>')
                 .attr('href', '#')
                 .click($.proxy(this.change_kernel, this, ks.name))

IPython/html/static/notebook/js/main.js

@@ -9,7 +9,6 b' require(['
     'services/config',
     'base/js/utils',
     'base/js/page',
-    'notebook/js/layoutmanager',
     'base/js/events',
     'auth/js/loginwidget',
     'notebook/js/maintoolbar',
@@ -34,7 +33,6 b' require(['
     configmod,
     utils, 
     page, 
-    layoutmanager, 
     events,
     loginwidget, 
     maintoolbar, 
@@ -66,9 +64,7 b' require(['
 
     var user_config = $.extend({}, config.default_config);
     var page = new page.Page();
-    var layout_manager = new layoutmanager.LayoutManager();
-    var pager = new pager.Pager('div#pager', 'div#pager_splitter', {
-        layout_manager: layout_manager, 
+    var pager = new pager.Pager('div#pager', {
         events: events});
     var acts = new actions.init();
     var keyboard_manager = new keyboardmanager.KeyboardManager({
@@ -104,7 +100,6 b' require(['
     var menubar = new menubar.MenuBar('#menubar', $.extend({
         notebook: notebook, 
         contents: contents,
-        layout_manager: layout_manager, 
         events: events, 
         save_widget: save_widget, 
         quick_help: quick_help}, 
@@ -132,9 +127,7 b' require(['
 
     page.show();
 
-    layout_manager.do_resize();
     var first_load = function () {
-        layout_manager.do_resize();
         var hash = document.location.hash;
         if (hash) {
             document.location.hash = '';
@@ -147,7 +140,6 b' require(['
     events.on('notebook_loaded.Notebook', first_load);
     
     IPython.page = page;
-    IPython.layout_manager = layout_manager;
     IPython.notebook = notebook;
     IPython.contents = contents;
     IPython.pager = pager;

IPython/html/static/notebook/js/menubar.js

@@ -24,7 +24,6 b' define(['
          *      Dictionary of keyword arguments.
          *          notebook: Notebook instance
          *          contents: ContentManager instance
-         *          layout_manager: LayoutManager instance
          *          events: $(Events) instance
          *          save_widget: SaveWidget instance
          *          quick_help: QuickHelp instance
@@ -37,7 +36,6 b' define(['
         this.selector = selector;
         this.notebook = options.notebook;
         this.contents = options.contents;
-        this.layout_manager = options.layout_manager;
         this.events = options.events;
         this.save_widget = options.save_widget;
         this.quick_help = options.quick_help;
@@ -88,6 +86,13 b' define(['
         }
     };
 
+    MenuBar.prototype._size_header = function() {
+        /** 
+         * Update header spacer size.
+         */
+        this.events.trigger('resize-header.Page');
+    };
+
     MenuBar.prototype.bind_events = function () {
         /**
          *  File
@@ -149,6 +154,10 b' define(['
             that._nbconvert('pdf', true);
         });
 
+        this.element.find('#download_script').click(function () {
+            that._nbconvert('script', true);
+        });
+
         this.element.find('#rename_notebook').click(function () {
             that.save_widget.rename_notebook({notebook: that.notebook});
         });
@@ -218,12 +227,12 b' define(['
         
         // View
         this.element.find('#toggle_header').click(function () {
-            $('div#header').toggle();
-            that.layout_manager.do_resize();
+            $('div#header-container').toggle();
+            that._size_header();
         });
         this.element.find('#toggle_toolbar').click(function () {
             $('div#maintoolbar').toggle();
-            that.layout_manager.do_resize();
+            that._size_header();
         });
         // Insert
         this.element.find('#insert_cell_above').click(function () {
@@ -371,20 +380,6 b' define(['
         var langname = (langinfo.name || 'Script')
         langname = langname.charAt(0).toUpperCase()+langname.substr(1) // Capitalise
         el.find('a').text(langname + ' ('+(langinfo.file_extension || 'txt')+')');
-        
-        // Unregister any previously registered handlers
-        el.off('click');
-        if (langinfo.nbconvert_exporter) {
-            // Metadata specifies a specific exporter, e.g. 'python'
-            el.click(function() {
-                that._nbconvert(langinfo.nbconvert_exporter, true);
-            });
-        } else {
-            // Use generic 'script' exporter
-            el.click(function() {
-                that._nbconvert('script', true);
-            });
-        }
     };
 
     // Backwards compatability.

IPython/html/static/notebook/js/notebook.js

@@ -210,9 +210,14 b' define(['
         var that = this;
 
         this.events.on('set_next_input.Notebook', function (event, data) {
-            var index = that.find_cell_index(data.cell);
-            var new_cell = that.insert_cell_below('code',index);
-            new_cell.set_text(data.text);
+            if (data.replace) {
+                data.cell.set_text(data.text);
+                data.cell.clear_output();
+            } else {
+                var index = that.find_cell_index(data.cell);
+                var new_cell = that.insert_cell_below('code',index);
+                new_cell.set_text(data.text);
+            }
             that.dirty = true;
         });
 
@@ -2326,9 +2331,13 b' define(['
         // Create the session after the notebook is completely loaded to prevent
         // code execution upon loading, which is a security risk.
         if (this.session === null) {
-            var kernelspec = this.metadata.kernelspec || {};
-            var kernel_name = kernelspec.name;
-
+            var kernel_name;
+            if (this.metadata.kernelspec) {
+                var kernelspec = this.metadata.kernelspec || {};
+                kernel_name = kernelspec.name;
+            } else {
+                kernel_name = utils.get_url_param('kernel_name');
+            }
             this.start_session(kernel_name);
         }
         // load our checkpoint list

IPython/html/static/notebook/js/outputarea.js

@@ -199,9 +199,7 b' define(['
 
     // typeset with MathJax if MathJax is available
     OutputArea.prototype.typeset = function () {
-        if (window.MathJax){
-            MathJax.Hub.Queue(["Typeset",MathJax.Hub]);
-        }
+        utils.typeset(this.element);
     };
 
 

IPython/html/static/notebook/js/pager.js

@@ -8,48 +8,22 b' define(['
 ], function(IPython, $, utils) {
     "use strict";
 
-    var Pager = function (pager_selector, pager_splitter_selector, options) {
+    var Pager = function (pager_selector, options) {
         /**
          * Constructor
          *
          * Parameters:
          *  pager_selector: string
-         *  pager_splitter_selector: string
          *  options: dictionary
          *      Dictionary of keyword arguments.
          *          events: $(Events) instance
-         *          layout_manager: LayoutManager instance
          */
         this.events = options.events;
         this.pager_element = $(pager_selector);
-        this.pager_button_area = $('#pager_button_area');
-        var that = this;
-        this.percentage_height = 0.40;
-        options.layout_manager.pager = this;
-        this.pager_splitter_element = $(pager_splitter_selector)
-            .draggable({
-                        containment: 'window',
-                        axis:'y',
-                        helper: null ,
-                        drag: function(event, ui) {
-                            /**
-                             * recalculate the amount of space the pager should take
-                             */
-                            var pheight = ($(document.body).height()-event.clientY-4);
-                            var downprct = pheight/options.layout_manager.app_height();
-                                downprct = Math.min(0.9, downprct);
-                            if (downprct < 0.1) {
-                                that.percentage_height = 0.1;
-                                that.collapse({'duration':0});
-                            } else if (downprct > 0.2) {
-                                that.percentage_height = downprct;
-                                that.expand({'duration':0});
-                            }
-                            options.layout_manager.do_resize();
-                       }
-            });
+        this.pager_button_area = $('#pager-button-area');
+        this._default_end_space = 200;
+        this.pager_element.resizable({handles: 'n', resize: $.proxy(this._resize, this)});
         this.expanded = false;
-        this.style();
         this.create_button_area();
         this.bind_events();
     };
@@ -61,7 +35,6 b' define(['
                     .attr('title',"Open the pager in an external window")
                     .addClass('ui-button')
                     .click(function(){that.detach();})
-                    .attr('style','position: absolute; right: 20px;')
                     .append(
                         $('<span>').addClass("ui-icon ui-icon-extlink")
                     )
@@ -71,49 +44,37 b' define(['
                     .attr('title',"Close the pager")
                     .addClass('ui-button')
                     .click(function(){that.collapse();})
-                    .attr('style','position: absolute; right: 5px;')
                     .append(
                         $('<span>').addClass("ui-icon ui-icon-close")
                     )
         );
     };
 
-    Pager.prototype.style = function () {
-        this.pager_splitter_element.addClass('ui-widget ui-state-default');
-        this.pager_splitter_element.attr('title', 'Click to Show/Hide pager area, drag to Resize');
-    };
-
 
     Pager.prototype.bind_events = function () {
         var that = this;
 
         this.pager_element.bind('collapse_pager', function (event, extrap) {
-            var time = 'fast';
-            if (extrap && extrap.duration) {
-                time = extrap.duration;
-            }
-            that.pager_element.hide(time);
+            // Animate hiding of the pager.
+            var time = (extrap && extrap.duration) ? extrap.duration : 'fast';
+            that.pager_element.hide(time, function() {
+                $('.end_space').css('height', that._default_end_space);
+            });
         });
 
         this.pager_element.bind('expand_pager', function (event, extrap) {
-            var time = 'fast';
-            if (extrap && extrap.duration) {
-                time = extrap.duration;
-            }
-            that.pager_element.show(time);
-        });
-
-        this.pager_splitter_element.hover(
-            function () {
-                that.pager_splitter_element.addClass('ui-state-hover');
-            },
-            function () {
-                that.pager_splitter_element.removeClass('ui-state-hover');
-            }
-        );
-
-        this.pager_splitter_element.click(function () {
-            that.toggle();
+            // Clear the pager's height attr if it's set.  This allows the
+            // pager to size itself according to its contents.
+            that.pager_element.height('initial');
+
+            // Animate the showing of the pager
+            var time = (extrap && extrap.duration) ? extrap.duration : 'fast';
+            that.pager_element.show(time, function() {
+                // Explicitly set pager height once the pager has shown itself.
+                // This allows the pager-contents div to use percentage sizing.
+                that.pager_element.height(that.pager_element.height());
+                that._resize();
+            });
         });
 
         this.events.on('open_with_text.Pager', function (event, payload) {
@@ -130,7 +91,7 b' define(['
     Pager.prototype.collapse = function (extrap) {
         if (this.expanded === true) {
             this.expanded = false;
-            this.pager_element.add($('div#notebook')).trigger('collapse_pager', extrap);
+            this.pager_element.trigger('collapse_pager', extrap);
         }
     };
 
@@ -138,7 +99,7 b' define(['
     Pager.prototype.expand = function (extrap) {
         if (this.expanded !== true) {
             this.expanded = true;
-            this.pager_element.add($('div#notebook')).trigger('expand_pager', extrap);
+            this.pager_element.trigger('expand_pager', extrap);
         }
     };
 
@@ -184,6 +145,18 b' define(['
         this.pager_element.find(".container").append($('<pre/>').html(utils.fixCarriageReturn(utils.fixConsole(text))));
     };
 
+
+    Pager.prototype._resize = function() {
+        /**
+         * Update document based on pager size.
+         */
+        
+        // Make sure the padding at the end of the notebook is large
+        // enough that the user can scroll to the bottom of the 
+        // notebook.
+        $('.end_space').css('height', Math.max(this.pager_element.height(), this._default_end_space));
+    };
+
     // Backwards compatability.
     IPython.Pager = Pager;
 

IPython/html/static/notebook/less/menubar.less

@@ -1,12 +1,13 b''
 #menubar {
   margin-top: 0px;
-  margin-bottom: -19px;
+  margin-bottom: -24px;
   position: relative;
   .border-box-sizing();
 
   .navbar {
     border-top: 1px;
     border-radius: 0px 0px @border-radius-base @border-radius-base;
+    margin-bottom: 23px;
   }
   
   .navbar-toggle {

IPython/html/static/notebook/less/notebook.less

@@ -3,10 +3,6 b' body {'
     background-color:   @body-bg;
 }
 
-body.notebook_app {
-    overflow: hidden;
-}
-
 @media (max-width: 767px) {
     // remove bootstrap-responsive's body padding on small screens
     body.notebook_app {
@@ -36,19 +32,17 b' span#notebook_name {'
 div#notebook_panel {
     margin: 0px 0px 0px 0px;
     padding: 0px;
-    .box-shadow(@notebook-shadow);
     .border-box-sizing();
 }
 div#notebook {
     font-size: @notebook_font_size;
     line-height: @notebook_line_height;
-    overflow-y: scroll;
+    overflow-y: hidden;
     overflow-x: auto;
     width: 100%;
     /* This spaces the cell away from the edge of the notebook area */
-    padding: 1em 0 1em 0;
+    padding: 2em 0 2em 0;
     margin: 0px;
-    border-top: 1px solid @navbar-default-border;
     outline: none;
     .border-box-sizing();
 }
@@ -86,3 +80,14 b' p {'
 .end_space {
     height: 200px;
 }
+
+.lower-header-bar {
+    width: 100%;
+    height: 0px;
+    border-bottom: 1px solid @navbar-default-border;
+    margin-bottom: -1px;
+}
+
+.notebook_app #header {
+    .box-shadow(@notebook-shadow);
+}

IPython/html/static/notebook/less/pager.less

@@ -1,25 +1,51 b''
-div#pager_splitter {
-    height: 8px;
-    .border-box-sizing();
-}
-
-#pager-container {
-    position: relative;
-    padding: 15px 0px;
-    .border-box-sizing();
-}
-
 div#pager {
+    background-color:   @body-bg;
     font-size: @notebook_font_size;
     line-height: @notebook_line_height;
-    overflow: auto;
+    overflow: hidden;
     display: none;
+    position: fixed;
+    bottom: 0px;
+    width: 100%;
+    max-height: 50%;
+    padding-top: 7px;
+
+    /* Display over codemirror */
+    z-index: 100;
+
+    /* Hack which prevents jquery ui resizable from changing top. */
+    top: inherit !important; 
 
     pre {
-      line-height: @code_line_height;
-      color: @text-color;
-      background-color: @cell_background;
-      padding: @code_padding;
+        line-height: @code_line_height;
+        color: @text-color;
+        background-color: @cell_background;
+        padding: @code_padding;
+    }
+
+    #pager-button-area {
+        position: absolute;
+        top: 7px;
+        right: 20px; 
+    }
+
+    #pager-contents {
+        position: relative;
+        overflow: auto;
+        width: 100%;
+        height: 100%;
+
+        #pager-container {
+            position: relative;
+            padding: 15px 0px;
+            .border-box-sizing();
+        }
+    }
+
+    .ui-resizable-handle {
+        top: 0px;
+        height: 7px;
+        background: @light_border_color;
+        border-bottom: 1px solid @border_color;
     }
-    .border-box-sizing();
 }

IPython/html/static/notebook/less/toolbar.less

@@ -2,6 +2,7 b''
     padding: 0px;
     margin-left: -5px;
     margin-top: -5px;
+    margin-bottom: 5px;
 
     select, label {
         width: auto;
@@ -33,8 +34,8 b''
   border: 0px;
   min-height: 27px;
   margin-left: 32px;
-  padding-top: 6px;
-  padding-bottom: 8px;
+  padding-top: 11px;
+  padding-bottom: 3px;
 
   .navbar-text {
     float: none;
@@ -44,10 +45,6 b''
     margin-right: 0px;
     margin-top: 0px;
   }
-
-  .toolbar {
-    margin-top: 0px;
-  }
 }
 
 .select-xs {

IPython/html/static/notebook/less/variables.less

@@ -10,7 +10,7 b''
 @notebook_line_height:          20px;
 @code_line_height:              1.21429em;  // changed from 1.231 to get 17px even
 @code_padding:                  0.4em;  // 5.6 px
-@notebook-shadow:               inset 1px 4px 9px -6px rgba(0,0,0,.25);
+@notebook-shadow:               1px 4px 9px -6px rgba(0,0,0,.25);
 @rendered_html_border_color:    black;
 @input_prompt_color:            navy;
 @output_prompt_color:           darkred;

IPython/html/static/style/style.min.css

@@ -7751,14 +7751,32 b' body {'
 div#header {
   /* Initially hidden to prevent FLOUC */
   display: none;
+  margin-bottom: -6px;
+  position: fixed;
+  top: 0;
+  width: 100%;
+  background-color: #ffffff;
+  min-height: 31px;
+  /* Display over codemirror */
+  z-index: 100;
+}
+div#header #header-container {
   margin-bottom: 0px;
   padding-left: 30px;
   padding-bottom: 5px;
-  border-bottom: 1px solid #e7e7e7;
   box-sizing: border-box;
   -moz-box-sizing: border-box;
   -webkit-box-sizing: border-box;
 }
+div#header .header-bar {
+  width: 100%;
+  height: 0px;
+  border-bottom: 1px solid #e7e7e7;
+}
+#header-spacer {
+  width: 100%;
+  visibility: hidden;
+}
 #ipython_notebook {
   padding-left: 0px;
 }
@@ -7981,14 +7999,15 b' span#login_widget > .button .badge,'
   margin: 0;
 }
 .alternate_upload input.fileinput {
-  background-color: red;
-  position: relative;
+  display: inline;
   opacity: 0;
   z-index: 2;
-  width: 295px;
-  margin-left: 163px;
-  cursor: pointer;
-  height: 26px;
+  width: 12ex;
+  margin-right: -12ex;
+}
+.alternate_upload .input-overlay {
+  display: inline-block;
+  font-weight: bold;
 }
 /**
  * Primary styles
@@ -8146,6 +8165,21 b' input.engine_num_input {'
 .file_icon:before.pull-right {
   margin-left: .3em;
 }
+ul#new-notebook-menu {
+  left: auto;
+  right: 0;
+}
+.kernel-menu-icon {
+  padding-right: 12px;
+  width: 24px;
+  content: "\f096";
+}
+.kernel-menu-icon:before {
+  content: "\f096";
+}
+.kernel-menu-icon-current:before {
+  content: "\f00c";
+}
 /*!
 *
 * IPython notebook
@@ -9461,9 +9495,6 b' h6:hover .anchor-link {'
 body {
   background-color: #ffffff;
 }
-body.notebook_app {
-  overflow: hidden;
-}
 @media (max-width: 767px) {
   body.notebook_app {
     padding-left: 0px;
@@ -9489,8 +9520,6 b' span#notebook_name:hover {'
 div#notebook_panel {
   margin: 0px 0px 0px 0px;
   padding: 0px;
-  -webkit-box-shadow: inset 1px 4px 9px -6px rgba(0, 0, 0, 0.25);
-  box-shadow: inset 1px 4px 9px -6px rgba(0, 0, 0, 0.25);
   box-sizing: border-box;
   -moz-box-sizing: border-box;
   -webkit-box-sizing: border-box;
@@ -9498,13 +9527,12 b' div#notebook_panel {'
 div#notebook {
   font-size: 14px;
   line-height: 20px;
-  overflow-y: scroll;
+  overflow-y: hidden;
   overflow-x: auto;
   width: 100%;
   /* This spaces the cell away from the edge of the notebook area */
-  padding: 1em 0 1em 0;
+  padding: 2em 0 2em 0;
   margin: 0px;
-  border-top: 1px solid #e7e7e7;
   outline: none;
   box-sizing: border-box;
   -moz-box-sizing: border-box;
@@ -9542,6 +9570,16 b' p {'
 .end_space {
   height: 200px;
 }
+.lower-header-bar {
+  width: 100%;
+  height: 0px;
+  border-bottom: 1px solid #e7e7e7;
+  margin-bottom: -1px;
+}
+.notebook_app #header {
+  -webkit-box-shadow: 1px 4px 9px -6px rgba(0, 0, 0, 0.25);
+  box-shadow: 1px 4px 9px -6px rgba(0, 0, 0, 0.25);
+}
 /* CSS for the cell toolbar */
 .celltoolbar {
   border: thin solid #CFCFCF;
@@ -9779,7 +9817,7 b' fieldset[disabled] #kernel_selector_widget > button.active {'
 }
 #menubar {
   margin-top: 0px;
-  margin-bottom: -19px;
+  margin-bottom: -24px;
   position: relative;
   box-sizing: border-box;
   -moz-box-sizing: border-box;
@@ -9788,6 +9826,7 b' fieldset[disabled] #kernel_selector_widget > button.active {'
 #menubar .navbar {
   border-top: 1px;
   border-radius: 0px 0px 4px 4px;
+  margin-bottom: 23px;
 }
 #menubar .navbar-toggle {
   float: left;
@@ -10256,27 +10295,21 b' fieldset[disabled] .notification_widget.danger.active {'
   color: #d9534f;
   background-color: #ffffff;
 }
-div#pager_splitter {
-  height: 8px;
-  box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  -webkit-box-sizing: border-box;
-}
-#pager-container {
-  position: relative;
-  padding: 15px 0px;
-  box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  -webkit-box-sizing: border-box;
-}
 div#pager {
+  background-color: #ffffff;
   font-size: 14px;
   line-height: 20px;
-  overflow: auto;
+  overflow: hidden;
   display: none;
-  box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  -webkit-box-sizing: border-box;
+  position: fixed;
+  bottom: 0px;
+  width: 100%;
+  max-height: 50%;
+  padding-top: 7px;
+  /* Display over codemirror */
+  z-index: 100;
+  /* Hack which prevents jquery ui resizable from changing top. */
+  top: inherit !important;
 }
 div#pager pre {
   line-height: 1.21429em;
@@ -10284,6 +10317,30 b' div#pager pre {'
   background-color: #f7f7f7;
   padding: 0.4em;
 }
+div#pager #pager-button-area {
+  position: absolute;
+  top: 7px;
+  right: 20px;
+}
+div#pager #pager-contents {
+  position: relative;
+  overflow: auto;
+  width: 100%;
+  height: 100%;
+}
+div#pager #pager-contents #pager-container {
+  position: relative;
+  padding: 15px 0px;
+  box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+}
+div#pager .ui-resizable-handle {
+  top: 0px;
+  height: 7px;
+  background: #cfcfcf;
+  border-bottom: 1px solid #ababab;
+}
 .quickhelp {
   /* Old browsers */
   display: -webkit-box;
@@ -10350,6 +10407,7 b' span#autosave_status {'
   padding: 0px;
   margin-left: -5px;
   margin-top: -5px;
+  margin-bottom: 5px;
   box-sizing: border-box;
   -moz-box-sizing: border-box;
   -webkit-box-sizing: border-box;
@@ -10380,8 +10438,8 b' span#autosave_status {'
   border: 0px;
   min-height: 27px;
   margin-left: 32px;
-  padding-top: 6px;
-  padding-bottom: 8px;
+  padding-top: 11px;
+  padding-bottom: 3px;
 }
 #maintoolbar .navbar-text {
   float: none;
@@ -10391,9 +10449,6 b' span#autosave_status {'
   margin-right: 0px;
   margin-top: 0px;
 }
-#maintoolbar .toolbar {
-  margin-top: 0px;
-}
 .select-xs {
   height: 24px;
 }

IPython/html/static/tree/js/main.js

@@ -8,12 +8,14 b' require(['
     'base/js/events',
     'base/js/page',
     'base/js/utils',
+    'services/config',
     'contents',
     'tree/js/notebooklist',
     'tree/js/clusterlist',
     'tree/js/sessionlist',
     'tree/js/kernellist',
     'tree/js/terminallist',
+    'tree/js/newnotebook',
     'auth/js/loginwidget',
     // only loaded, not used:
     'jqueryui',
@@ -26,12 +28,14 b' require(['
     events,
     page,
     utils,
+    config,
     contents_service,
-    notebooklist, 
-    clusterlist, 
-    sesssionlist, 
+    notebooklist,
+    clusterlist,
+    sesssionlist,
     kernellist,
     terminallist,
+    newnotebook,
     loginwidget){
     "use strict";
 
@@ -41,6 +45,10 b' require(['
         base_url: utils.get_body_data("baseUrl"),
         notebook_path: utils.get_body_data("notebookPath"),
     };
+    var cfg = new config.ConfigSection('tree', common_options);
+    cfg.load();
+    common_options.config = cfg;
+    
     var session_list = new sesssionlist.SesssionList($.extend({
         events: events}, 
         common_options));
@@ -63,24 +71,12 b' require(['
 
     var login_widget = new loginwidget.LoginWidget('#login_widget', common_options);
 
-    $('#new_notebook').click(function (e) {
-        var w = window.open();
-        contents.new_untitled(common_options.notebook_path, {type: "notebook"}).then(
-                function (data) {
-                    w.location = utils.url_join_encode(
-                            common_options.base_url, 'notebooks', data.path
-                        );
-                },
-                function(error) {
-                    w.close();
-                    dialog.modal({
-                        title : 'Creating Notebook Failed',
-                        body : "The error was: " + error.message,
-                        buttons : {'OK' : {'class' : 'btn-primary'}}
-                    });
-                }
-            );
-    });
+    var nnw = new newnotebook.NewNotebookWidget("#new-notebook-buttons",
+        $.extend(
+            {contents: contents},
+            common_options
+        )
+    );
 
     var interval_id=0;
     // auto refresh every xx secondes, no need to be fast,
@@ -93,18 +89,18 b' require(['
          */
         session_list.load_sessions();
         cluster_list.load_list();
-	if (terminal_list) {
-	    terminal_list.load_terminals();
-	}
+        if (terminal_list) {
+            terminal_list.load_terminals();
+        }
         if (!interval_id){
             interval_id = setInterval(function(){
-                    session_list.load_sessions();
-                    cluster_list.load_list();
-		    if (terminal_list) {
-		        terminal_list.load_terminals();
-		    }
-                }, time_refresh*1000);
-            }
+                session_list.load_sessions();
+                cluster_list.load_list();
+                if (terminal_list) {
+                    terminal_list.load_terminals();
+                }
+            }, time_refresh*1000);
+        }
     };
 
     var disable_autorefresh = function(){
@@ -134,6 +130,7 b' require(['
     IPython.session_list = session_list;
     IPython.kernel_list = kernel_list;
     IPython.login_widget = login_widget;
+    IPython.new_notebook_widget = nnw;
 
     events.trigger('app_initialized.DashboardApp');
     

IPython/html/static/tree/less/altuploadform.less

@@ -15,12 +15,14 b''
 
 .alternate_upload input.fileinput
 {
-    background-color:red;
-    position:relative;
+    display: inline;
     opacity: 0;
     z-index: 2;
-    width: 295px;
-    margin-left:163px;
-    cursor: pointer;
-    height: 26px;
+    width: 12ex;
+    margin-right: -12ex;
+}
+
+.alternate_upload .input-overlay {
+    display: inline-block;
+    font-weight: bold;
 }

IPython/html/static/tree/less/tree.less

@@ -154,3 +154,23 b' input.engine_num_input {'
 .file_icon:before {
     .icon(@fa-var-file-o)
 }
+
+ul#new-notebook-menu {
+    // align right instead of left
+    left: auto;
+    right: 0;
+}
+
+.kernel-menu-icon {
+    padding-right: 12px;
+    width: 24px;
+    content: @fa-var-square-o;
+}
+
+.kernel-menu-icon:before {
+    content: @fa-var-square-o;
+}
+
+.kernel-menu-icon-current:before {
+  content: @fa-var-check;
+}

IPython/html/static/widgets/js/manager.js

@@ -112,6 +112,7 b' define(['
                 return Promise.resolve(view.render()).then(function() {return view;});
             }).catch(utils.reject("Couldn't create a view for model id '" + String(model.id) + "'", true));
         });
+        model.views[utils.uuid()] = model.state_change;
         return model.state_change;
     };
 

IPython/html/static/widgets/js/widget.js

@@ -65,11 +65,12 b' define(["widgets/js/manager",'
             delete this.comm.model; // Delete ref so GC will collect widget model.
             delete this.comm;
             delete this.model_id; // Delete id from model so widget manager cleans up.
-            for (var id in this.views) {
-                if (this.views.hasOwnProperty(id)) {
-                    this.views[id].remove();
-                }
-            }
+            _.each(this.views, function(v, id, views) {
+                v.then(function(view) {
+                    view.remove();
+                    delete views[id];
+                });
+            });
         },
 
         _handle_comm_msg: function (msg) {
@@ -318,8 +319,6 b' define(["widgets/js/manager",'
              */
             this.model.on('change',this.update,this);
             this.options = parameters.options;
-            this.id = this.id || utils.uuid();
-            this.model.views[this.id] = this;
             this.on('displayed', function() { 
                 this.is_displayed = true; 
             }, this);
@@ -388,7 +387,7 b' define(["widgets/js/manager",'
             } else {
                 this.on('displayed', callback, context);
             }
-        },
+        }
     });
 
 
@@ -575,6 +574,10 b' define(["widgets/js/manager",'
             }
             return elements;
         },
+
+        typeset: function(element, text){
+            utils.typeset.apply(null, arguments);
+        },
     });
 
 

IPython/html/static/widgets/js/widget_bool.js

@@ -62,8 +62,7 b' define(['
                 if (description.trim().length === 0) {
                     this.$label.hide();
                 } else {
-                    this.$label.text(description);
-                    MathJax.Hub.Queue(["Typeset",MathJax.Hub,this.$label.get(0)]);
+                    this.typeset(this.$label, description);
                     this.$label.show();
                 }
             }

IPython/html/static/widgets/js/widget_box.js

@@ -319,8 +319,7 b' define(['
             if (description.trim().length === 0) {
                 this.$title.html(" "); // Preserve title height
             } else {
-                this.$title.text(description);
-                MathJax.Hub.Queue(["Typeset",MathJax.Hub,this.$title.get(0)]);
+                this.typeset(this.$title, description);
             }
             
             var button_text = this.model.get('button_text');

IPython/html/static/widgets/js/widget_int.js

@@ -155,8 +155,7 b' define(['
                 if (description.length === 0) {
                     this.$label.hide();
                 } else {
-                    this.$label.text(description);
-                    MathJax.Hub.Queue(["Typeset",MathJax.Hub,this.$label.get(0)]);
+                    this.typeset(this.$label, description);
                     this.$label.show();
                 }
                 
@@ -323,8 +322,7 b' define(['
                 if (description.length === 0) {
                     this.$label.hide();
                 } else {
-                    this.$label.text(description);
-                    MathJax.Hub.Queue(["Typeset",MathJax.Hub,this.$label.get(0)]);
+                    this.typeset(this.$label, description);
                     this.$label.show();
                 }
             }
@@ -443,8 +441,7 b' define(['
             if (description.length === 0) {
                 this.$label.hide();
             } else {
-                this.$label.text(description);
-                MathJax.Hub.Queue(["Typeset",MathJax.Hub,this.$label.get(0)]);
+                this.typeset(this.$label, description);
                 this.$label.show();
             }
             return ProgressView.__super__.update.apply(this);

IPython/html/static/widgets/js/widget_selection.js

@@ -97,8 +97,7 b' define(['
                 if (description.length === 0) {
                     this.$label.hide();
                 } else {
-                    this.$label.text(description);
-                    MathJax.Hub.Queue(["Typeset",MathJax.Hub,this.$label.get(0)]);
+                    this.typeset(this.$label, description);
                     this.$label.show();
                 }
             }
@@ -231,7 +230,7 b' define(['
                     this.$label.hide();
                 } else {
                     this.$label.text(description);
-                    MathJax.Hub.Queue(["Typeset",MathJax.Hub,this.$label.get(0)]);
+                    this.typeset(this.$label, description);
                     this.$label.show();
                 }
             }
@@ -345,8 +344,8 b' define(['
                 if (description.length === 0) {
                     this.$label.hide();
                 } else {
-                    this.$label.text(description);
-                    MathJax.Hub.Queue(["Typeset",MathJax.Hub,this.$label.get(0)]);
+                    this.$label.text();
+                    this.typeset(this.$label, description);
                     this.$label.show();
                 }
             }
@@ -468,8 +467,7 b' define(['
                 if (description.length === 0) {
                     this.$label.hide();
                 } else {
-                    this.$label.text(description);
-                    MathJax.Hub.Queue(["Typeset",MathJax.Hub,this.$label.get(0)]);
+                    this.typeset(this.$label, description);
                     this.$label.show();
                 }
             }

IPython/html/static/widgets/js/widget_string.js

@@ -43,9 +43,7 b' define(['
              * Called when the model is changed.  The model may have been 
              * changed by another view or by a state update from the back-end.
              */
-            this.$el.text(this.model.get('value'));
-            MathJax.Hub.Queue(["Typeset",MathJax.Hub,this.$el.get(0)]);
-
+            this.typeset(this.$el, this.model.get('value'));
             return LatexView.__super__.update.apply(this);
         }, 
     });
@@ -116,8 +114,7 b' define(['
                 if (description.length === 0) {
                     this.$label.hide();
                 } else {
-                    this.$label.text(description);
-                    MathJax.Hub.Queue(["Typeset",MathJax.Hub,this.$label.get(0)]);
+                    this.typeset(this.$label, description);
                     this.$label.show();
                 }
             }
@@ -200,8 +197,7 b' define(['
                 if (description.length === 0) {
                     this.$label.hide();
                 } else {
-                    this.$label.text(description);
-                    MathJax.Hub.Queue(["Typeset",MathJax.Hub,this.$label.get(0)]);
+                    this.typeset(this.$label, description);
                     this.$label.show();
                 }
             }

IPython/html/templates/notebook.html

@@ -32,7 +32,7 b' class="notebook_app"'
 {% endblock %}
 
 
-{% block header %}
+{% block headercontainer %}
 
 
 <span id="save_widget" class="nav pull-left">
@@ -43,18 +43,16 b' class="notebook_app"'
 
 <span id="kernel_selector_widget" class="pull-right dropdown">
     <button class="dropdown-toggle" data-toggle="dropdown" type='button' id="current_kernel_spec">
-        <span class='kernel_name'>Python</span>
+        <span class='kernel_name'>Kernel</span>
         <span class="caret"></span> 
     </button>
     <ul id="kernel_selector" class="dropdown-menu">
     </ul>
 </span>
 
-{% endblock %}
-
-
-{% block site %}
+{% endblock headercontainer %}
 
+{% block header %}
 <div id="menubar-container" class="container">
 <div id="menubar">
     <div id="menus" class="navbar navbar-default" role="navigation">
@@ -292,6 +290,7 b' class="notebook_app"'
         </div>
     </div>
 </div>
+
 <div id="maintoolbar" class="navbar">
   <div class="toolbar-inner navbar-inner navbar-nobg">
     <div id="maintoolbar-container" class="container"></div>
@@ -299,19 +298,25 b' class="notebook_app"'
 </div>
 </div>
 
-<div id="ipython-main-app">
+<div class="lower-header-bar"></div>
+{% endblock header %}
 
+{% block site %}
+
+
+<div id="ipython-main-app">
     <div id="notebook_panel">
         <div id="notebook"></div>
-        <div id="pager_splitter"></div>
-        <div id="pager">
-            <div id='pager_button_area'>
-            </div>
-            <div id="pager-container" class="container"></div>
-        </div>
     </div>
+</div>
 
+<div id="pager">
+    <div id="pager-contents">
+        <div id="pager-container" class="container"></div>
+    </div>
+    <div id='pager-button-area'></div>
 </div>
+
 <div id='tooltip' class='ipython_tooltip' style='display:none'></div>
 
 

IPython/html/templates/page.html

@@ -5,7 +5,7 b''
     <meta charset="utf-8">
 
     <title>{% block title %}IPython Notebook{% endblock %}</title>
-    <link rel="shortcut icon" type="image/x-icon" href="{{static_url("base/images/favicon.ico") }}">
+    {% block favicon %}<link rel="shortcut icon" type="image/x-icon" href="{{static_url("base/images/favicon.ico") }}">{% endblock %}
     <meta http-equiv="X-UA-Compatible" content="chrome=1">
     <link rel="stylesheet" href="{{static_url("components/jquery-ui/themes/smoothness/jquery-ui.min.css") }}" type="text/css" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -81,7 +81,7 b''
 </noscript>
 
 <div id="header" class="navbar navbar-static-top">
-  <div class="container">
+  <div id="header-container" class="container">
   <div id="ipython_notebook" class="nav navbar-brand pull-left"><a href="{{base_url}}tree" alt='dashboard'>{% block logo %}<img src='{{static_url("base/images/logo.png") }}' alt='Jupyter Notebook'/>{% endblock %}</a></div>
 
   {% block login_widget %}
@@ -96,10 +96,15 b''
 
   {% endblock %}
 
-  {% block header %}
+  {% block headercontainer %}
   {% endblock %}
   </div>
+  <div class="header-bar"></div>
+
+  {% block header %}
+  {% endblock %}
 </div>
+<div id="header-spacer"></div>
 
 <div id="site">
 {% block site %}

IPython/html/templates/tree.html

@@ -34,19 +34,31 b' data-terminals-available="{{terminals_available}}"'
     <div class="tab-content">
     <div id="notebooks" class="tab-pane active">
         <div id="notebook_toolbar" class="row">
-            <div class="col-sm-8 no-padding">
-                <form id='alternate_upload'  class='alternate_upload' >
-                    <span id="notebook_list_info" style="position:absolute" >
-                        To import a notebook, drag the file onto the listing below or <strong>click here</strong>.
+            <div class="col-sm-12 no-padding">
+                <form id='alternate_upload'  class='alternate_upload'>
+                    <span id="notebook_list_info">
+                        To import a notebook, drag the file onto the listing below or
+                        <span class="input-overlay">
+                          <input type="file" name="datafile" class="fileinput" multiple='multiple'>
+                          click here.
+                        </span>
                     </span>
-                    <input type="file" name="datafile" class="fileinput" multiple='multiple'>
                 </form>
-            </div>
-            <div class="col-sm-4 no-padding tree-buttons">
-                <span id="notebook_buttons" class="pull-right">
-                    <button id="new_notebook" title="Create new notebook" class="btn btn-default btn-xs">New Notebook</button>
-                    <button id="refresh_notebook_list" title="Refresh notebook list" class="btn btn-default btn-xs"><i class="fa fa-refresh"></i></button>
-                </span>
+              <span id="notebook_buttons" class="pull-right">
+                <div id="new-notebook-buttons" class="btn-group">
+                  <button id="new_notebook" class="btn btn-default btn-xs">
+                    New Notebook
+                  </button>
+                  <button class="dropdown-toggle btn btn-default btn-xs" data-toggle="dropdown">
+                    <span id="current-kernel">Loading...</span>
+                    <span class="caret"></span>
+                  </button>
+                  <ul id="new-notebook-menu" class="dropdown-menu"></ul>
+                </div>
+
+                  
+                <button id="refresh_notebook_list" title="Refresh notebook list" class="btn btn-default btn-xs"><i class="fa fa-refresh"></i></button>
+              </span>
             </div>
         </div>
 

IPython/html/widgets/__init__.py

@@ -22,3 +22,8 b' from .widget_int import IntTextWidget, BoundedIntTextWidget, IntSliderWidget, In'
 from .widget_selection import RadioButtonsWidget, ToggleButtonsWidget, DropdownWidget, SelectWidget
 from .widget_selectioncontainer import TabWidget, AccordionWidget
 from .widget_string import HTMLWidget, LatexWidget, TextWidget, TextareaWidget
+
+# Warn on import
+from IPython.utils.warn import warn
+warn("""The widget API is still considered experimental and 
+    may change by the next major release of IPython.""")

IPython/kernel/connect.py

@@ -562,7 +562,7 b' class ConnectionFileMixin(LoggingConfigurable):'
         return self._create_connected_socket('hb', identity=identity)
 
     def connect_control(self, identity=None):
-        """return zmq Socket connected to the Heartbeat channel"""
+        """return zmq Socket connected to the Control channel"""
         return self._create_connected_socket('control', identity=identity)
 
 

IPython/kernel/launcher.py

@@ -101,25 +101,13 b" def make_ipkernel_cmd(mod='IPython.kernel', executable=None, extra_arguments=[],"
         executable = sys.executable
     arguments = [ executable, '-m', mod, '-f', '{connection_file}' ]
     arguments.extend(extra_arguments)
-
-    if sys.platform == 'win32':
-
-        # If the kernel is running on pythonw and stdout/stderr are not been
-        # re-directed, it will crash when more than 4KB of data is written to
-        # stdout or stderr. This is a bug that has been with Python for a very
-        # long time; see http://bugs.python.org/issue706263.
-        # A cleaner solution to this problem would be to pass os.devnull to
-        # Popen directly. Unfortunately, that does not work.
-        if executable.endswith('pythonw.exe'):
-            arguments.append('--no-stdout')
-            arguments.append('--no-stderr')
-
+    
     return arguments
 
 
 def launch_kernel(cmd, stdin=None, stdout=None, stderr=None, env=None,
                         independent=False,
-                        cwd=None, ipython_kernel=True,
+                        cwd=None,
                         **kw
                         ):
     """ Launches a localhost kernel, binding to the specified ports.
@@ -141,10 +129,6 b' def launch_kernel(cmd, stdin=None, stdout=None, stderr=None, env=None,'
     cwd : path, optional
         The working dir of the kernel process (default: cwd of this process).
 
-    ipython_kernel : bool, optional
-        Whether the kernel is an official IPython one,
-        and should get a bit of special treatment.
-
     Returns
     -------
     
@@ -166,14 +150,22 b' def launch_kernel(cmd, stdin=None, stdout=None, stderr=None, env=None,'
     # stderr are all invalid.
     redirect_out = sys.executable.endswith('pythonw.exe')
     if redirect_out:
-        _stdout = PIPE if stdout is None else stdout
-        _stderr = PIPE if stderr is None else stderr
+        blackhole = open(os.devnull, 'w')
+        _stdout = blackhole if stdout is None else stdout
+        _stderr = blackhole if stderr is None else stderr
     else:
         _stdout, _stderr = stdout, stderr
     
     env = env if (env is not None) else os.environ.copy()
 
     encoding = getdefaultencoding(prefer_stream=False)
+    kwargs = dict(
+        stdin=_stdin,
+        stdout=_stdout,
+        stderr=_stderr,
+        cwd=cwd,
+        env=env,
+    )
     
     # Spawn a kernel.
     if sys.platform == 'win32':
@@ -181,73 +173,49 b' def launch_kernel(cmd, stdin=None, stdout=None, stderr=None, env=None,'
         cmd = [ cast_bytes_py2(c, encoding) for c in cmd ]
         if cwd:
             cwd = cast_bytes_py2(cwd, sys.getfilesystemencoding() or 'ascii')
+            kwargs['cwd'] = cwd
         
         from IPython.kernel.zmq.parentpoller import ParentPollerWindows
-        # Create a Win32 event for interrupting the kernel.
+        # Create a Win32 event for interrupting the kernel
+        # and store it in an environment variable.
         interrupt_event = ParentPollerWindows.create_interrupt_event()
-        # Store this in an environment variable for third party kernels, but at
-        # present, our own kernel expects this as a command line argument.
-        env["IPY_INTERRUPT_EVENT"] = str(interrupt_event)
-        if ipython_kernel:
-            cmd += [ '--interrupt=%i' % interrupt_event ]
-
-            # If the kernel is running on pythonw and stdout/stderr are not been
-            # re-directed, it will crash when more than 4KB of data is written to
-            # stdout or stderr. This is a bug that has been with Python for a very
-            # long time; see http://bugs.python.org/issue706263.
-            # A cleaner solution to this problem would be to pass os.devnull to
-            # Popen directly. Unfortunately, that does not work.
-            if cmd[0].endswith('pythonw.exe'):
-                if stdout is None:
-                    cmd.append('--no-stdout')
-                if stderr is None:
-                    cmd.append('--no-stderr')
-
-        # Launch the kernel process.
+        env["JPY_INTERRUPT_EVENT"] = str(interrupt_event)
+        # deprecated old env name:
+        env["IPY_INTERRUPT_EVENT"] = env["JPY_INTERRUPT_EVENT"]
+
+        try:
+            from _winapi import DuplicateHandle, GetCurrentProcess, \
+                DUPLICATE_SAME_ACCESS, CREATE_NEW_PROCESS_GROUP
+        except:
+            from _subprocess import DuplicateHandle, GetCurrentProcess, \
+                DUPLICATE_SAME_ACCESS, CREATE_NEW_PROCESS_GROUP
+        # Launch the kernel process
         if independent:
-            proc = Popen(cmd,
-                         creationflags=512, # CREATE_NEW_PROCESS_GROUP
-                         stdin=_stdin, stdout=_stdout, stderr=_stderr, env=env)
+            kwargs['creationflags'] = CREATE_NEW_PROCESS_GROUP
         else:
-            if ipython_kernel:
-                try:
-                    from _winapi import DuplicateHandle, GetCurrentProcess, \
-                        DUPLICATE_SAME_ACCESS
-                except:
-                    from _subprocess import DuplicateHandle, GetCurrentProcess, \
-                        DUPLICATE_SAME_ACCESS
-                pid = GetCurrentProcess()
-                handle = DuplicateHandle(pid, pid, pid, 0,
-                                         True, # Inheritable by new processes.
-                                         DUPLICATE_SAME_ACCESS)
-                cmd +=[ '--parent=%i' % handle ]
-            
-            
-            proc = Popen(cmd,
-                         stdin=_stdin, stdout=_stdout, stderr=_stderr, cwd=cwd, env=env)
+            pid = GetCurrentProcess()
+            handle = DuplicateHandle(pid, pid, pid, 0,
+                                     True, # Inheritable by new processes.
+                                     DUPLICATE_SAME_ACCESS)
+            env['JPY_PARENT_PID'] = str(handle)
+        
+        proc = Popen(cmd, **kwargs)
 
         # Attach the interrupt event to the Popen objet so it can be used later.
         proc.win32_interrupt_event = interrupt_event
 
     else:
         if independent:
-            proc = Popen(cmd, preexec_fn=lambda: os.setsid(),
-                         stdin=_stdin, stdout=_stdout, stderr=_stderr, cwd=cwd, env=env)
+            kwargs['preexec_fn'] = lambda: os.setsid()
         else:
-            if ipython_kernel:
-                cmd += ['--parent=1']
-            proc = Popen(cmd,
-                         stdin=_stdin, stdout=_stdout, stderr=_stderr, cwd=cwd, env=env)
+            env['JPY_PARENT_PID'] = str(os.getpid())
+        
+        proc = Popen(cmd, **kwargs)
 
     # Clean up pipes created to work around Popen bug.
     if redirect_in:
         if stdin is None:
             proc.stdin.close()
-    if redirect_out:
-        if stdout is None:
-            proc.stdout.close()
-        if stderr is None:
-            proc.stderr.close()
 
     return proc
 

IPython/kernel/manager.py

@@ -237,7 +237,6 b' class KernelManager(ConnectionFileMixin):'
             env.update(self.kernel_spec.env or {})
         # launch the kernel subprocess
         self.kernel = self._launch_kernel(kernel_cmd, env=env,
-                                    ipython_kernel=self.ipython_kernel,
                                     **kw)
         self.start_restarter()
         self._connect_control_socket()

IPython/kernel/zmq/kernelapp.py

@@ -53,11 +53,8 b' kernel_aliases.update({'
     'stdin' : 'IPKernelApp.stdin_port',
     'control' : 'IPKernelApp.control_port',
     'f' : 'IPKernelApp.connection_file',
-    'parent': 'IPKernelApp.parent_handle',
     'transport': 'IPKernelApp.transport',
 })
-if sys.platform.startswith('win'):
-    kernel_aliases['interrupt'] = 'IPKernelApp.interrupt'
 
 kernel_flags = dict(base_flags)
 kernel_flags.update({
@@ -133,11 +130,11 b' class IPKernelApp(BaseIPythonApplication, InteractiveShellApp,'
         config=True, help="The importstring for the DisplayHook factory")
 
     # polling
-    parent_handle = Integer(0, config=True,
+    parent_handle = Integer(int(os.environ.get('JPY_PARENT_PID') or 0), config=True,
         help="""kill this process if its parent dies.  On Windows, the argument
         specifies the HANDLE of the parent process, otherwise it is simply boolean.
         """)
-    interrupt = Integer(0, config=True,
+    interrupt = Integer(int(os.environ.get('JPY_INTERRUPT_EVENT') or 0), config=True,
         help="""ONLY USED ON WINDOWS
         Interrupt this process when the parent is signaled.
         """)

IPython/kernel/zmq/serialize.py

@@ -11,14 +11,14 b' except:'
     import pickle
 
 # IPython imports
-from IPython.utils import py3compat
+from IPython.utils.py3compat import PY3, buffer_to_bytes_py2
 from IPython.utils.data import flatten
 from IPython.utils.pickleutil import (
     can, uncan, can_sequence, uncan_sequence, CannedObject,
     istype, sequence_types, PICKLE_PROTOCOL,
 )
 
-if py3compat.PY3:
+if PY3:
     buffer = memoryview
 
 #-----------------------------------------------------------------------------
@@ -105,10 +105,7 b' def deserialize_object(buffers, g=None):'
     (newobj, bufs) : unpacked object, and the list of remaining unused buffers.
     """
     bufs = list(buffers)
-    pobj = bufs.pop(0)
-    if not isinstance(pobj, bytes):
-        # a zmq message
-        pobj = bytes(pobj)
+    pobj = buffer_to_bytes_py2(bufs.pop(0))
     canned = pickle.loads(pobj)
     if istype(canned, sequence_types) and len(canned) < MAX_ITEMS:
         for c in canned:
@@ -161,11 +158,10 b' def unpack_apply_message(bufs, g=None, copy=True):'
     Returns: original f,args,kwargs"""
     bufs = list(bufs) # allow us to pop
     assert len(bufs) >= 2, "not enough buffers!"
-    if not copy:
-        for i in range(2):
-            bufs[i] = bufs[i].bytes
-    f = uncan(pickle.loads(bufs.pop(0)), g)
-    info = pickle.loads(bufs.pop(0))
+    pf = buffer_to_bytes_py2(bufs.pop(0))
+    f = uncan(pickle.loads(pf), g)
+    pinfo = buffer_to_bytes_py2(bufs.pop(0))
+    info = pickle.loads(pinfo)
     arg_bufs, kwarg_bufs = bufs[:info['narg_bufs']], bufs[info['narg_bufs']:]
     
     args = []

IPython/kernel/zmq/zmqshell.py

@@ -447,12 +447,13 b' class ZMQInteractiveShell(InteractiveShell):'
 
         return exc_content
 
-    def set_next_input(self, text):
+    def set_next_input(self, text, replace=False):
         """Send the specified text to the frontend to be presented at the next
         input cell."""
         payload = dict(
             source='set_next_input',
-            text=text
+            text=text,
+            replace=replace,
         )
         self.payload_manager.write_payload(payload)
     

IPython/nbconvert/exporters/script.py

@@ -1,14 +1,33 b''
 """Generic script exporter class for any kernel language"""
 
+# Copyright (c) IPython Development Team.
+# Distributed under the terms of the Modified BSD License.
+
 from .templateexporter import TemplateExporter
 
+from IPython.utils.traitlets import Dict
+
 class ScriptExporter(TemplateExporter):
+    
+    _exporters = Dict()
+    
     def _template_file_default(self):
         return 'script'
 
     def from_notebook_node(self, nb, resources=None, **kw):
         langinfo = nb.metadata.get('language_info', {})
+        
+        # delegate to custom exporter, if specified
+        exporter_name = langinfo.get('nbconvert_exporter')
+        if exporter_name and exporter_name != 'script':
+            self.log.debug("Loading script exporter: %s", exporter_name)
+            from .export import exporter_map
+            if exporter_name not in self._exporters:
+                Exporter = exporter_map[exporter_name]
+                self._exporters[exporter_name] = Exporter(parent=self)
+            exporter = self._exporters[exporter_name]
+            return exporter.from_notebook_node(nb, resources, **kw)
+        
         self.file_extension = langinfo.get('file_extension', '.txt')
         self.output_mimetype = langinfo.get('mimetype', 'text/plain')
-
         return super(ScriptExporter, self).from_notebook_node(nb, resources, **kw)

IPython/nbconvert/filters/markdown.py

@@ -77,7 +77,7 b' class MathBlockGrammar(mistune.BlockGrammar):'
 
 @undoc
 class MathBlockLexer(mistune.BlockLexer):
-    default_features = ['block_math', 'latex_environment'] + mistune.BlockLexer.default_features
+    default_rules = ['block_math', 'latex_environment'] + mistune.BlockLexer.default_rules
 
     def __init__(self, rules=None, **kwargs):
         if rules is None:
@@ -105,7 +105,7 b' class MathInlineGrammar(mistune.InlineGrammar):'
 
 @undoc
 class MathInlineLexer(mistune.InlineLexer):
-    default_features = ['math'] + mistune.InlineLexer.default_features
+    default_rules = ['math'] + mistune.InlineLexer.default_rules
 
     def __init__(self, renderer, rules=None, **kwargs):
         if rules is None:
@@ -124,10 +124,10 b' class MarkdownWithMath(mistune.Markdown):'
             kwargs['block'] = MathBlockLexer
         super(MarkdownWithMath, self).__init__(renderer, **kwargs)
 
-    def parse_block_math(self):
+    def output_block_math(self):
         return self.renderer.block_math(self.token['text'])
 
-    def parse_latex_environment(self):
+    def output_latex_environment(self):
         return self.renderer.latex_environment(self.token['name'], self.token['text'])
 
 @undoc

IPython/nbformat/__init__.py

@@ -5,6 +5,8 b' Use this module to read or write notebook files as particular nbformat versions.'
 
 # Copyright (c) IPython Development Team.
 # Distributed under the terms of the Modified BSD License.
+import io
+from IPython.utils import py3compat
 
 from IPython.utils.log import get_logger
 
@@ -112,8 +114,8 b' def read(fp, as_version, **kwargs):'
 
     Parameters
     ----------
-    fp : file
-        Any file-like object with a read method.
+    fp : file or str
+        Any file-like object with a read method, or a path to a file.
     as_version: int
         The version of the notebook format to return.
         The notebook will be converted, if necessary.
@@ -124,6 +126,10 b' def read(fp, as_version, **kwargs):'
     nb : NotebookNode
         The notebook that was read.
     """
+    if isinstance(fp, py3compat.string_types):
+        with io.open(fp, encoding='utf-8') as f:
+            return read(f, as_version, **kwargs)
+
     return reads(fp.read(), as_version, **kwargs)
 
 
@@ -136,14 +142,19 b' def write(nb, fp, version=NO_CONVERT, **kwargs):'
     ----------
     nb : NotebookNode
         The notebook to write.
-    fp : file
-        Any file-like object with a write method that accepts unicode.
+    fp : file or str
+        Any file-like object with a write method that accepts unicode, or
+        a path to write a file.
     version : int, optional
         The nbformat version to write.
         If nb is not this version, it will be converted.
         If unspecified, or specified as nbformat.NO_CONVERT,
         the notebook's own version will be used and no conversion performed.
     """
+    if isinstance(fp, py3compat.string_types):
+        with io.open(fp, 'w', encoding='utf-8') as f:
+            return write(nb, f, version=version, **kwargs)
+
     s = writes(nb, version, **kwargs)
     if isinstance(s, bytes):
         s = s.decode('utf8')

IPython/nbformat/tests/test_api.py

@@ -4,11 +4,13 b''
 # Distributed under the terms of the Modified BSD License.
 
 import json
+import os
 
 from .base import TestsBase
 
+from IPython.utils.tempdir import TemporaryDirectory
 from ..reader import get_version
-from IPython.nbformat import read, current_nbformat, writes
+from IPython.nbformat import read, current_nbformat, writes, write
 
 
 class TestAPI(TestsBase):
@@ -35,3 +37,13 b' class TestAPI(TestsBase):'
         nb2 = json.loads(jsons)
         (major, minor) = get_version(nb2)
         self.assertEqual(major, 2)
+
+    def test_read_write_path(self):
+        """read() and write() take filesystem paths"""
+        path = os.path.join(self._get_files_path(), u'test4.ipynb')
+        nb = read(path, as_version=4)
+
+        with TemporaryDirectory() as td:
+            dest = os.path.join(td, 'echidna.ipynb')
+            write(nb, dest)
+            assert os.path.isfile(dest)

IPython/qt/console/frontend_widget.py

@@ -615,10 +615,11 b' class FrontendWidget(HistoryConsoleWidget, BaseFrontendMixin):'
 
         if clear:
             self._control.clear()
-            self._append_plain_text(self.banner)
-            if self.kernel_banner:
-                self._append_plain_text(self.kernel_banner)
-                
+            if self._display_banner:
+                self._append_plain_text(self.banner)
+                if self.kernel_banner:
+                    self._append_plain_text(self.kernel_banner)
+
         # update output marker for stdout/stderr, so that startup
         # messages appear after banner:
         self._append_before_prompt_pos = self._get_cursor().position()

IPython/qt/console/qtconsoleapp.py

@@ -50,6 +50,7 b" if os.name == 'nt':"
 from IPython.external.qt import QtCore, QtGui
 
 # Local imports
+from IPython.config.application import boolean_flag
 from IPython.config.application import catch_config_error
 from IPython.core.application import BaseIPythonApplication
 from IPython.qt.console.ipython_widget import IPythonWidget
@@ -91,6 +92,11 b' qt_flags = {'
     'plain' : ({'IPythonQtConsoleApp' : {'plain' : True}},
             "Disable rich text support."),
 }
+qt_flags.update(boolean_flag(
+    'banner', 'IPythonQtConsoleApp.display_banner',
+    "Display a banner upon starting the QtConsole.",
+    "Don't display a banner upon starting the QtConsole."
+))
 
 # and app_flags from the Console Mixin
 qt_flags.update(app_flags)
@@ -168,6 +174,10 b' class IPythonQtConsoleApp(BaseIPythonApplication, IPythonConsoleApp):'
     plain = CBool(False, config=True,
         help="Use a plaintext widget instead of rich text (plain can't print/save).")
 
+    display_banner = CBool(True, config=True,
+        help="Whether to display a banner upon starting the QtConsole."
+    )
+
     def _plain_changed(self, name, old, new):
         kind = 'plain' if new else 'rich'
         self.config.ConsoleWidget.kind = kind
@@ -255,6 +265,7 b' class IPythonQtConsoleApp(BaseIPythonApplication, IPythonConsoleApp):'
         self.widget._existing = self.existing
         self.widget._may_close = not self.existing
         self.widget._confirm_exit = self.confirm_exit
+        self.widget._display_banner = self.display_banner
 
         self.widget.kernel_manager = self.kernel_manager
         self.widget.kernel_client = self.kernel_client

IPython/qt/kernel_mixins.py

@@ -17,10 +17,6 b' class ChannelQObject(SuperQObject):'
     # Emitted when the channel is stopped.
     stopped = QtCore.Signal()
 
-    #---------------------------------------------------------------------------
-    # Channel interface
-    #---------------------------------------------------------------------------
-
     def start(self):
         """ Reimplemented to emit signal.
         """
@@ -61,10 +57,6 b' class QtShellChannelMixin(ChannelQObject):'
     history_reply = QtCore.Signal(object)
     kernel_info_reply = QtCore.Signal(object)
 
-    #---------------------------------------------------------------------------
-    # 'ShellChannel' interface
-    #---------------------------------------------------------------------------
-
     def call_handlers(self, msg):
         """ Reimplemented to emit signals instead of making callbacks.
         """
@@ -108,10 +100,6 b' class QtIOPubChannelMixin(ChannelQObject):'
     # Emitted when a shutdown is noticed.
     shutdown_reply_received = QtCore.Signal(object)
 
-    #---------------------------------------------------------------------------
-    # 'IOPubChannel' interface
-    #---------------------------------------------------------------------------
-
     def call_handlers(self, msg):
         """ Reimplemented to emit signals instead of making callbacks.
         """
@@ -122,8 +110,6 b' class QtIOPubChannelMixin(ChannelQObject):'
         signal = getattr(self, msg_type + '_received', None)
         if signal:
             signal.emit(msg)
-        elif msg_type in ('stdout', 'stderr'):
-            self.stream_received.emit(msg)
 
     def flush(self):
         """ Reimplemented to ensure that signals are dispatched immediately.
@@ -140,10 +126,6 b' class QtStdInChannelMixin(ChannelQObject):'
     # Emitted when an input request is received.
     input_requested = QtCore.Signal(object)
 
-    #---------------------------------------------------------------------------
-    # 'StdInChannel' interface
-    #---------------------------------------------------------------------------
-
     def call_handlers(self, msg):
         """ Reimplemented to emit signals instead of making callbacks.
         """
@@ -161,14 +143,9 b' class QtHBChannelMixin(ChannelQObject):'
     # Emitted when the kernel has died.
     kernel_died = QtCore.Signal(object)
 
-    #---------------------------------------------------------------------------
-    # 'HBChannel' interface
-    #---------------------------------------------------------------------------
-
     def call_handlers(self, since_last_heartbeat):
         """ Reimplemented to emit signals instead of making callbacks.
         """
-        # Emit the generic signal.
         self.kernel_died.emit(since_last_heartbeat)
 
 

IPython/terminal/console/interactiveshell.py

@@ -529,7 +529,7 b' class ZMQTerminalInteractiveShell(TerminalInteractiveShell):'
             except KeyboardInterrupt:
                 #double-guard against keyboardinterrupts during kbdint handling
                 try:
-                    self.write('\nKeyboardInterrupt\n')
+                    self.write('\n' + self.get_exception_only())
                     source_raw = self.input_splitter.raw_reset()
                     hlen_b4_cell = self._replace_rlhist_multiline(source_raw, hlen_b4_cell)
                     more = False

IPython/terminal/interactiveshell.py

@@ -468,7 +468,7 b' class TerminalInteractiveShell(InteractiveShell):'
             except KeyboardInterrupt:
                 #double-guard against keyboardinterrupts during kbdint handling
                 try:
-                    self.write('\nKeyboardInterrupt\n')
+                    self.write('\n' + self.get_exception_only())
                     source_raw = self.input_splitter.raw_reset()
                     hlen_b4_cell = \
                         self._replace_rlhist_multiline(source_raw, hlen_b4_cell)

IPython/testing/iptestcontroller.py

@@ -15,6 +15,7 b' import argparse'
 import json
 import multiprocessing.pool
 import os
+import stat
 import re
 import requests
 import shutil
@@ -170,6 +171,18 b' class PyTestController(TestController):'
         # This means we won't get odd effects from our own matplotlib config
         self.env['MPLCONFIGDIR'] = workingdir.name
 
+        # Add a non-accessible directory to PATH (see gh-7053)
+        noaccess = os.path.join(self.workingdir.name, "_no_access_")
+        self.noaccess = noaccess
+        os.mkdir(noaccess, 0)
+
+        PATH = os.environ.get('PATH', '')
+        if PATH:
+            PATH = noaccess + os.pathsep + PATH
+        else:
+            PATH = noaccess
+        self.env['PATH'] = PATH
+
         # From options:
         if self.options.xunit:
             self.add_xunit()
@@ -178,6 +191,14 b' class PyTestController(TestController):'
         self.env['IPTEST_SUBPROC_STREAMS'] = self.options.subproc_streams
         self.cmd.extend(self.options.extra_args)
 
+    def cleanup(self):
+        """
+        Make the non-accessible directory created in setup() accessible
+        again, otherwise deleting the workingdir will fail.
+        """
+        os.chmod(self.noaccess, stat.S_IRWXU)
+        TestController.cleanup(self)
+
     @property
     def will_run(self):
         try:

IPython/utils/pickleutil.py

@@ -17,7 +17,7 b' except ImportError:'
 from . import codeutil  # This registers a hook when it's imported
 from . import py3compat
 from .importstring import import_item
-from .py3compat import string_types, iteritems
+from .py3compat import string_types, iteritems, buffer_to_bytes_py2
 
 from IPython.config import Application
 from IPython.utils.log import get_logger
@@ -260,8 +260,8 b' class CannedArray(CannedObject):'
         from numpy import frombuffer
         data = self.buffers[0]
         if self.pickled:
-            # no shape, we just pickled it
-            return pickle.loads(data)
+            # we just pickled it
+            return pickle.loads(buffer_to_bytes_py2(data))
         else:
             return frombuffer(data, dtype=self.dtype).reshape(self.shape)
 

IPython/utils/py3compat.py

@@ -30,6 +30,12 b' def cast_bytes(s, encoding=None):'
         return encode(s, encoding)
     return s
 
+def buffer_to_bytes(buf):
+    """Cast a buffer object to bytes"""
+    if not isinstance(buf, bytes):
+        buf = bytes(buf)
+    return buf
+
 def _modify_str_or_docstring(str_change_func):
     @functools.wraps(str_change_func)
     def wrapper(func_or_str):
@@ -86,6 +92,7 b' if sys.version_info[0] >= 3:'
     bytes_to_str = decode
     cast_bytes_py2 = no_code
     cast_unicode_py2 = no_code
+    buffer_to_bytes_py2 = no_code
     
     string_types = (str,)
     unicode_type = str
@@ -151,6 +158,7 b' else:'
     bytes_to_str = no_code
     cast_bytes_py2 = cast_bytes
     cast_unicode_py2 = cast_unicode
+    buffer_to_bytes_py2 = buffer_to_bytes
     
     string_types = (str, unicode)
     unicode_type = unicode

docs/source/development/messaging.rst

@@ -429,6 +429,9 b' The main example being ``%load``.'
       "source": "set_next_input",
       # the text contents of the cell to create
       "text": "some cell content",
+      # If true, replace the current cell in document UIs instead of inserting
+      # a cell. Ignored in console UIs.
+      "replace": bool,
     }
 
 **edit**: open a file for editing.

setup.py

@@ -270,7 +270,7 b' extras_require = dict('
     test = ['nose>=0.10.1', 'requests'],
     terminal = [],
     nbformat = ['jsonschema>=2.0'],
-    notebook = ['tornado>=4.0', 'pyzmq>=2.1.11', 'jinja2', 'pygments', 'mistune>=0.3.1'],
+    notebook = ['tornado>=4.0', 'pyzmq>=2.1.11', 'jinja2', 'pygments', 'mistune>=0.5'],
     nbconvert = ['pygments', 'jinja2', 'mistune>=0.3.1']
 )