fix magic

tdhopper · tdhopper · commit aab788cddf22 · 2020-01-02T09:01:09.000-05:00
diff --git a/Examples.ipynb b/Examples.ipynb
@@ -81,15 +81,7 @@
     "class AltairMagic(Magics):\n",
     "    @cell_magic\n",
     "    def altair(self, line, cell):\n",
-    "        render_altair(exec_then_eval(cell, self.shell))\n",
-    "        return line, cell\n",
-    "    \n",
-    "\n",
-    "    @cell_magic\n",
-    "    def o(self, line, cell):\n",
-    "        self.shell.ex(cell)\n",
-    "        print(Out.keys())\n",
-    "        return self\n",
+    "        return Image(render_altair(exec_then_eval(cell, self.shell)))\n",
     "\n",
     "\n",
     "ip = get_ipython()\n",
@@ -569,7 +561,8 @@
    },
    "outputs": [],
    "source": [
-    "%altair altair.Chart(mpg).mark_circle().encode(\n",
+    "%%altair \n",
+    "altair.Chart(mpg).mark_circle().encode(\n",
     "    altair.X(\"displ\", title=\"Engine Displacement in Liters\",),\n",
     "    altair.Y(\"hwy\", title=\"Highway Miles per Gallon\",),\n",
     ").properties(title=\"Engine Displacement in Liters\")"
@@ -807,7 +800,8 @@
    },
    "outputs": [],
    "source": [
-    "%altair (\n",
+    "%%altair \n",
+    "(\n",
     "    altair.Chart(mpg, title=\"Engine Displacement in Liters vs Highway MPG\",)\n",
     "    .mark_circle()\n",
     "    .encode(\n",
@@ -935,7 +929,7 @@
    },
    "outputs": [],
    "source": [
-    "%altair\n",
+    "%%altair\n",
     "(\n",
     "    altair.Chart(mpg, title=\"Engine Displacement in Liters vs Highway MPG\",)\n",
     "    .mark_circle(opacity=0.3)\n",
@@ -1044,7 +1038,8 @@
    },
    "outputs": [],
    "source": [
-    "%altair altair.Chart(mpg).mark_circle().encode(\n",
+    "%%altair \n",
+    "altair.Chart(mpg).mark_circle().encode(\n",
     "    x=altair.X(\"displ\"), \n",
     "    y=altair.Y(\"hwy\"), \n",
     "    facet=altair.Facet(\"class:O\", columns=4),\n",
@@ -1165,7 +1160,8 @@
    },
    "outputs": [],
    "source": [
-    "%altair (altair \\\n",
+    "%%altair \n",
+    "(altair \\\n",
     " .Chart(mpg) \\\n",
     " .mark_circle() \\\n",
     " .encode(x=\"displ\", y=\"hwy\",) \\\n",
@@ -1812,7 +1808,8 @@
    },
    "outputs": [],
    "source": [
-    "%altair altair.Chart(ts).mark_line().encode(\n",
+    "%%altair \n",
+    "altair.Chart(ts).mark_line().encode(\n",
     "    x=\"date\", y=\"value\"\n",
     ")"
    ]
