[PatchDiscussion] darcs patch: strip some bottom-quoting from mailins

Fri Feb  8 19:59:36 PST 2008  Simon Michael <[email protected]>
  * strip some bottom-quoting from mailins



New patches:

[strip some bottom-quoting from mailins
Simon Michael <[email protected]>**20080209035936] {
hunk ./Extensions/mailin.py 284
+        body = stripBottomQuoted(body)
hunk ./Extensions/mailin.py 287
-        # strip TBC (typical bloody citations)
-        #body = re.sub(
-        #    r'(?si)----- ?message d\'origine.*',r'',body)
-        #body = re.sub(
-        #    r'(?si)----- ?original message.*',r'',body)
hunk ./Extensions/mailin.py 509
+def stripBottomQuoted(body):
+    origmsg = '(Original Message|message d\'origine)' # XXX i18n.. ?
+    body = re.sub(r'(?smi)^-+ ?%s ?-+$.*' % origmsg, '', body)
+    return body
+
hunk ./Extensions/mailin_tests.py 50
-TESTMSG = str(TestMessage())
+TESTMSG = """\
+From: sender
+To: recipient
+Date: date
+Subject: subject
hunk ./Extensions/mailin_tests.py 56
-TESTDARCSMSG = """\
+mailin comment
+
+
+"""
+
+BOTTOMQUOTEDMSG = """\
+From: sender
+To: recipient
+Date: date
+Subject: subject
+
+mailin comment
+
+-----Original Message-----
+From: someone
+Sent: ...
+To: ...
+Subject: blah blah blah
+
+blah BLAH
+"""
+
+BOTTOMQUOTEDMSG2 = """\
+From: sender
+To: recipient
+Date: date
+Subject: subject
+
+mailin comment
+
+On Jan 14, 2008 10:28 AM, Someone <someone@here> wrote:
+>
+> BLAH BLAH
+"""
+
+DARCSMSG = """\
hunk ./Extensions/mailin_tests.py 392
-        mailin.mailin(p,TESTDARCSMSG)
+        mailin.mailin(p,DARCSMSG)
hunk ./Extensions/mailin_tests.py 460
+    def testStripBottomQuoted(self):
+        def linecount(s): return len(s.split('\n'))
+        # re bug.. should be 7 lines
+        self.assertEqual(linecount(mailin.stripBottomQuoted(BOTTOMQUOTEDMSG)),8)
+        #self.assertEqual(linecount(mailin.stripBottomQuoted(BOTTOMQUOTEDMSG2)),8)
}

Context:

