From 44e43727be13e3554342c2b5b75b7dc42abdb18c Mon Sep 17 00:00:00 2001
From: Barry Warsaw
Date: Sun, 30 Nov 2014 21:51:03 -0500
Subject: Checkpointing.

By using `six` I think I have most of the imports squared away.  There's
probably still uses of `unicode` built-ins that need fixing.

The idea is to first get the test suite running (which it doesn't yet), and
then to fix tests.

There's a bug in lazr.config which requires us to patch it for now.
---
 src/mailman/commands/cli_import.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(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 5e25cd4fe..b53faea96 100644
--- a/src/mailman/commands/cli_import.py
+++ b/src/mailman/commands/cli_import.py
@@ -26,16 +26,15 @@ __all__ = [
 
 
 import sys
-import cPickle
-
-from zope.component import getUtility
-from zope.interface import implementer
 
 from mailman.core.i18n import _
 from mailman.database.transaction import transactional
 from mailman.interfaces.command import ICLISubCommand
 from mailman.interfaces.listmanager import IListManager
 from mailman.utilities.importer import import_config_pck, Import21Error
+from six.moves import cPickle
+from zope.component import getUtility
+from zope.interface import implementer
 
 
 
-- 
cgit v1.2.3-70-g09d2