summaryrefslogtreecommitdiff
path: root/src/mailman/commands/cli_qfile.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_qfile.py
parent3ed695772e7e9c17234097e820a4cedfb0ad3a5d (diff)
downloadmailman-81be16cdfd9ecf86092c90874eb661be2e754043.tar.gz
mailman-81be16cdfd9ecf86092c90874eb661be2e754043.tar.zst
mailman-81be16cdfd9ecf86092c90874eb661be2e754043.zip
Diffstat (limited to 'src/mailman/commands/cli_qfile.py')
-rw-r--r--src/mailman/commands/cli_qfile.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mailman/commands/cli_qfile.py b/src/mailman/commands/cli_qfile.py
index 3ce007dad..55669e981 100644
--- a/src/mailman/commands/cli_qfile.py
+++ b/src/mailman/commands/cli_qfile.py
@@ -22,13 +22,12 @@ __all__ = [
]
-import six
+import pickle
from mailman.core.i18n import _
from mailman.interfaces.command import ICLISubCommand
from mailman.utilities.interact import interact
from pprint import PrettyPrinter
-from six.moves import cPickle
from zope.interface import implementer
@@ -72,7 +71,7 @@ class QFile:
with open(args.qfile[0], 'rb') as fp:
while True:
try:
- m.append(cPickle.load(fp))
+ m.append(pickle.load(fp))
except EOFError:
break
if args.doprint:
@@ -80,7 +79,7 @@ class QFile:
for i, obj in enumerate(m):
count = i + 1
print(_('<----- start object $count ----->'))
- if isinstance(obj, six.string_types):
+ if isinstance(obj, (bytes, str)):
print(obj)
else:
printer.pprint(obj)