Merge pull request #8778 from SylvainCorlay/Meta

minrk · minrk · commit 3ac9be53e02d · 2015-08-30T00:34:59.000+02:00
Use isinstance to check for types
diff --git a/IPython/core/magic.py b/IPython/core/magic.py
@@ -32,7 +32,7 @@
 from IPython.utils.process import arg_split
 from IPython.utils.py3compat import string_types, iteritems
 from IPython.utils.text import dedent
-from traitlets import Bool, Dict, Instance, MetaHasTraits
+from traitlets import Bool, Dict, Instance
 from IPython.utils.warn import error
 
 #-----------------------------------------------------------------------------
@@ -386,7 +386,7 @@ def register(self, *magic_objects):
             if not m.registered:
                 raise ValueError("Class of magics %r was constructed without "
                                  "the @register_magics class decorator")
-            if type(m) in (type, MetaHasTraits):
+            if isinstance(m, type):
                 # If we're given an uninstantiated class
                 m = m(shell=self.shell)
 
