From 44e43727be13e3554342c2b5b75b7dc42abdb18c Mon Sep 17 00:00:00 2001
From: Barry Warsaw
Date: Sun, 30 Nov 2014 21:51:03 -0500
Subject: Checkpointing.

By using `six` I think I have most of the imports squared away.  There's
probably still uses of `unicode` built-ins that need fixing.

The idea is to first get the test suite running (which it doesn't yet), and
then to fix tests.

There's a bug in lazr.config which requires us to patch it for now.
---
 src/mailman/email/message.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/mailman/email/message.py')

diff --git a/src/mailman/email/message.py b/src/mailman/email/message.py
index f3a44e63c..4d26ca9c4 100644
--- a/src/mailman/email/message.py
+++ b/src/mailman/email/message.py
@@ -56,15 +56,15 @@ class Message(email.message.Message):
     def __getitem__(self, key):
         # Ensure that header values are unicodes.
         value = email.message.Message.__getitem__(self, key)
-        if isinstance(value, str):
-            return unicode(value, 'ascii')
+        if isinstance(value, bytes):
+            return value.decode('ascii')
         return value
 
     def get(self, name, failobj=None):
         # Ensure that header values are unicodes.
         value = email.message.Message.get(self, name, failobj)
-        if isinstance(value, str):
-            return unicode(value, 'ascii')
+        if isinstance(value, bytes):
+            return value.decode('ascii')
         return value
 
     def get_all(self, name, failobj=None):
@@ -73,7 +73,7 @@ class Message(email.message.Message):
         all_values = email.message.Message.get_all(self, name, missing)
         if all_values is missing:
             return failobj
-        return [(unicode(value, 'ascii') if isinstance(value, str) else value)
+        return [(value.decode('ascii') if isinstance(value, bytes) else value)
                 for value in all_values]
 
     # BAW: For debugging w/ bin/dumpdb.  Apparently pprint uses repr.
-- 
cgit v1.2.3-70-g09d2