From de851f31f6f7d4d9329119cc2cb97a33e04f0949 Mon Sep 17 00:00:00 2001 From: Douglas Blank Date: Fri, 12 Sep 2014 21:08:34 -0400 Subject: [PATCH] magic kernel: call do_function_direct --- eval_kernel/eval_kernel.py | 6 ++++++ jupyter_kernel/magickernel.py | 7 +++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/eval_kernel/eval_kernel.py b/eval_kernel/eval_kernel.py index 4a01c7c0..8eb114ee 100644 --- a/eval_kernel/eval_kernel.py +++ b/eval_kernel/eval_kernel.py @@ -32,6 +32,12 @@ def do_execute_direct(self, code): python_magic = self.line_magics['python'] return python_magic.eval(code.strip()) + def do_function_direct(self, function_name, arg): + """ + Call a function in the kernel language with args (as a single item). + """ + return python_magic.eval("%s(%s)" % (function_name, arg)) + def get_completions(self, info): python_magic = self.line_magics['python'] return python_magic.get_completions(info) diff --git a/jupyter_kernel/magickernel.py b/jupyter_kernel/magickernel.py index 9c656f13..c5cc6acd 100644 --- a/jupyter_kernel/magickernel.py +++ b/jupyter_kernel/magickernel.py @@ -118,13 +118,12 @@ def do_execute_file(self, filename): """ self.Error("This language does not support \"%run filename\".") - def do_function_direct(self, function_name, args): + def do_function_direct(self, function_name, arg): """ Call a function in the kernel language with args (as a single item). """ - #self.Error("This language does not support \"%pmap function args\".") - return (function_name, args) - + self.Error("This language does not support \"%pmap function args\".") + def restart_kernel(self): """Restart the kernel""" pass