Replace rfc822 imports with email package (issue2550870)

The rfc822 package has been deprecated since Python v2.3 in favour of
the email package.

Author: jerrykan

roundup/cgi/client.py

@@ -3,8 +3,9 @@
 __docformat__ = 'restructuredtext'
 
 import base64, binascii, cgi, codecs, mimetypes, os
-import quopri, random, re, rfc822, stat, sys, time
+import quopri, random, re, stat, sys, time
 import socket, errno
+import email.utils
 from traceback import format_exc
 
 try:
@@ -495,7 +496,8 @@ def inner_main(self):
                 #    date = time.time() - 1
                 #else:
                 #    date = time.time() + 5
-                self.additional_headers['Expires'] = rfc822.formatdate(date)
+                self.additional_headers['Expires'] = \
+                    email.utils.formatdate(date, usegmt=True)
 
                 # render the content
                 self.write_html(self.renderContext())
@@ -1074,7 +1076,7 @@ def _serve_file(self, lmt, mime_type, content=None, filename=None):
 
         # spit out headers
         self.additional_headers['Content-Type'] = mime_type
-        self.additional_headers['Last-Modified'] = rfc822.formatdate(lmt)
+        self.additional_headers['Last-Modified'] = email.utils.formatdate(lmt)
 
         ims = None
         # see if there's an if-modified-since...
@@ -1085,7 +1087,7 @@ def _serve_file(self, lmt, mime_type, content=None, filename=None):
             # cgi will put the header in the env var
             ims = self.env['HTTP_IF_MODIFIED_SINCE']
         if ims:
-            ims = rfc822.parsedate(ims)[:6]
+            ims = email.utils.parsedate(ims)[:6]
             lmtt = time.gmtime(lmt)[:6]
             if lmtt <= ims:
                 raise NotModified

roundup/mailgw.py

@@ -80,7 +80,8 @@ class node. Any parts of other types are each stored in separate files
 
 import string, re, os, mimetools, cStringIO, smtplib, socket, binascii, quopri
 import time, random, sys, logging
-import traceback, rfc822
+import traceback
+import email.utils
 
 from anypy.email_ import decode_header
 
@@ -147,7 +148,7 @@ def getparam(str, param):
         if '=' in f:
             i = f.index('=')
             if f[:i].strip().lower() == param:
-                return rfc822.unquote(f[i+1:].strip())
+                return email.utils.unquote(f[i+1:].strip())
     return None
 
 def gpgh_key_getall(key, attr):