update checkdbs

Author: jaredmauch

cron/checkdbs

@@ -114,7 +114,7 @@ def main():
 
 
 def pending_requests(mlist):
-    # Must return a byte string
+    # Must return a string
     lcset = Utils.GetCharSet(mlist.preferred_language)
     pending = []
     first = 1
@@ -124,8 +124,8 @@ def pending_requests(mlist):
             first = 0
         when, addr, fullname, passwd, digest, lang = mlist.GetRecord(id)
         if fullname:
-            if isinstance(fullname, str):
-                fullname = fullname.encode(lcset, 'replace')
+            if isinstance(fullname, bytes):
+                fullname = fullname.decode(lcset, 'replace')
             fullname = ' (%s)' % fullname
         pending.append('    %s%s %s' % (addr, fullname, time.ctime(when)))
     first = 1
@@ -143,34 +143,18 @@ def pending_requests(mlist):
         info = mlist.GetRecord(id)
         when, sender, subject, reason, text, msgdata = mlist.GetRecord(id)
         subject = Utils.oneline(subject, lcset)
+        if isinstance(subject, bytes):
+            subject = subject.decode(lcset, 'replace')
         date = time.ctime(when)
         reason = _(reason)
         pending.append(_("""\
 From: %(sender)s on %(date)s
 Subject: %(subject)s
 Cause: %(reason)s"""))
         pending.append('')
-    # Coerce all items in pending to a Unicode so we can join them
-    upending = []
-    charset = Utils.GetCharSet(mlist.preferred_language)
-    for s in pending:
-        if isinstance(s, str):
-            upending.append(s)
-        else:
-            upending.append(str(s, charset, 'replace'))
-    # Make sure that the text we return from here can be encoded to a byte
-    # string in the charset of the list's language.  This could fail if for
-    # example, the request was pended while the list's language was French,
-    # but then it was changed to English before checkdbs ran.
-    text = u'\n'.join(upending)
-    charset = Charset(Utils.GetCharSet(mlist.preferred_language))
-    incodec = charset.input_codec or 'ascii'
-    outcodec = charset.output_codec or 'ascii'
-    if isinstance(text, str):
-        return text.encode(outcodec, 'replace')
-    # Be sure this is a byte string encodeable in the list's charset
-    utext = str(text, incodec, 'replace')
-    return utext.encode(outcodec, 'replace')
+    
+    # Join all lines with newlines and return as a string
+    return '\n'.join(pending)
 
 def auto_discard(mlist):
     # Discard old held messages