make z.getInterpreterContext().out().clear() work in PythonInterpreter

tylerba-f · Mar 3, 2018 · 224a2df · 224a2df
1 parent 21dc20d
commit 224a2df
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/python/src/main/java/org/apache/zeppelin/python/PythonInterpreter.java b/python/src/main/java/org/apache/zeppelin/python/PythonInterpreter.java
@@ -388,6 +388,7 @@ public InterpreterResult interpret(String cmd, InterpreterContext contextInterpr
 
     zeppelinContext.setGui(context.getGui());
     zeppelinContext.setNoteGui(context.getNoteGui());
+    zeppelinContext.setInterpreterContext(context);
 
     if (!pythonscriptRunning) {
       return new InterpreterResult(Code.ERROR, "python process not running"

diff --git a/python/src/main/resources/python/zeppelin_python.py b/python/src/main/resources/python/zeppelin_python.py
@@ -61,7 +61,7 @@ def __init__(self, z):
     self._setup_matplotlib()
 
   def getInterpreterContext(self):
-    return self.z.getCurrentInterpreterContext()
+    return self.z.getInterpreterContext()
 
   def input(self, name, defaultValue=""):
     return self.z.input(name, defaultValue)

diff --git a/python/src/test/java/org/apache/zeppelin/python/PythonInterpreterTest.java b/python/src/test/java/org/apache/zeppelin/python/PythonInterpreterTest.java
@@ -123,6 +123,12 @@ public void testRedefinitionZeppelinContext() throws InterpreterException {
     assertEquals(InterpreterResult.Code.SUCCESS, pythonInterpreter.interpret(pyValidCode, context).code());
   }
 
+  @Test
+  public void testOutputClear() throws InterpreterException {
+    InterpreterResult result = pythonInterpreter.interpret("print(\"Hello\")\nz.getInterpreterContext().out().clear()\nprint(\"world\")\n", context);
+    assertEquals("%text world\n", out.getCurrentOutput().toString());
+  }
+
   @Override
   public void onUpdateAll(InterpreterOutput out) {