SF bug 558179.

Change default for get() back to None.

diff --git a/Lib/rfc822.py b/Lib/rfc822.py
index 96ab21c795c1880844c7933d2d488bf50561f1e4..83460813e36cd7d4bec831a86b1e8d7dc99f2a52 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 self.dict.has_key(name):
-            return self.dict[name]
-        else:
-            return default
-
     def setdefault(self, name, default=""):
         lowername = name.lower()
         if self.dict.has_key(lowername):

diff --git a/Lib/test/test_pyclbr.py b/Lib/test/test_pyclbr.py
index 52fb2ad68bfd9809852a3ccb765e2a1a1ecd854b..9e56e9e50205ca7e3695c9df508a57ee904962a1 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('xmllib')
         self.checkModule('difflib')
 

diff --git a/Lib/test/test_rfc822.py b/Lib/test/test_rfc822.py
index 0244f0d818350079c028b672a40f1826a41432cc..259c058de2d6a0377fd12959411ba60091cf99cc 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")