[replace: subscriberCount, wikiSubscriberCount with: subscriberCount, pageSubscriberCount, wikiSubscriberCount
Simon Michael <[email protected]>**20080207185156] 
[import latest zwiki-plone translations from launchpad
Simon Michael <[email protected]>**20080207041102] 
[more translation make rule cleanups
Simon Michael <[email protected]>**20080207034939] 
[import latest translations from launchpad
Simon Michael <[email protected]>**20080207034918] 
[switch to i18ndude, regenerate pot file
Simon Michael <[email protected]>**20080207025001] 
[update makefile translation docs
Simon Michael <[email protected]>**20080206175636] 
[recognise a site_footer attribute, like site_header, useful for eg stats tracking
[email protected]**20080126040833] 
[whitespace
Simon Michael <[email protected]>**20080125235821] 
[update access key help
Simon Michael <[email protected]>**20080125235815] 
[remove Makefile's trailing whitespace
Simon Michael <[email protected]>**20080124165849] 
[include Makefile in tarball so that folks can see how to run tests
Simon Michael <[email protected]>**20080124165839] 
[Print a note about Functional tests not running <2.10.
[email protected]**20071222191229] 
[Added some functional tests.
[email protected]**20071222185611
 These are implemented using zope.testbrowser, that's why they will
 unfortunately only run on Zope 2.10. The tests basically mimic a browser
 going through some page edits. In that way the tests provide a nice 
 high-level walkthrough. They are using doctest syntax and therefore it's 
 easy to add more. For an overview of the syntax, see:
 SOFTWARE_HOME/zope/testbrowser/README.txt
] 
[1397 - fix revert by re-adding setVotes.
[email protected]**20071222000704
 While rebuilding the rating/voting mechanism I had deleted setVotes()
 since revert() wants to use setVotes() to reset the votes, reverting
 resulted in an ugly traceback.
] 
[1017 - clicking create without pagename gives friendlier error now.
[email protected]**20071126180646
 This probably isn't perfect (user has to click the browsers "back"
 button), but I believe it's much, much better than displaying a
 traceback.
] 
[1352 - remove further (last?) hasattr() calls.
[email protected]**20071117150226
 Since these are in dtml or pt code, we replace them with getattr()
 calls, so we don't have to import our safe_hasattr() here. It would
 be nice if Zope had a built in safe_hasattr().
] 
[962 - Show form on issue pages in HTML markup.
[email protected]**20071117144917] 
[1348 - Quote the redirect URL for the "options" page.
[email protected]**20071105195729
 This is ammending "1348 - Setting useroptions now returns to previous page",
 the URL in a POST variable should be properly quoted. It usually works without 
 this, but it's not correct.
] 
[Catch only locale specific errors, no bare except.
[email protected]**20071013183750] 
[1391 - fixed "Footer 'create' button without page name results in AttributeError"
[email protected]**20071105185015
 In this case the name of the new page is not entered from the initial 
 "footer" form, but only on the edit/create page.
] 
[doc updates, release notes
Simon Michael <[email protected]>**20080118162912] 
[more coding style notes
Simon Michael <[email protected]>**20071104173259] 
[directory overview & more style notes
Simon Michael <[email protected]>**20071104164649] 
[add a doc file overview to README
Simon Michael <[email protected]>**20071104163944] 
[move/update some old style docs
Simon Michael <[email protected]>**20071104154420] 
[start a developer style guide, with some documentation guidelines
Simon Michael <[email protected]>**20071102174859] 
[Recorded rating change.
[email protected]**20071030110512
 We want to update CHANGES incrementally. Attempting to find a form for
 that here, which at the release could be changed quickly to the final
 release CHANGES.
] 
[Update only rating related indexes in catalog.
[email protected]**20071030085420
 We're saving some bytes by updating only the indexes actually
 related to voting. All metadata will unfortunately be updated anyway.
] 
[Switched to OOBTree for recording ratings.
[email protected]**20071030083921
 Dictionaries on persistant objects in the ZODB can only be saved by
 writing all of the object to the ZODB again. Inefficient. We're using
 a BTree now, which will save us some kB writing to disk and also
 reduces the likelyhood of ConflictErrors on the page.
 On accessting the "votes" we check for old votes still being 
 dictionaries, moving them to BTrees on-the-fly. The overhead for this
 is counterbalanced by easier recording of votes, just set the entry
 in the BTree.
] 
[Remove mentions of purple numbers in comments.
[email protected]**20071029174114] 
[clarify that handleEditText permissions check
Simon Michael <[email protected]>**20071028080428] 
[#1393 Catch ValueError too on importing unknown pagetypes.
[email protected]**20071022074304] 
[a little whitespace
[email protected]**20071028062937] 
[make linecounts
[email protected]**20071028062925] 
[oops! not running tests enough. Two typos and one bugfix
[email protected]**20071028022406] 
[create cleanup. All significant methods in Editing have now been reviewed/tightened up.
Simon Michael <[email protected]>**20071028020234] 
[move methods
Simon Michael <[email protected]>**20071028014132] 
[comment cleanup
[email protected]**20071028014019] 
[autoSubscriptionEnabled cleanup
Simon Michael <[email protected]>**20071028011715] 
[append, edit cleanup
[email protected]**20071028011427] 
[handleSubtopicsProperty cleanup
Simon Michael <[email protected]>**20071028010818] 
[handleEditText cleanup
Simon Michael <[email protected]>**20071028010617] 
[delete cleanup, drop unused updatebacklinks argument
Simon Michael <[email protected]>**20071028010321] 
[handleRename cleanup
Simon Michael <[email protected]>**20071028005220] 
[handleEditPageType cleanup
[email protected]**20071028005122] 
[move a method
[email protected]**20071028004655] 
[revert cleanup
[email protected]**20071026162019] 
[setCreatorLike, setLastEditorLike
[email protected]**20071026162005] 
[tests for new expunge methods
[email protected]**20071026160319] 
[clarification
[email protected]**20071026160308] 
[handy new manager methods expungeLastEditor, expungeLastEditorEverywhere; expunge, expungeEditsEverywhereBy cleanup
[email protected]**20071026150936] 
[PUT cleanup
Simon Michael <[email protected]>**20071019053515] 
[file upload code cleanup
[email protected]**20071018022343] 
[rename cleanup
[email protected]**20071017125051] 
[Catch only AttributeError for self.DestinationURL().
[email protected]**20071013191137] 
[cleanupText cleanup
[email protected]**20071017123631] 
[clean up subtopicsEnabled
[email protected]**20071016174006] 
[make bare page rendering at the debug prompt work again, cleanup
[email protected]**20071016172335] 
[os.mkdir will raise OSError, removed bare except.
[email protected]**20071013184205] 
[Zope version path changed in >=2.9, bare except removed.
[email protected]**20071013171756] 
[Catch only AttributeError instead of bare except clause (in old fix for #1137).
[email protected]**20071003184029] 
[Fix test_setupDtmlMethods for sitemap.xml.dtml.
[email protected]**20071003183255] 
[Change content-type of the SomePage/text (or /src) methods to UTF-8.
[email protected]**20071009085748
 Makes the /text view of wiki pages much more usefull for non-ascii languages.
] 
[removed some unused code in ZWikiPage.py
Simon Michael <[email protected]>**20071013190549] 
[notes update
[email protected]**20071010163932] 
[wording
[email protected]**20071010150624] 
[a google sitemap.xml, installed by setupDtmlMethod.. may reduce load from search bots
[email protected]**20070927201735] 
[remove the anti-spam 24 hour indexing delay introduced in 0.41, for better
Simon Michael <[email protected]>**20070925161611
  indexing of actively-edited pages (#1387)
] 
[feedUrl
Simon Michael <[email protected]>**20070924165908] 
[upgrade notes
Simon Michael <[email protected]>**20070920192543] 
[more upgrade notes
Simon Michael <[email protected]>**20070920190255] 
[clean up and add summary & upgrade notes for 0.60
[email protected]**20070920185128] 
[convert recent relnote headings to definition lists like the rest
[email protected]**20070920182235] 
[merge rc notes, add headings
[email protected]**20070920181617] 
[mailin test comment
[email protected]**20070919175328] 
[keep any text/x-darcs-patch part, as well as the first text/plain part of a mailin
[email protected]**20070919060849] 
[fix darcs patch mailin test
[email protected]**20070919055056] 
[test mailin of a darcs patch
[email protected]**20070918164333] 
[rename changes_rss to edits_rss (with a backwards compatibility alias) and
[email protected]**20070918152135
 update the docstring. Also, test forwarding to the PatchDiscussion page.
] 
[1272 - create PageBrain only for Zwiki Pages.
[email protected]**20070917193709
 Since we are now ensuring that there is always a catalog in a Zwiki,
 the method metadataFor() shouldn't be needed any more. But I'm still
 adding this patch (credits and thanks to koegler), in case some code
 hits on it in the time between an upgrade and running the /upgradeAll
 method.
] 
[TAG release-0-60-0
[email protected]**20070915222130] 
Patch bundle hash:
33ce666d84ffe624b5238cc502ff08ee49da6372

--
forwarded from http://zwiki.org/PatchDiscussion#[email protected]