Back out using subject; reinstate header_name

mnot · Jun 27, 2012 · 6d15701 · 6d15701
1 parent a68c333
commit 6d15701
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 2 deletions.
diff --git a/redbot/headers/content_base.py b/redbot/headers/content_base.py
@@ -32,6 +32,7 @@
 def parse(subject, value, red):
     red.set_message(subject, 
                     rs.HEADER_DEPRECATED, 
+                    header_name="Content-Base",
                     ref=rh.rfc2616 % "sec-19.6.3"
     )
     return value

diff --git a/redbot/headers/set_cookie2.py b/redbot/headers/set_cookie2.py
@@ -32,6 +32,7 @@
 def parse(subject, value, red):
     red.set_message(subject, 
                     rs.HEADER_DEPRECATED, 
+                    header_name="Set-Cookie2",
                     ref=rh.rfc6265 % "section-9.4"
     )
     return value

diff --git a/redbot/speak.py b/redbot/speak.py
@@ -204,7 +204,7 @@ class HEADER_DEPRECATED(Message):
     category = c.GENERAL
     level = l.WARN
     summary = {
-    'en': u"The %(subject)s header is deprecated."
+    'en': u"The %(header_name)s header is deprecated."
     }
     text = {
     'en': u"""This header field is no longer recommended for use, because of

diff --git a/redbot/state.py b/redbot/state.py
@@ -111,7 +111,6 @@ def set_message(self, subject, msg, subreq=None, **kw):
         kw['response'] = rs.response.get(
             self.type, rs.response['this']
         )['en']
-        kw['subject'] = subject
         self.messages.append(msg(subject, subreq, kw))
 
     @staticmethod