Merge pull request ipython#4047 from sdrave/patch-1

Use istype() when checking if canned object is a dict
bfroehle · Aug 16, 2013 · 85dc1e3 · 85dc1e3
2 parents d3320cb + 6a72b2c
commit 85dc1e3
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/IPython/kernel/zmq/serialize.py b/IPython/kernel/zmq/serialize.py
@@ -127,7 +127,7 @@ def unserialize_object(buffers, g=None):
         for c in canned:
             _restore_buffers(c, bufs)
         newobj = uncan_sequence(canned, g)
-    elif isinstance(canned, dict) and len(canned) < MAX_ITEMS:
+    elif istype(canned, dict) and len(canned) < MAX_ITEMS:
         newobj = {}
         for k in sorted(canned.iterkeys()):
             c = canned[k]