diff options
Diffstat (limited to 'src/mailman/model/requests.py')
| -rw-r--r-- | src/mailman/model/requests.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/mailman/model/requests.py b/src/mailman/model/requests.py index de0c51d99..e984d0aea 100644 --- a/src/mailman/model/requests.py +++ b/src/mailman/model/requests.py @@ -23,15 +23,13 @@ __all__ = [ ] -import six - from datetime import timedelta from mailman.database.model import Model from mailman.database.transaction import dbconnection from mailman.database.types import Enum from mailman.interfaces.pending import IPendable, IPendings from mailman.interfaces.requests import IListRequests, RequestType -from six.moves.cPickle import dumps, loads +from pickle import dumps, loads from sqlalchemy import Column, ForeignKey, Integer, Unicode from sqlalchemy.orm import relationship from zope.component import getUtility @@ -50,8 +48,8 @@ class DataPendable(dict): # such a way that it will be properly reconstituted when unpended. clean_mapping = {} for key, value in mapping.items(): - assert isinstance(key, six.string_types) - if not isinstance(value, six.text_type): + assert isinstance(key, (bytes, str)) + if not isinstance(value, str): key = '_pck_' + key value = dumps(value).decode('raw-unicode-escape') clean_mapping[key] = value |
