Skip to content

moved DummyMod to proper namespace to enable dill pickling #4186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
takluyver merged 4 commits into from
Sep 11, 2013
Merged

moved DummyMod to proper namespace to enable dill pickling #4186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
311acdf
converted multi-context with-statements to nested (2.6 compatibility)
mmckerns Sep 9, 2013
acfd4b1
moved DummyMod to proper namespace to enable pickling
mmckerns Sep 9, 2013
64466dd
Revert "converted multi-context with-statements to nested (2.6 compat…
mmckerns Sep 9, 2013
338525e
added undoc and made DummyMod doc more reflective of context
mmckerns Sep 11, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions IPython/core/interactiveshell.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,13 @@ def get_readline_tail(self, n=10):
ghi = self.shell.readline.get_history_item
return [ghi(x) for x in range(start, end)]


@undoc
class DummyMod(object):
"""A dummy module used for IPython's interactive module when
a namespace must be assigned to the module's __dict__."""
pass

#-----------------------------------------------------------------------------
# Main IPython class
#-----------------------------------------------------------------------------
Expand Down Expand Up @@ -1035,9 +1042,6 @@ def prepare_user_module(self, user_module=None, user_ns=None):
"""
if user_module is None and user_ns is not None:
user_ns.setdefault("__name__", "__main__")
class DummyMod(object):
"A dummy module used for IPython's interactive namespace."
pass
user_module = DummyMod()
user_module.__dict__ = user_ns

Expand Down
4 changes: 1 addition & 3 deletions IPython/terminal/embed.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

from IPython.core import ultratb, compilerop
from IPython.core.magic import Magics, magics_class, line_magic
from IPython.core.interactiveshell import DummyMod
from IPython.terminal.interactiveshell import TerminalInteractiveShell
from IPython.terminal.ipapp import load_default_config

Expand Down Expand Up @@ -185,9 +186,6 @@ def mainloop(self, local_ns=None, module=None, stack_depth=0,
there is no fundamental reason why it can't work perfectly."""

if (global_ns is not None) and (module is None):
class DummyMod(object):
"""A dummy module object for embedded IPython."""
pass
warnings.warn("global_ns is deprecated, use module instead.", DeprecationWarning)
module = DummyMod()
module.__dict__ = global_ns
Expand Down