Merge branch 'master' of ssh://github.com/millejoh/emacs-ipython-notebook

lisp/ein-kernel.el

@@ -883,7 +883,7 @@ as a string and the rest of the argument is the optional ARGS."
                          (let ((func (car packed))
                                (args (cdr packed)))
                            (when (equal msg-type "stream")
-                             (ein:aif (plist-get content :data)
+                             (ein:aif (plist-get content :text)
                                  (apply func it args)))))
                        (cons func args)))))
 

lisp/ein-notebooklist.el

@@ -935,8 +935,10 @@ FIMXE: document how to use `ein:notebooklist-find-file-callback'
   (list :bad-page (re-search-forward "<input type=.?password" nil t)))
 
 (defun ein:notebooklist-login--success-1 (url-or-port callback)
-  (ein:log 'info "Login to %s complete." url-or-port)
-  (funcall callback))
+  (ein:log 'info "Login to %s complete. \
+Now you can open notebook list by `ein:notebooklist-open" url-or-port)
+  (when callback
+    (funcall callback)))
 
 (defun ein:notebooklist-login--error-1 (url-or-port)
   (ein:log 'info "Failed to login to %s" url-or-port))

lisp/ein-pytools.el

@@ -364,7 +364,7 @@ Currently EIN/IPython supports exporting to the following formats:
           (json-pretty-print (point-min) (point-max)))
       (ein:kernel-request-stream
        (ein:get-kernel)
-       (format "__import__('ein').export_nb('%s', '%s')"
+       (format "__import__('ein').export_nb(r'%s', '%s')"
                json
                format)
        (lambda (export buffer)