From ab75b8cfa107a1fd22d3ccd7311bd3a9135189e9 Mon Sep 17 00:00:00 2001
From: Aurélien Bompard
Date: Fri, 20 Feb 2015 16:42:40 +0100
Subject: Fix import from Py2 pickle files

---
 src/mailman/commands/cli_import.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'src/mailman/commands/cli_import.py')

diff --git a/src/mailman/commands/cli_import.py b/src/mailman/commands/cli_import.py
index 30aeb7894..50d4f1864 100644
--- a/src/mailman/commands/cli_import.py
+++ b/src/mailman/commands/cli_import.py
@@ -34,6 +34,14 @@ from zope.component import getUtility
 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
+class Bouncer:
+    class _BounceInfo:
+        pass
+
+
 
 @implementer(ICLISubCommand)
 class Import21:
@@ -74,10 +82,11 @@ 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:
             while True:
                 try:
-                    config_dict = pickle.load(fp)
+                    config_dict = pickle.load(fp, encoding="utf-8", errors="ignore")
                 except EOFError:
                     break
                 except pickle.UnpicklingError:
@@ -94,3 +103,4 @@ class Import21:
                     except Import21Error as error:
                         print(error, file=sys.stderr)
                         sys.exit(1)
+        del sys.modules["Mailman.Bouncer"]
-- 
cgit v1.2.3-70-g09d2