Merge pull request #70 from dvzubarev/fix_missing_extra_args

pass extra arguments to ipython kernel
gregsexton · Jun 28, 2017 · 167fef2 · 167fef2
2 parents 2bdf4b5 + 2f95c8f
commit 167fef2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/driver.py b/driver.py
@@ -127,7 +127,10 @@ def main(args):
     parser.add_argument('--port', type=int)
     parser.add_argument('--kernel')
     parser.add_argument('--conn-file')
+
+    parser.add_argument('positional', nargs='*')
     args = parser.parse_args()
+    extra_arguments = args.positional
     if args.conn_file:
         if runtime_dir:
             conn_file = (args.conn_file if os.path.isabs(args.conn_file)
@@ -153,7 +156,7 @@ def onsignal(*args):
             # Emacs sends SIGHUP upon exit
             signal.signal(signal.SIGHUP, onsignal)
 
-        manager.start_kernel()
+        manager.start_kernel(extra_arguments=extra_arguments)
         try:
             semaphore.acquire()
         except KeyboardInterrupt: pass

diff --git a/ob-ipython.el b/ob-ipython.el
@@ -144,7 +144,11 @@
     (apply 'ob-ipython--launch-driver
            (append (list (format "kernel-%s" name))
                    (list "--conn-file" (format "emacs-%s.json" name))
-                   (if kernel (list "--kernel" kernel) '())))))
+                   (if kernel (list "--kernel" kernel) '())
+                   ;;should be last in the list of args
+                   (if ob-ipython-kernel-extra-args
+                       (list "--") '())
+                   ob-ipython-kernel-extra-args))))
 
 (defun ob-ipython--get-kernel-processes ()
   (let ((procs (-filter (lambda (p)