diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mailman/app/subscriptions.py | 2 | ||||
| -rw-r--r-- | src/mailman/app/tests/test_bounces.py | 2 | ||||
| -rw-r--r-- | src/mailman/email/message.py | 4 | ||||
| -rw-r--r-- | src/mailman/model/requests.py | 2 | ||||
| -rw-r--r-- | src/mailman/model/user.py | 2 | ||||
| -rw-r--r-- | src/mailman/utilities/string.py | 5 |
6 files changed, 9 insertions, 8 deletions
diff --git a/src/mailman/app/subscriptions.py b/src/mailman/app/subscriptions.py index 99c6ab2de..ac6368c2a 100644 --- a/src/mailman/app/subscriptions.py +++ b/src/mailman/app/subscriptions.py @@ -148,7 +148,7 @@ class SubscriptionService: if mlist is None: raise NoSuchListError(list_id) # Is the subscriber an email address or user id? - if isinstance(subscriber, basestring): + if isinstance(subscriber, str): if display_name is None: display_name, at, domain = subscriber.partition('@') # Because we want to keep the REST API simple, there is no diff --git a/src/mailman/app/tests/test_bounces.py b/src/mailman/app/tests/test_bounces.py index 5eb518786..b37185789 100644 --- a/src/mailman/app/tests/test_bounces.py +++ b/src/mailman/app/tests/test_bounces.py @@ -533,7 +533,7 @@ Subject: Ignore def test_no_sender(self): # The message won't be bounced if it has no discernible sender. - self._msg.sender = None + del self._msg['from'] bounce_message(self._mlist, self._msg) items = get_queue_messages('virgin') # Nothing in the virgin queue means nothing's been bounced. diff --git a/src/mailman/email/message.py b/src/mailman/email/message.py index 4d26ca9c4..539d151ad 100644 --- a/src/mailman/email/message.py +++ b/src/mailman/email/message.py @@ -168,8 +168,8 @@ class UserNotification(Message): subject = ('(no subject)' if subject is None else subject) if text is not None: self.set_payload(text.encode(charset), charset) - self['Subject'] = Header(subject.encode(charset), charset, - header_name='Subject', errors='replace') + self['Subject'] = Header( + subject, charset, header_name='Subject', errors='replace') self['From'] = sender if isinstance(recipients, (list, set, tuple)): self['To'] = COMMASPACE.join(recipients) diff --git a/src/mailman/model/requests.py b/src/mailman/model/requests.py index 394084b71..e8428244a 100644 --- a/src/mailman/model/requests.py +++ b/src/mailman/model/requests.py @@ -53,6 +53,7 @@ class DataPendable(dict): for key, value in mapping.items(): assert isinstance(key, six.string_types) if not isinstance(value, six.text_type): + import pdb; pdb.set_trace() key = '_pck_' + key value = dumps(value).decode('raw-unicode-escape') clean_mapping[key] = value @@ -114,6 +115,7 @@ class ListRequests: @dbconnection def get_request(self, store, request_id, request_type=None): + import pdb; pdb.set_trace() result = store.query(_Request).get(request_id) if result is None: return None diff --git a/src/mailman/model/user.py b/src/mailman/model/user.py index ab581fdc8..abba68589 100644 --- a/src/mailman/model/user.py +++ b/src/mailman/model/user.py @@ -56,7 +56,7 @@ class User(Model): id = Column(Integer, primary_key=True) display_name = Column(Unicode) - _password = Column('password', LargeBinary) + _password = Column('password', Unicode) _user_id = Column(UUID, index=True) _created_on = Column(DateTime) diff --git a/src/mailman/utilities/string.py b/src/mailman/utilities/string.py index d6f0da286..5f0ae03c9 100644 --- a/src/mailman/utilities/string.py +++ b/src/mailman/utilities/string.py @@ -73,9 +73,8 @@ def oneline(s, cset='us-ascii', in_unicode=False): :rtype: string """ try: - h = make_header(decode_header(s)) - ustr = h.__unicode__() - line = EMPTYSTRING.join(ustr.splitlines()) + h = str(make_header(decode_header(s))) + line = EMPTYSTRING.join(h.splitlines()) if in_unicode: return line else: |