summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/mailman/app/bounces.py2
-rw-r--r--src/mailman/app/moderator.py4
-rw-r--r--src/mailman/archiving/mailarchive.py2
-rw-r--r--src/mailman/archiving/mhonarc.py2
-rw-r--r--src/mailman/archiving/prototype.py2
-rw-r--r--src/mailman/commands/eml_membership.py2
-rw-r--r--src/mailman/email/message.py2
-rw-r--r--src/mailman/email/tests/test_message.py3
-rw-r--r--src/mailman/model/bounce.py2
-rw-r--r--src/mailman/model/messagestore.py2
-rw-r--r--src/mailman/rules/implicit_dest.py2
-rw-r--r--src/mailman/utilities/email.py2
12 files changed, 13 insertions, 14 deletions
diff --git a/src/mailman/app/bounces.py b/src/mailman/app/bounces.py
index 89fff9beb..34b3784c5 100644
--- a/src/mailman/app/bounces.py
+++ b/src/mailman/app/bounces.py
@@ -201,7 +201,7 @@ def send_probe(member, msg):
owneraddr=mlist.owner_address,
)
message_id = msg['message-id']
- if not isinstance(message_id, unicode):
+ if isinstance(message_id, bytes):
message_id = message_id.decode("ascii")
pendable = _ProbePendable(
# We can only pend unicodes.
diff --git a/src/mailman/app/moderator.py b/src/mailman/app/moderator.py
index 2fba8c4ac..6ada9249f 100644
--- a/src/mailman/app/moderator.py
+++ b/src/mailman/app/moderator.py
@@ -86,8 +86,8 @@ def hold_message(mlist, msg, msgdata=None, reason=None):
# Message-ID header.
message_id = msg.get('message-id')
if message_id is None:
- msg['Message-ID'] = message_id = unicode(make_msgid())
- if not isinstance(message_id, unicode):
+ msg['Message-ID'] = message_id = make_msgid().decode("ascii")
+ if isinstance(message_id, bytes):
message_id = message_id.decode("ascii")
getUtility(IMessageStore).add(msg)
# Prepare the message metadata with some extra information needed only by
diff --git a/src/mailman/archiving/mailarchive.py b/src/mailman/archiving/mailarchive.py
index 120ed6865..f22eb7fb2 100644
--- a/src/mailman/archiving/mailarchive.py
+++ b/src/mailman/archiving/mailarchive.py
@@ -68,7 +68,7 @@ class MailArchive:
message_id_hash = msg.get('x-message-id-hash')
if message_id_hash is None:
return None
- if not isinstance(message_id_hash, unicode):
+ if isinstance(message_id_hash, bytes):
message_id_hash = message_id_hash.decode("ascii")
return urljoin(self.base_url, message_id_hash)
diff --git a/src/mailman/archiving/mhonarc.py b/src/mailman/archiving/mhonarc.py
index 815ab0855..e773860e3 100644
--- a/src/mailman/archiving/mhonarc.py
+++ b/src/mailman/archiving/mhonarc.py
@@ -73,7 +73,7 @@ class MHonArc:
message_id_hash = msg.get('x-message-id-hash')
if message_id_hash is None:
return None
- if not isinstance(message_id_hash, unicode):
+ if isinstance(message_id_hash, bytes):
message_id_hash = message_id_hash.decode("ascii")
return urljoin(self.list_url(mlist), message_id_hash)
diff --git a/src/mailman/archiving/prototype.py b/src/mailman/archiving/prototype.py
index 54dc30c89..6ef781c0c 100644
--- a/src/mailman/archiving/prototype.py
+++ b/src/mailman/archiving/prototype.py
@@ -68,7 +68,7 @@ class Prototype:
message_id_hash = msg.get('x-message-id-hash')
if message_id_hash is None:
return None
- if not isinstance(message_id_hash, unicode):
+ if isinstance(message_id_hash, bytes):
message_id_hash = message_id_hash.decode("ascii")
return urljoin(Prototype.list_url(mlist), message_id_hash)
diff --git a/src/mailman/commands/eml_membership.py b/src/mailman/commands/eml_membership.py
index 542e6fd4d..d88406ae8 100644
--- a/src/mailman/commands/eml_membership.py
+++ b/src/mailman/commands/eml_membership.py
@@ -72,7 +72,7 @@ used.
print(_('$self.name: No valid address found to subscribe'),
file=results)
return ContinueProcessing.no
- if not isinstance(address, unicode):
+ if isinstance(address, bytes):
address = address.decode("ascii")
# Have we already seen one join request from this user during the
# processing of this email?
diff --git a/src/mailman/email/message.py b/src/mailman/email/message.py
index 21bdfd30d..6ddedc48e 100644
--- a/src/mailman/email/message.py
+++ b/src/mailman/email/message.py
@@ -126,7 +126,7 @@ class Message(email.message.Message):
for sender in senders:
if not sender:
continue
- if not isinstance(sender, unicode):
+ if isinstance(sender, bytes):
sender = sender.decode("ascii")
clean_senders.append(sender)
return clean_senders
diff --git a/src/mailman/email/tests/test_message.py b/src/mailman/email/tests/test_message.py
index 54519fa6b..122562d0a 100644
--- a/src/mailman/email/tests/test_message.py
+++ b/src/mailman/email/tests/test_message.py
@@ -87,7 +87,6 @@ Test content
attachment = msg.get_payload()[1]
try:
filename = attachment.get_filename()
- except TypeError, e:
- raise
+ except TypeError as e:
self.fail(e)
self.assertEqual(filename, u"d\xe9jeuner.txt")
diff --git a/src/mailman/model/bounce.py b/src/mailman/model/bounce.py
index c2f22eee9..29a35266e 100644
--- a/src/mailman/model/bounce.py
+++ b/src/mailman/model/bounce.py
@@ -58,7 +58,7 @@ class BounceEvent(Model):
self.email = email
self.timestamp = now()
msgid = msg['message-id']
- if not isinstance(msgid, unicode):
+ if isinstance(msgid, bytes):
msgid = msgid.decode("ascii")
self.message_id = msgid
self.context = (BounceContext.normal if context is None else context)
diff --git a/src/mailman/model/messagestore.py b/src/mailman/model/messagestore.py
index 41c2ad8d8..3b8aed9c5 100644
--- a/src/mailman/model/messagestore.py
+++ b/src/mailman/model/messagestore.py
@@ -58,7 +58,7 @@ class MessageStore:
raise ValueError('Exactly one Message-ID header required')
# Calculate and insert the X-Message-ID-Hash.
message_id = message_ids[0]
- if not isinstance(message_id, unicode):
+ if isinstance(message_id, bytes):
message_id = message_id.decode("ascii")
# Complain if the Message-ID already exists in the storage.
existing = store.query(Message).filter(
diff --git a/src/mailman/rules/implicit_dest.py b/src/mailman/rules/implicit_dest.py
index 507701ef6..28effc490 100644
--- a/src/mailman/rules/implicit_dest.py
+++ b/src/mailman/rules/implicit_dest.py
@@ -73,7 +73,7 @@ class ImplicitDestination:
recipients = set()
for header in ('to', 'cc', 'resent-to', 'resent-cc'):
for fullname, address in getaddresses(msg.get_all(header, [])):
- if not isinstance(address, unicode):
+ if isinstance(address, bytes):
address = address.decode("ascii")
address = address.lower()
if address in aliases:
diff --git a/src/mailman/utilities/email.py b/src/mailman/utilities/email.py
index 91c8246af..ee23bf9e8 100644
--- a/src/mailman/utilities/email.py
+++ b/src/mailman/utilities/email.py
@@ -62,7 +62,7 @@ def add_message_hash(msg):
message_id = msg.get('message-id')
if message_id is None:
return
- if not isinstance(message_id, unicode):
+ if isinstance(message_id, bytes):
message_id = message_id.decode("ascii")
# The angle brackets are not part of the Message-ID. See RFC 2822
# and http://wiki.list.org/display/DEV/Stable+URLs
generated by cgit v1.2.3-70-g09d2 (git 2.51.2) at 2025-11-08 19:06:35 +0000