From f35ae321730b30dd41fa1d83a5f4c0878bc120c1 2013-08-21 17:51:25 From: Thomas Kluyver Date: 2013-08-21 17:51:25 Subject: [PATCH] Tweaks to interactiveshell for user_ns_hidden as dict --- diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py index c08d91e..aa636af 100644 --- a/IPython/core/interactiveshell.py +++ b/IPython/core/interactiveshell.py @@ -1149,7 +1149,7 @@ class InteractiveShell(SingletonConfigurable): Note that this does not include the displayhook, which also caches objects from the output.""" - return [self.user_ns, self.user_global_ns] + \ + return [self.user_ns, self.user_global_ns, self.user_ns_hidden] + \ [m.__dict__ for m in self._main_mod_cache.values()] def reset(self, new_session=True): @@ -1321,7 +1321,7 @@ class InteractiveShell(SingletonConfigurable): for name, obj in variables.iteritems(): if name in self.user_ns and self.user_ns[name] is obj: del self.user_ns[name] - self.user_ns_hidden.discard(name) + self.user_ns_hidden.pop(name, None) #------------------------------------------------------------------------- # Things related to object introspection