From dca04a24257f7ccded1551dfb2a2169030ef9180 2016-02-17 14:28:09
From: Thomas Kluyver <thomas@kluyver.me.uk>
Date: 2016-02-17 14:28:09
Subject: [PATCH] Don't try to pass shell up kwargs from Magics class

See ipython/traitlets#176 - this is causing test failures.

---

diff --git a/IPython/core/magic.py b/IPython/core/magic.py
index 0566fa9..065650a 100644
--- a/IPython/core/magic.py
+++ b/IPython/core/magic.py
@@ -520,7 +520,6 @@ class Magics(Configurable):
                 shell.configurables.append(self)
             if hasattr(shell, 'config'):
                 kwargs.setdefault('parent', shell)
-            kwargs['shell'] = shell
 
         self.shell = shell
         self.options_table = {}