diff options
Diffstat (limited to 'src/mailman/commands/cli_import.py')
| -rw-r--r-- | src/mailman/commands/cli_import.py | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/src/mailman/commands/cli_import.py b/src/mailman/commands/cli_import.py index 50d4f1864..344d5baee 100644 --- a/src/mailman/commands/cli_import.py +++ b/src/mailman/commands/cli_import.py @@ -25,6 +25,7 @@ __all__ = [ import sys import pickle +from contextlib import ExitStack, contextmanager from mailman.core.i18n import _ from mailman.database.transaction import transactional from mailman.interfaces.command import ICLISubCommand @@ -35,13 +36,24 @@ from zope.interface import implementer -# Mock the Bouncer class from Mailman 2.1, we don't use it but there are -# instances in the pickled config files +# A fake Bouncer class from Mailman 2.1, we don't use it but there are +# instances in the .pck files. class Bouncer: class _BounceInfo: pass +@contextmanager +def hacked_sys_modules(): + assert 'Mailman.Bouncer' not in sys.modules + sys.modules['Mailman.Bouncer'] = Bouncer + try: + yield + finally: + del sys.modules['Mailman.Bouncer'] + + + @implementer(ICLISubCommand) class Import21: @@ -82,11 +94,13 @@ class Import21: assert len(args.pickle_file) == 1, ( 'Unexpected positional arguments: %s' % args.pickle_file) filename = args.pickle_file[0] - sys.modules["Mailman.Bouncer"] = Bouncer - with open(filename, 'rb') as fp: + with ExitStack() as resources: + fp = resources.enter_context(open(filename, 'rb')) + resources.enter_context(hacked_sys_modules()) while True: try: - config_dict = pickle.load(fp, encoding="utf-8", errors="ignore") + config_dict = pickle.load( + fp, encoding='utf-8', errors='ignore') except EOFError: break except pickle.UnpicklingError: @@ -103,4 +117,3 @@ class Import21: except Import21Error as error: print(error, file=sys.stderr) sys.exit(1) - del sys.modules["Mailman.Bouncer"] |