Merged revisions 77841 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77841 | ezio.melotti | 2010-01-30 09:22:54 +0200 (Sat, 30 Jan 2010) | 1 line

  #7092: silence py3k warnings for deprecated modules
........
diff --git a/Lib/test/test_mailbox.py b/Lib/test/test_mailbox.py
index 714bf25..44e3ca8 100644
--- a/Lib/test/test_mailbox.py
+++ b/Lib/test/test_mailbox.py
@@ -5,7 +5,6 @@
 import socket
 import email
 import email.message
-import rfc822
 import re
 import StringIO
 from test import test_support
@@ -17,6 +16,8 @@
 except ImportError:
     pass
 
+# Silence Py3k warning
+rfc822 = test_support.import_module('rfc822', deprecated=True)
 
 class TestBase(unittest.TestCase):