SF bug 558179.

Change default for get() back to None.
Will backport to 2.2.1.

diff --git a/Lib/rfc822.py b/Lib/rfc822.py
index 6495f5f336b93c71131b6b04efadae80ddf74118..4b12c4b14a6ebea43f44cf3a48f3e98a022e7f1a 100644 (file)
--- a/Lib/rfc822.py
+++ b/Lib/rfc822.py
@@ -425,13 +425,6 @@ class Message:
         for i in list:
             del self.headers[i]
 
-    def get(self, name, default=""):
-        name = name.lower()
-        if name in self.dict:
-            return self.dict[name]
-        else:
-            return default
-
     def setdefault(self, name, default=""):
         lowername = name.lower()
         if lowername in self.dict:

diff --git a/Lib/test/test_pyclbr.py b/Lib/test/test_pyclbr.py
index c745720282d7b5a56b95f32016acd12411470f6b..0f3319f1a476df6cedd3931fe71f45bf5687591a 100644 (file)
--- a/Lib/test/test_pyclbr.py
+++ b/Lib/test/test_pyclbr.py
@@ -105,7 +105,7 @@ class PyclbrTest(unittest.TestCase):
                                  '_isfunction',
                                  '_ismodule',
                                  '_classify_class_attrs'])
-        self.checkModule('rfc822')
+        self.checkModule('rfc822', ignore=["get"])
         self.checkModule('difflib')
 
     def test_others(self):

diff --git a/Lib/test/test_rfc822.py b/Lib/test/test_rfc822.py
index 6add15b16d40df0a3dc54d8f79c9e03c2bfae93a..756c5c759c417e2ce01ff975b26239ace68802c0 100644 (file)
--- a/Lib/test/test_rfc822.py
+++ b/Lib/test/test_rfc822.py
@@ -18,7 +18,7 @@ class MessageTestCase(unittest.TestCase):
             'To: "last, first" <userid@foo.net>\n\ntest\n')
         self.assert_(msg.get("to") == '"last, first" <userid@foo.net>')
         self.assert_(msg.get("TO") == '"last, first" <userid@foo.net>')
-        self.assert_(msg.get("No-Such-Header") == "")
+        self.assert_(msg.get("No-Such-Header") is None)
         self.assert_(msg.get("No-Such-Header", "No-Such-Value")
                      == "No-Such-Value")