tuning code style

notebook/nbconvert/handlers.py

@@ -58,12 +58,12 @@ def get_exporter(format, **kwargs):
     """get an exporter, raising appropriate errors"""
     # if this fails, will raise 500
     try:
-        from nbconvert.exporters.export import exporter_map
+        from nbconvert.exporters.base import get_exporter
     except ImportError as e:
         raise web.HTTPError(500, "Could not import nbconvert: %s" % e)
     
     try:
-        Exporter = exporter_map[format]
+        Exporter = get_exporter(format)
     except KeyError:
         # should this be 400?
         raise web.HTTPError(404, u"No exporter for format: %s" % format)

notebook/notebookapp.py

@@ -389,21 +389,31 @@ class NbserverListApp(JupyterApp):
     description=_("List currently running notebook servers.")
     
     flags = dict(
+        jsonlist=({'NbserverListApp': {'jsonlist': True}},
+              _("Produce machine-readable JSON list output.")),
         json=({'NbserverListApp': {'json': True}},
-              _("Produce machine-readable JSON output.")),
+              _("Produce machine-readable JSON object on each line of output.")),
     )
     
+    jsonlist = Bool(False, config=True,
+          help=_("If True, the output will be a JSON list of objects, one per "
+                 "active notebook server, each with the details from the "
+                 "relevant server info file."))
     json = Bool(False, config=True,
           help=_("If True, each line of output will be a JSON object with the "
-                  "details from the server info file."))
+                  "details from the server info file. For a JSON list output, "
+                  "see the NbserverListApp.jsonlist configuration value"))
 
     def start(self):
-        if not self.json:
-            print(_("Currently running servers:"))
-        for serverinfo in list_running_servers(self.runtime_dir):
-            if self.json:
+        serverinfo_list = list(list_running_servers(self.runtime_dir))
+        if self.jsonlist:
+            print(json.dumps(serverinfo_list, indent=2))
+        elif self.json:
+            for serverinfo in serverinfo_list:
                 print(json.dumps(serverinfo))
-            else:
+        else:
+            print("Currently running servers:")
+            for serverinfo in serverinfo_list:
                 url = serverinfo['url']
                 if serverinfo.get('token'):
                     url = url + '?token=%s' % serverinfo['token']

notebook/static/notebook/js/outputarea.js

@@ -77,7 +77,6 @@ define([
 
     OutputArea.prototype.style = function () {
         this.collapse_button.hide();
-        this.prompt_overlay.hide();
         
         this.wrapper.addClass('output_wrapper');
         this.element.addClass('output');
@@ -263,6 +262,7 @@ define([
     var MIME_SVG = 'image/svg+xml';
     var MIME_PNG = 'image/png';
     var MIME_JPEG = 'image/jpeg';
+    var MIME_GIF = 'image/gif';
     var MIME_PDF = 'application/pdf';
     var MIME_TEXT = 'text/plain';
     
@@ -275,6 +275,7 @@ define([
         MIME_SVG,
         MIME_PNG,
         MIME_JPEG,
+        MIME_GIF,
         MIME_PDF,
         MIME_TEXT,
     ];
@@ -660,6 +661,7 @@ define([
     OutputArea.safe_outputs[MIME_LATEX] = true;
     OutputArea.safe_outputs[MIME_PNG] = true;
     OutputArea.safe_outputs[MIME_JPEG] = true;
+    OutputArea.safe_outputs[MIME_GIF] = true;
 
     OutputArea.prototype.append_mime_type = function (json, element, handle_inserted) {
         for (var i=0; i < OutputArea.display_order.length; i++) {
@@ -683,7 +685,7 @@ define([
                 // callback, if the mime type is something other we must call the 
                 // inserted callback only when the element is actually inserted
                 // into the DOM.  Use a timeout of 0 to do this.
-                if ([MIME_PNG, MIME_JPEG].indexOf(type) < 0 && handle_inserted !== undefined) {
+                if ([MIME_PNG, MIME_JPEG, MIME_GIF].indexOf(type) < 0 && handle_inserted !== undefined) {
                     setTimeout(handle_inserted, 0);
                 }
                 this.events.trigger('output_appended.OutputArea', [type, value, md, toinsert]);
@@ -822,7 +824,7 @@ define([
             });
         }
         img[0].src = 'data:image/png;base64,'+ png;
-        set_width_height(img, md, MIME_PNG);
+        set_width_height(img, md, type);
         dblclick_to_reset_size(img);
         toinsert.append(img);
         element.append(toinsert);
@@ -840,7 +842,24 @@ define([
             });
         }
         img[0].src = 'data:image/jpeg;base64,'+ jpeg;
-        set_width_height(img, md, MIME_JPEG);
+        set_width_height(img, md, type);
+        dblclick_to_reset_size(img);
+        toinsert.append(img);
+        element.append(toinsert);
+        return toinsert;
+    };
+    
+    var append_gif = function (gif, md, element, handle_inserted) {
+        var type = MIME_GIF;
+        var toinsert = this.create_output_subarea(md, "output_gif", type);
+        var img = $("<img/>");
+        if (handle_inserted !== undefined) {
+            img.on('load', function(){
+                handle_inserted(img);
+            });
+        }
+        img[0].src = 'data:image/gif;base64,'+ gif;
+        set_width_height(img, md, type);
         dblclick_to_reset_size(img);
         toinsert.append(img);
         element.append(toinsert);
@@ -1073,6 +1092,7 @@ define([
         MIME_SVG,
         MIME_PNG,
         MIME_JPEG,
+        MIME_GIF,
         MIME_PDF,
         MIME_TEXT
     ];
@@ -1084,6 +1104,7 @@ define([
     OutputArea.append_map[MIME_SVG] = append_svg;
     OutputArea.append_map[MIME_PNG] = append_png;
     OutputArea.append_map[MIME_JPEG] = append_jpeg;
+    OutputArea.append_map[MIME_GIF] = append_gif;
     OutputArea.append_map[MIME_LATEX] = append_latex;
     OutputArea.append_map[MIME_JAVASCRIPT] = append_javascript;
     OutputArea.append_map[MIME_PDF] = append_pdf;

notebook/static/notebook/js/savewidget.js

@@ -192,6 +192,7 @@ define([
             // <Today | yesterday|...> at hh,mm,ss
             human_date = chkd.calendar();
         }
+        
         el.text(i18n.msg.sprintf(i18n.msg._('Last Checkpoint: %s'),human_date)).attr('title', long_date);
     };