Fix references to deprecated objects in the types module

2to3 fixer: types

IPython/utils/jsonutil.py

@@ -184,7 +184,7 b' def json_clean(obj):'
     """
     # types that are 'atomic' and ok in json as-is.  bool doesn't need to be
     # listed explicitly because bools pass as int instances
-    atomic_ok = (unicode_type, int, types.NoneType)
+    atomic_ok = (unicode_type, int, type(None))
 
     # containers that we need to convert into lists
     container_to_list = (tuple, set, types.GeneratorType)

IPython/utils/wildcard.py

@@ -44,7 +44,7 b' def is_type(obj, typestr_or_type):'
     TODO: Should be extended for choosing more than one type."""
     if typestr_or_type == "all":
         return True
-    if type(typestr_or_type) == types.TypeType:
+    if type(typestr_or_type) == type:
         test_type = typestr_or_type
     else:
         test_type = typestr2type.get(typestr_or_type, False)