summaryrefslogtreecommitdiff
path: root/src/mailman/commands/cli_import.py
diff options
context:
space:
mode:
authorBarry Warsaw2015-01-04 20:40:47 -0500
committerBarry Warsaw2015-01-04 20:40:47 -0500
commit81be16cdfd9ecf86092c90874eb661be2e754043 (patch)
treeb7493a05db05a93f875e3a27754d852b702cfb50 /src/mailman/commands/cli_import.py
parent3ed695772e7e9c17234097e820a4cedfb0ad3a5d (diff)
downloadmailman-81be16cdfd9ecf86092c90874eb661be2e754043.tar.gz
mailman-81be16cdfd9ecf86092c90874eb661be2e754043.tar.zst
mailman-81be16cdfd9ecf86092c90874eb661be2e754043.zip
Diffstat (limited to 'src/mailman/commands/cli_import.py')
-rw-r--r--src/mailman/commands/cli_import.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mailman/commands/cli_import.py b/src/mailman/commands/cli_import.py
index b91a288ea..30aeb7894 100644
--- a/src/mailman/commands/cli_import.py
+++ b/src/mailman/commands/cli_import.py
@@ -23,13 +23,13 @@ __all__ = [
import sys
+import pickle
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
@@ -77,10 +77,10 @@ class Import21:
with open(filename, 'rb') as fp:
while True:
try:
- config_dict = cPickle.load(fp)
+ config_dict = pickle.load(fp)
except EOFError:
break
- except cPickle.UnpicklingError:
+ except pickle.UnpicklingError:
self.parser.error(
_('Not a Mailman 2.1 configuration file: $filename'))
return