------------------------------------------------------------
revno: 6587
committer: Barry Warsaw <[EMAIL PROTECTED]>
branch nick: 3.0
timestamp: Thu 2008-01-24 02:40:41 -0500
message:
Python 2.5's email package uses cStringIO in its feed parser, and this doesn't
support unicode. Although this never bit me on OS X (Leopard) it matters
greatly on Linux (Ubuntu) where you get lots of test failures because of it.
So instead, just use 8-bit string in message_from_string(). Everything works
fine still.
modified:
Mailman/docs/acknowledge.txt
Mailman/docs/after-delivery.txt
Mailman/docs/archives.txt
Mailman/docs/bounces.txt
Mailman/docs/cleanse.txt
Mailman/docs/cook-headers.txt
Mailman/docs/nntp.txt
Mailman/docs/reply-to.txt
Mailman/docs/replybot.txt
Mailman/docs/requests.txt
Mailman/docs/scrubber.txt
Mailman/docs/subject-munging.txt
Mailman/docs/tagger.txt
Mailman/queue/docs/runner.txt
Mailman/queue/docs/switchboard.txt
Mailman/rules/docs/administrivia.txt
Mailman/rules/docs/approve.txt
Mailman/rules/docs/implicit-dest.txt
Mailman/rules/docs/loop.txt
Mailman/rules/docs/max-size.txt
Mailman/rules/docs/moderation.txt
Mailman/rules/docs/news-moderation.txt
Mailman/rules/docs/no-subject.txt
Mailman/rules/docs/recipients.txt
Mailman/rules/docs/suspicious.txt
=== modified file 'Mailman/docs/acknowledge.txt'
--- a/Mailman/docs/acknowledge.txt 2007-11-06 23:16:22 +0000
+++ b/Mailman/docs/acknowledge.txt 2008-01-24 07:40:41 +0000
@@ -35,7 +35,7 @@
Non-members can't get acknowledgments of their posts to the mailing list.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
...
... """)
=== modified file 'Mailman/docs/after-delivery.txt'
--- a/Mailman/docs/after-delivery.txt 2007-11-07 11:58:53 +0000
+++ b/Mailman/docs/after-delivery.txt 2008-01-24 07:40:41 +0000
@@ -16,7 +16,7 @@
Processing a message with this handler updates the last_post_time and post_id
attributes.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
...
... Something interesting.
=== modified file 'Mailman/docs/archives.txt'
--- a/Mailman/docs/archives.txt 2007-11-08 01:56:43 +0000
+++ b/Mailman/docs/archives.txt 2008-01-24 07:40:41 +0000
@@ -29,7 +29,7 @@
For example, no digests should ever get archived.
>>> mlist.archive = True
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... Subject: A sample message
...
... A message of great import.
@@ -64,7 +64,7 @@
Even a 'no' value will stop the archiving of the message.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... Subject: A sample message
... X-No-Archive: No
...
@@ -77,7 +77,7 @@
Another header that's been observed is the X-Archive: header. Here, the
header's case folded value must be 'no' in order to prevent archiving.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... Subject: A sample message
... X-Archive: No
...
@@ -89,7 +89,7 @@
But if the value is 'yes', then the message will be archived.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... Subject: A sample message
... X-Archive: Yes
...
@@ -113,7 +113,7 @@
Without either archiving header, and all other things being the same, the
message will get archived.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... Subject: A sample message
...
... A message of great import.
=== modified file 'Mailman/docs/bounces.txt'
--- a/Mailman/docs/bounces.txt 2007-11-08 01:56:43 +0000
+++ b/Mailman/docs/bounces.txt 2008-01-24 07:40:41 +0000
@@ -19,7 +19,7 @@
Any message can be bounced.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... To: [EMAIL PROTECTED]
... From: [EMAIL PROTECTED]
... Subject: Something important
=== modified file 'Mailman/docs/cleanse.txt'
--- a/Mailman/docs/cleanse.txt 2007-11-08 05:34:49 +0000
+++ b/Mailman/docs/cleanse.txt 2008-01-24 07:40:41 +0000
@@ -16,7 +16,7 @@
members, regardless of whether they get digests or not. Because all three
headers contain passwords, they must be removed from any posted message.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
... Approved: foobar
... Approve: barfoo
@@ -39,7 +39,7 @@
Pegasus mail. I don't remember what program uses X-Confirm-Reading-To though
(Some Microsoft product perhaps?).
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
... Reply-To: [EMAIL PROTECTED]
... Sender: [EMAIL PROTECTED]
@@ -76,7 +76,7 @@
>>> mlist.anonymous_list = True
>>> mlist.description = u'A Test Mailing List'
>>> mlist.preferred_language = u'en'
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
... Reply-To: [EMAIL PROTECTED]
... Sender: [EMAIL PROTECTED]
=== modified file 'Mailman/docs/cook-headers.txt'
--- a/Mailman/docs/cook-headers.txt 2008-01-13 21:17:38 +0000
+++ b/Mailman/docs/cook-headers.txt 2008-01-24 07:40:41 +0000
@@ -24,7 +24,7 @@
Because the original sender headers may get deleted or changed, CookHeaders
will place the sender in the message metadata for safe keeping.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
...
... A message of great import.
@@ -36,7 +36,7 @@
But if there was no original sender, then the empty string will be saved.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... Subject: No original sender
...
... A message of great import.
@@ -54,7 +54,7 @@
already been processed by this mailing list. It's one small measure against
mail loops.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
...
... A message of great import.
@@ -66,7 +66,7 @@
Mailman appends X-BeenThere headers, so if there already is one in the
original message, the posted message will contain two such headers.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
... X-BeenThere: [EMAIL PROTECTED]
...
@@ -82,7 +82,7 @@
Mailman will also insert an X-Mailman-Version header...
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
...
... A message of great import.
@@ -94,7 +94,7 @@
...but only if one doesn't already exist.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
... X-Mailman-Version: 3000
...
@@ -113,7 +113,7 @@
telling automatic reply software (e.g. vacation(1)) not to respond to this
message.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
...
... A message of great import.
@@ -126,7 +126,7 @@
But Mailman will only add that header if the original message doesn't already
have one of them.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
... Precedence: junk
...
@@ -160,7 +160,7 @@
generally add these headers, but not for messages that aren't crafted for a
specific list (e.g. password reminders in Mailman 2.x).
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
...
... """)
@@ -173,7 +173,7 @@
about hiding them. A list owner can turn these headers off.
>>> mlist.include_rfc2369_headers = False
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
...
... """)
@@ -187,7 +187,7 @@
>>> mlist.include_rfc2369_headers = True
>>> mlist.include_list_post_header = True
>>> mlist.preferred_language = u'en'
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
...
... """)
@@ -208,7 +208,7 @@
header.
>>> mlist.description = u'My test mailing list'
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
...
... """)
@@ -227,7 +227,7 @@
Administrative messages crafted by Mailman will have a reduced set of headers.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
...
... """)
@@ -247,7 +247,7 @@
List-Post header, which is reasonable for an announce only mailing list.
>>> mlist.include_list_post_header = False
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
...
... """)
@@ -268,7 +268,7 @@
>>> mlist.include_list_post_header = True
>>> mlist.archive = False
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
...
... """)
@@ -309,7 +309,7 @@
>>> from Mailman.interfaces import Personalization, ReplyToMunging
>>> mlist.personalize = Personalization.full
>>> mlist.reply_goes_to_list = ReplyToMunging.no_munging
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
...
... """)
=== modified file 'Mailman/docs/nntp.txt'
--- a/Mailman/docs/nntp.txt 2007-11-10 18:14:51 +0000
+++ b/Mailman/docs/nntp.txt 2008-01-24 07:40:41 +0000
@@ -21,7 +21,7 @@
the newsgroup. The feature could be disabled, as is the default.
>>> mlist.gateway_to_news = False
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... Subject: An important message
...
... Something of great import.
=== modified file 'Mailman/docs/reply-to.txt'
--- a/Mailman/docs/reply-to.txt 2007-11-08 23:42:56 +0000
+++ b/Mailman/docs/reply-to.txt 2008-01-24 07:40:41 +0000
@@ -41,7 +41,7 @@
>>> mlist.reply_goes_to_list = ReplyToMunging.point_to_list
>>> mlist.preferred_language = u'en'
>>> mlist.description = u''
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
...
... """)
@@ -55,7 +55,7 @@
the list's posting address.
>>> mlist.first_strip_reply_to = True
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
... Reply-To: [EMAIL PROTECTED]
...
@@ -70,7 +70,7 @@
get appended to whatever the original version was.
>>> mlist.first_strip_reply_to = False
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
... Reply-To: [EMAIL PROTECTED]
...
@@ -89,7 +89,7 @@
>>> mlist.reply_goes_to_list = ReplyToMunging.explicit_header
>>> mlist.reply_to_address = u'[EMAIL PROTECTED]'
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
...
... """)
@@ -102,7 +102,7 @@
And as before, it's possible to either strip any existing Reply-To header...
>>> mlist.first_strip_reply_to = True
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
... Reply-To: [EMAIL PROTECTED]
...
@@ -116,7 +116,7 @@
...or not.
>>> mlist.first_strip_reply_to = False
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
... Reply-To: [EMAIL PROTECTED]
...
=== modified file 'Mailman/docs/replybot.txt'
--- a/Mailman/docs/replybot.txt 2007-11-08 16:54:25 +0000
+++ b/Mailman/docs/replybot.txt 2008-01-24 07:40:41 +0000
@@ -33,7 +33,7 @@
>>> mlist.autorespond_admin = True
>>> mlist.autoresponse_graceperiod = datetime.timedelta()
>>> mlist.autoresponse_admin_text = u'admin autoresponse text'
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
... To: [EMAIL PROTECTED]
...
@@ -74,7 +74,7 @@
should even be sent. For example, if the message has an "X-Ack: No" header,
no auto-response is sent.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
... X-Ack: No
...
@@ -87,7 +87,7 @@
Mailman itself can suppress autoresponses for certain types of internally
crafted messages, by setting the 'noack' metadata key.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
...
... help for you
@@ -99,7 +99,7 @@
If there is a Precedence: header with any of the values 'bulk', 'junk', or
'list', then the autoresponse is also suppressed.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
... Precedence: bulk
...
@@ -151,7 +151,7 @@
>>> mlist.autorespond_requests = True
>>> mlist.autoresponse_request_text = u'robot autoresponse text'
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
... To: [EMAIL PROTECTED]
...
@@ -180,7 +180,7 @@
>>> mlist.autorespond_postings = True
>>> mlist.autoresponse_postings_text = u'postings autoresponse text'
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
... To: [EMAIL PROTECTED]
...
=== modified file 'Mailman/docs/requests.txt'
--- a/Mailman/docs/requests.txt 2008-01-21 05:26:55 +0000
+++ b/Mailman/docs/requests.txt 2008-01-24 07:40:41 +0000
@@ -212,7 +212,7 @@
>>> mlist = config.db.list_manager.create(u'[EMAIL PROTECTED]')
>>> mlist.preferred_language = u'en'
>>> mlist.real_name = u'A Test List'
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
... To: [EMAIL PROTECTED]
... Subject: Something important
@@ -330,7 +330,7 @@
delete the message from the storage. First, without the switch, the message
is deleted.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
... To: [EMAIL PROTECTED]
... Subject: Something important
=== modified file 'Mailman/docs/scrubber.txt'
--- a/Mailman/docs/scrubber.txt 2008-01-13 21:17:38 +0000
+++ b/Mailman/docs/scrubber.txt 2008-01-24 07:40:41 +0000
@@ -52,7 +52,7 @@
this is an unfortunate double negative).
>>> config.SCRUBBER_DONT_USE_ATTACHMENT_FILENAME = False
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... Content-Type: image/gif; name="xtest.gif"
... Content-Transfer-Encoding: base64
... Content-Disposition: attachment; filename="xtest.gif"
@@ -81,7 +81,7 @@
the Defaults.py.in file.
>>> config.SCRUBBER_DONT_USE_ATTACHMENT_FILENAME = True
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... Content-Type: image/gif; name="xtest.gif"
... Content-Transfer-Encoding: base64
... Content-Disposition: attachment; filename="xtest.gif"
@@ -107,7 +107,7 @@
When scrubbing image attachments, the original message is modified to include
a reference to the attachment file as available through the on-line archive.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... MIME-Version: 1.0
... Content-Type: multipart/mixed; boundary="BOUNDARY"
...
@@ -182,7 +182,7 @@
Similar to image attachments, text attachments will also be scrubbed, but the
placeholder will be slightly different.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... MIME-Version: 1.0
... Content-Type: multipart/mixed; boundary="BOUNDARY"
...
=== modified file 'Mailman/docs/subject-munging.txt'
--- a/Mailman/docs/subject-munging.txt 2007-12-11 04:00:14 +0000
+++ b/Mailman/docs/subject-munging.txt 2008-01-24 07:40:41 +0000
@@ -23,7 +23,7 @@
>>> mlist.subject_prefix = u'[XTest] '
>>> mlist.preferred_language = u'en'
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
...
... A message of great import.
@@ -43,7 +43,7 @@
If the original message had a Subject header, then the prefix is inserted at
the beginning of the header's value.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
... Subject: Something important
...
@@ -58,7 +58,7 @@
Subject headers are not munged for digest messages.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
... Subject: Something important
...
@@ -71,7 +71,7 @@
Nor are they munged for 'fast tracked' messages, which are generally defined
as messages that Mailman crafts internally.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
... Subject: Something important
...
@@ -85,7 +85,7 @@
another one will not be added but the prefix will be moved to the front of the
header text.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
... Subject: Re: [XTest] Something important
...
@@ -99,7 +99,7 @@
where it will stay. This is called 'new style' prefixing and is the only
option available in Mailman 3.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
... Subject: [XTest] Re: Something important
...
@@ -118,7 +118,7 @@
using RFC 2047, and lists whose preferred language is in a different character
set than the encoded header.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... Subject: =?iso-2022-jp?b?GyRCJWEhPCVrJV4lcxsoQg==?=
...
... """)
@@ -139,7 +139,7 @@
>>> mlist.subject_prefix = u'[XTest %d] '
>>> mlist.post_id = 456
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... Subject: Something important
...
... """)
@@ -151,7 +151,7 @@
numeric post id in the generated subject prefix is updated with the new post
id.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... Subject: [XTest 123] Re: Something important
...
... """)
@@ -162,7 +162,7 @@
If the Subject header had old style prefixing, the prefix is moved to the
front of the header text.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... Subject: Re: [XTest 123] Something important
...
... """)
@@ -174,7 +174,7 @@
And of course, the proper thing is done when posting id numbers are included
in the subject prefix, and the subject is encoded non-ascii.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... Subject: =?iso-2022-jp?b?GyRCJWEhPCVrJV4lcxsoQg==?=
...
... """)
@@ -187,7 +187,7 @@
Even more fun is when the i18n Subject header already has a prefix, possibly
with a different posting number.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... Subject: [XTest 123] Re: =?iso-2022-jp?b?GyRCJWEhPCVrJV4lcxsoQg==?=
...
... """)
@@ -201,7 +201,7 @@
As before, old style subject prefixes are re-ordered.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... Subject: Re: [XTest 123] =?iso-2022-jp?b?GyRCJWEhPCVrJV4lcxsoQg==?=
...
... """)
@@ -220,7 +220,7 @@
starting with '\n ' is generated by some version of Eudora Japanese edition.
>>> mlist.subject_prefix = u'[XTest] '
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... Subject:
... Important message
...
@@ -231,7 +231,7 @@
And again, with an RFC 2047 encoded header.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... Subject:
... =?iso-2022-jp?b?GyRCJWEhPCVrJV4lcxsoQg==?=
...
=== modified file 'Mailman/docs/tagger.txt'
--- a/Mailman/docs/tagger.txt 2007-11-08 16:54:25 +0000
+++ b/Mailman/docs/tagger.txt 2008-01-24 07:40:41 +0000
@@ -20,7 +20,7 @@
>>> mlist.topics_enabled = False
>>> mlist.topics_bodylines_limit = 0
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... Subject: foobar
... Keywords: barbaz
...
@@ -40,7 +40,7 @@
the message metadata gets a key with a list of matching topic names.
>>> mlist.topics_enabled = True
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... Subject: foobar
... Keywords: barbaz
...
@@ -64,7 +64,7 @@
Subject: and Keyword: header-like lines. When set to zero, no body lines are
scanned.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
... Subject: nothing
... Keywords: at all
@@ -91,7 +91,7 @@
found.
>>> mlist.topics_bodylines_limit = 5
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
... Subject: nothing
... Keywords: at all
@@ -118,7 +118,7 @@
However, scanning stops at the first body line that doesn't look like a
header.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
... Subject: nothing
... Keywords: at all
@@ -144,7 +144,7 @@
>>> mlist.topics_bodylines_limit = -1
>>> lots_of_headers = '\n'.join(['X-Ignore: zip'] * 100)
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
... Subject: nothing
... Keywords: at all
@@ -170,7 +170,7 @@
message, using the same rules as if all those body lines lived in a single
text payload.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... Subject: Was
... Keywords: Raw
... Content-Type: multipart/alternative; boundary="BOUNDARY"
@@ -206,7 +206,7 @@
But the tagger will not descend into non-text parts.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... Subject: Was
... Keywords: Raw
... Content-Type: multipart/alternative; boundary=BOUNDARY
=== modified file 'Mailman/queue/docs/runner.txt'
--- a/Mailman/queue/docs/runner.txt 2008-02-02 16:18:22 +0000
+++ b/Mailman/queue/docs/runner.txt 2008-01-24 07:40:41 +0000
@@ -46,7 +46,7 @@
This qrunner doesn't do much except run once, storing the message and metadata
on instance variables.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
... To: [EMAIL PROTECTED]
...
=== modified file 'Mailman/queue/docs/switchboard.txt'
--- a/Mailman/queue/docs/switchboard.txt 2008-02-02 16:18:22 +0000
+++ b/Mailman/queue/docs/switchboard.txt 2008-01-24 07:40:41 +0000
@@ -4,7 +4,7 @@
The switchboard is subsystem that moves messages between queues. Each
instance of a switchboard is responsible for one queue directory.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
... To: [EMAIL PROTECTED]
...
=== modified file 'Mailman/rules/docs/administrivia.txt'
--- a/Mailman/rules/docs/administrivia.txt 2008-01-21 05:26:55 +0000
+++ b/Mailman/rules/docs/administrivia.txt 2008-01-24 07:40:41 +0000
@@ -16,7 +16,7 @@
For example, if the Subject header contains the word 'unsubscribe', the rule
matches.
- >>> msg_1 = message_from_string(u"""\
+ >>> msg_1 = message_from_string("""\
... From: [EMAIL PROTECTED]
... Subject: unsubscribe
...
@@ -27,7 +27,7 @@
Similarly, if the body of the message contains the word 'subscribe' in the
first few lines of text, the rule matches.
- >>> msg_2 = message_from_string(u"""\
+ >>> msg_2 = message_from_string("""\
... From: [EMAIL PROTECTED]
... Subject: I wish to join your list
...
@@ -51,7 +51,7 @@
match.
>>> mlist.administrivia = True
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
... Subject: confirm
...
@@ -61,7 +61,7 @@
But a real 'confirm' message will match.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
... Subject: confirm 12345
...
@@ -77,7 +77,7 @@
Of course, messages that don't contain administrivia, don't match the rule.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
... Subject: examine
...
@@ -89,7 +89,7 @@
Also, only text/plain parts are checked for administrivia, so any email
commands in other content type subparts are ignored.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
... Subject: some administrivia
... Content-Type: text/x-special
=== modified file 'Mailman/rules/docs/approve.txt'
--- a/Mailman/rules/docs/approve.txt 2008-01-21 05:26:55 +0000
+++ b/Mailman/rules/docs/approve.txt 2008-01-24 07:40:41 +0000
@@ -31,7 +31,7 @@
If the message has no Approve or Approved header, then the rule does not
match.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
...
... An important message.
@@ -89,7 +89,7 @@
the payload of the message. If this pseudo-header looks like a matching
Approve or Approved header, the message is similarly allowed to pass.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
...
... Approve: abcxyz
@@ -111,7 +111,7 @@
Similarly for the Approved header.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
...
... Approved: abcxyz
@@ -132,7 +132,7 @@
As before, a mismatch in the pseudo-header does not approve the message, but
the pseudo-header line is still removed.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
...
... Approve: 123456
@@ -152,7 +152,7 @@
Similarly for the Approved header.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
...
... Approved: 123456
@@ -178,7 +178,7 @@
first text/plain message part of the message. This allows the feature to be
used with MIME documents.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
... MIME-Version: 1.0
... Content-Type: multipart/mixed; boundary="AAA"
@@ -223,7 +223,7 @@
The same goes for the Approved message.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
... MIME-Version: 1.0
... Content-Type: multipart/mixed; boundary="AAA"
@@ -268,7 +268,7 @@
Here, the correct password is in the non-text/plain part, so it is ignored.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
... MIME-Version: 1.0
... Content-Type: multipart/mixed; boundary="AAA"
@@ -312,7 +312,7 @@
As before, the same goes for the Approved header.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
... MIME-Version: 1.0
... Content-Type: multipart/mixed; boundary="AAA"
@@ -362,7 +362,7 @@
alternative, the 'approved' rule has to search the alternatives and strip
anything that looks like an Approve or Approved headers.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
... MIME-Version: 1.0
... Content-Type: multipart/mixed; boundary="AAA"
@@ -419,7 +419,7 @@
This is true even if the rule does not match.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
... MIME-Version: 1.0
... Content-Type: multipart/mixed; boundary="AAA"
=== modified file 'Mailman/rules/docs/implicit-dest.txt'
--- a/Mailman/rules/docs/implicit-dest.txt 2008-01-21 05:26:55 +0000
+++ b/Mailman/rules/docs/implicit-dest.txt 2008-01-24 07:40:41 +0000
@@ -15,7 +15,7 @@
>>> mlist.require_explicit_destination = True
>>> mlist.acceptable_aliases = u''
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
... Subject: An implicit message
...
=== modified file 'Mailman/rules/docs/loop.txt'
--- a/Mailman/rules/docs/loop.txt 2008-01-21 05:26:55 +0000
+++ b/Mailman/rules/docs/loop.txt 2008-01-24 07:40:41 +0000
@@ -12,7 +12,7 @@
The header could be missing, in which case the rule does not match.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
...
... An important message.
@@ -37,7 +37,7 @@
Even if there are multiple X-BeenThere headers, as long as one with the
posting address exists, the rule matches.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
... X-BeenThere: [EMAIL PROTECTED]
... X-BeenThere: [EMAIL PROTECTED]
=== modified file 'Mailman/rules/docs/max-size.txt'
--- a/Mailman/rules/docs/max-size.txt 2008-01-21 05:26:55 +0000
+++ b/Mailman/rules/docs/max-size.txt 2008-01-24 07:40:41 +0000
@@ -18,7 +18,7 @@
>>> mlist.max_message_size = 1 # 1024 bytes
>>> one_line = u'x' * 79
>>> big_body = u'\n'.join([one_line] * 15)
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
... To: [EMAIL PROTECTED]
...
=== modified file 'Mailman/rules/docs/moderation.txt'
--- a/Mailman/rules/docs/moderation.txt 2008-01-21 05:26:55 +0000
+++ b/Mailman/rules/docs/moderation.txt 2008-01-24 07:40:41 +0000
@@ -15,7 +15,7 @@
In the simplest case, the sender is not a member of the mailing list, so the
moderation rule can't match.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
... To: [EMAIL PROTECTED]
... Subject: A posted message
@@ -60,7 +60,7 @@
But if the sender is not a member of this mailing list, the rule matches.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
... To: [EMAIL PROTECTED]
... Subject: A posted message
=== modified file 'Mailman/rules/docs/news-moderation.txt'
--- a/Mailman/rules/docs/news-moderation.txt 2008-01-21 05:26:55 +0000
+++ b/Mailman/rules/docs/news-moderation.txt 2008-01-24 07:40:41 +0000
@@ -21,7 +21,7 @@
And now all messages will match the rule.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
... Subject: An announcment
...
=== modified file 'Mailman/rules/docs/no-subject.txt'
--- a/Mailman/rules/docs/no-subject.txt 2008-01-21 05:26:55 +0000
+++ b/Mailman/rules/docs/no-subject.txt 2008-01-24 07:40:41 +0000
@@ -12,7 +12,7 @@
A message with a non-empty subject does not match the rule.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
... To: [EMAIL PROTECTED]
... Subject: A posted message
=== modified file 'Mailman/rules/docs/recipients.txt'
--- a/Mailman/rules/docs/recipients.txt 2008-01-21 05:26:55 +0000
+++ b/Mailman/rules/docs/recipients.txt 2008-01-24 07:40:41 +0000
@@ -13,7 +13,7 @@
In this case, we'll create a message with 5 recipients. These include all
addresses in the To and CC headers.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
... To: [EMAIL PROTECTED], [EMAIL PROTECTED]
... Cc: [EMAIL PROTECTED]
=== modified file 'Mailman/rules/docs/suspicious.txt'
--- a/Mailman/rules/docs/suspicious.txt 2008-01-21 05:26:55 +0000
+++ b/Mailman/rules/docs/suspicious.txt 2008-01-24 07:40:41 +0000
@@ -14,7 +14,7 @@
Set the so-called suspicious header configuration variable.
>>> mlist.bounce_matching_headers = u'From: .*person@(blah.)?example.com'
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
... To: [EMAIL PROTECTED]
... Subject: An implicit message
@@ -26,7 +26,7 @@
But if the header doesn't match the regular expression, the rule won't match.
This one comes from a .org address.
- >>> msg = message_from_string(u"""\
+ >>> msg = message_from_string("""\
... From: [EMAIL PROTECTED]
... To: [EMAIL PROTECTED]
... Subject: An implicit message
--
Primary development focus
https://code.launchpad.net/~mailman-coders/mailman/3.0
You are receiving this branch notification because you are subscribed to it.
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe:
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
