diff options
| author | Barry Warsaw | 2016-10-16 13:13:08 -0400 |
|---|---|---|
| committer | Barry Warsaw | 2016-10-16 13:13:08 -0400 |
| commit | 61a13bbb8597c7b7db0f750bd0a753eb69e0c619 (patch) | |
| tree | 67ea3661fb1d98c2875245906cd3f7fa1f638587 | |
| parent | f2a532ef1d86f93072479b9e3250e9a3b54d51c2 (diff) | |
| parent | f0fcc8b74472c8361ac58b2c4a17b6dd4d1f109d (diff) | |
| download | mailman-61a13bbb8597c7b7db0f750bd0a753eb69e0c619.tar.gz mailman-61a13bbb8597c7b7db0f750bd0a753eb69e0c619.tar.zst mailman-61a13bbb8597c7b7db0f750bd0a753eb69e0c619.zip | |
Merge branch 'master' into issue213.
| -rw-r--r-- | setup.py | 2 | ||||
| -rw-r--r-- | src/mailman/commands/cli_withlist.py | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -101,7 +101,7 @@ case second `m'. Any other spelling is incorrect.""", include_package_data = True, entry_points = { 'console_scripts' : list(scripts), - 'flake8.extension': ['B40 = mailman.testing.flake8:ImportOrder'], + 'flake8.extension': ['B4 = mailman.testing.flake8:ImportOrder'], }, install_requires = [ 'alembic', diff --git a/src/mailman/commands/cli_withlist.py b/src/mailman/commands/cli_withlist.py index 306fb846a..23250c1a5 100644 --- a/src/mailman/commands/cli_withlist.py +++ b/src/mailman/commands/cli_withlist.py @@ -49,13 +49,13 @@ def _start_ipython1(overrides, banner, *, debug=False): if debug: print_exc() return None - return InteractiveShellEmbed(banner1=banner, user_ns=overrides) + return InteractiveShellEmbed.instance(banner1=banner, user_ns=overrides) def _start_ipython4(overrides, banner, *, debug=False): try: from IPython.terminal.embed import InteractiveShellEmbed - shell = InteractiveShellEmbed() + shell = InteractiveShellEmbed.instance() except ImportError: if debug: print_exc() |