test_unicode_error(): Comment this test out, since we still have
controversy.
diff --git a/Lib/email/test/test_email.py b/Lib/email/test/test_email.py
index a63adc8..46e1b00 100644
--- a/Lib/email/test/test_email.py
+++ b/Lib/email/test/test_email.py
@@ -2156,14 +2156,14 @@
         h.append('hello', 'iso-8859-1')
         eq(h, '=?iso-8859-1?q?hello?=')
 
-    def test_unicode_error(self):
-        raises = self.assertRaises
-        raises(UnicodeError, Header, u'[P\xf6stal]', 'us-ascii')
-        raises(UnicodeError, Header, '[P\xf6stal]', 'us-ascii')
-        h = Header()
-        raises(UnicodeError, h.append, u'[P\xf6stal]', 'us-ascii')
-        raises(UnicodeError, h.append, '[P\xf6stal]', 'us-ascii')
-        raises(UnicodeError, Header, u'\u83ca\u5730\u6642\u592b', 'iso-8859-1')
+##    def test_unicode_error(self):
+##        raises = self.assertRaises
+##        raises(UnicodeError, Header, u'[P\xf6stal]', 'us-ascii')
+##        raises(UnicodeError, Header, '[P\xf6stal]', 'us-ascii')
+##        h = Header()
+##        raises(UnicodeError, h.append, u'[P\xf6stal]', 'us-ascii')
+##        raises(UnicodeError, h.append, '[P\xf6stal]', 'us-ascii')
+##        raises(UnicodeError, Header, u'\u83ca\u5730\u6642\u592b', 'iso-8859-1')