------------------------------------------------------------
revno: 1025
committer: Mark Sapiro <[email protected]>
branch nick: 2.2
timestamp: Mon 2008-12-22 18:19:44 -0800
message:
Merged changes from the 2.1 branch
modified:
Mailman/Archiver/HyperArch.py
Mailman/Defaults.py.in
NEWS
------------------------------------------------------------
revno: 984.1.168
committer: Mark Sapiro <[email protected]>
branch nick: 2.1
timestamp: Mon 2008-12-22 18:17:35 -0800
message:
Changed the pattern used to recognize URLs in messages for the pipermail
archive in order to try to do a better job of making hyperlinks.
Bug #310124.
modified:
Mailman/Archiver/HyperArch.py
NEWS
------------------------------------------------------------
revno: 984.1.167
committer: Mark Sapiro <[email protected]>
branch nick: 2.1
timestamp: Mon 2008-12-22 17:24:44 -0800
message:
Reordered the headers in PLAIN_DIGEST_KEEP_HEADERS as these are the ones
that
control header sequence in the RFC 1153 digest and added some comments to
help
clarify the situation.
modified:
Mailman/Defaults.py.in
=== modified file 'Mailman/Archiver/HyperArch.py'
--- a/Mailman/Archiver/HyperArch.py 2008-12-19 21:02:08 +0000
+++ b/Mailman/Archiver/HyperArch.py 2008-12-23 02:19:44 +0000
@@ -156,7 +156,12 @@
emailpat = re.compile(r'([-+,.\...@[-+.\w]+)')
# Argh! This pattern is buggy, and will choke on URLs with GET parameters.
-urlpat = re.compile(r'(\w+://[^>)\s]+)') # URLs in text
+# MAS: Given that people are not constrained in how they write URIs in plain
+# text, it is not possible to have a single regexp to reliably match them.
+# The regexp below is intended to match straightforward cases. Even humans
+# can't reliably tell whether various punctuation at the end of a URI is part
+# of the URI or not.
+urlpat = re.compile(r'([a-z]+://.*?)(?:_\s|_$|$|[]})>\'"\s])', re.IGNORECASE)
# Blank lines
blankpat = re.compile(r'^\s*$')
=== modified file 'Mailman/Defaults.py.in'
--- a/Mailman/Defaults.py.in 2008-08-20 00:56:58 +0000
+++ b/Mailman/Defaults.py.in 2008-12-23 02:19:44 +0000
@@ -1094,10 +1094,14 @@
'Message',
]
+# The order in this list controls the order of the RFC 1153 digest headers.
+# Also, any headers in this list will be kept in the MIME digest even if they
+# don't appear in the MIME list above. Finally, headers appearing in both
+# lists must be casewise the same or duplication can result in the digest.
PLAIN_DIGEST_KEEP_HEADERS = [
- 'Message', 'Date', 'From',
- 'Subject', 'To', 'Cc',
- 'Message-ID', 'Keywords',
+ 'Message',
+ # RFC 1153 headers in order
+ 'Date', 'From', 'To', 'Cc', 'Subject', 'Message-ID', 'Keywords',
'Content-Type',
]
=== modified file 'NEWS'
--- a/NEWS 2008-12-19 21:02:08 +0000
+++ b/NEWS 2008-12-23 02:19:44 +0000
@@ -108,6 +108,10 @@
- Corrected a typo in Mailman/Gui/Privacy.py. Bug #309757.
+ - Changed the pattern used to recognize URLs in messages for the pipermail
+ archive in order to try to do a better job of making hyperlinks.
+ Bug #310124.
+
2.1.11 (30-Jun-2008)
New Features
--
Active development version (web u/i update)
https://code.launchpad.net/~mailman-coders/mailman/2.2
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
