fix tests

Author: marius311

src/julia/pyjulia_helper.jl

@@ -81,11 +81,14 @@ macro prepare_for_pyjulia_call(ex)
                 """)
             end
         elseif isexpr(x, :macrocall) && x.args[1]==Symbol("@py_str")
-            make_pyeval(x.args[3:end]...), false
+            # in Julia 0.7+, x.args[2] is a LineNumberNode, so filter it out
+            # in a way that's compatible with Julia 0.6:
+            make_pyeval(filter(s->(s isa String), x.args[2:end])...), false
         else
             x, true
         end 
     end
+    
     esc(quote
         $pyfunction(($globals,$locals) -> (@eval Main $ex), $PyObject, $PyObject)
     end)

test/test_magic.py

@@ -1,7 +1,11 @@
-from IPython.testing.globalipapp import start_ipython as _start_ipython
+from textwrap import dedent
+
+import pytest
 from IPython import get_ipython as _get_ipython
+from IPython.testing.globalipapp import start_ipython as _start_ipython
+
 from julia import magic
-import pytest
+
 
 def get_ipython():
     return _start_ipython() or _get_ipython()
@@ -36,46 +40,46 @@ def test_failure_cell(julia_magics):
 
 
 def test_interp_var(julia_magics):
-    assert julia_magics.shell.run_cell("""
+    assert julia_magics.shell.run_cell(dedent("""
     x=1
     %julia $x
-    """).result == 1
+    """)).result == 1
 
 def test_interp_expr(julia_magics):
-    assert julia_magics.shell.run_cell("""
+    assert julia_magics.shell.run_cell(dedent("""
     x=1
     %julia py"x+1"
-    """).result == 2
+    """)).result == 2
 
 def test_bad_interp(julia_magics):
-    assert julia_magics.shell.run_cell("""
+    assert julia_magics.shell.run_cell(dedent("""
     %julia $(x+1)
-    """).error_in_exec is not None
+    """)).error_in_exec is not None
 
 def test_string_interp(julia_magics):
-    assert julia_magics.shell.run_cell("""
+    assert julia_magics.shell.run_cell(dedent("""
     %julia foo=3; "$foo"    
-    """).result == '3'
+    """)).result == '3'
 
 def test_interp_escape(julia_magics):
-    assert julia_magics.shell.run_cell("""
+    assert julia_magics.shell.run_cell(dedent("""
     %julia bar=3; :($$bar)
-    """).result == 3
+    """)).result == 3
 
 def test_type_conversion(julia_magics):
-    assert julia_magics.shell.run_cell("""
+    assert julia_magics.shell.run_cell(dedent("""
     %julia py"1" isa Int && py"1"o isa PyObject
-    """).result == True
+    """)).result == True
 
 def test_scoping(julia_magics):
-    assert julia_magics.shell.run_cell("""
+    assert julia_magics.shell.run_cell(dedent("""
     x = "global"
     def f():
         x = "local"
         ret = %julia py"x"
         return ret
     f()    
-    """).result == "local"
+    """)).result == "local"
 
 def test_revise_error():
     from julia.ipy import revise