Ibid

Merge lp:~stefanor/ibid/multiline-369341 into lp:~ibid-core/ibid/old-trunk-pack-0.92

  1. multiline-369341
  2. Merge into old-trunk-pack-0.92
Proposed by Stefano Rivera
Status: Merged
Approved by: Jonathan Hitchcock
Approved revision: 619
Merged at revision: 630
Proposed branch: lp:~stefanor/ibid/multiline-369341
Merge into: lp:~ibid-core/ibid/old-trunk-pack-0.92
Diff against target: None lines
To merge this branch: bzr merge lp:~stefanor/ibid/multiline-369341
Reviewer Review Type Date Requested Status
Jonathan Hitchcock Approve
Michael Gorven Approve
Review via email: mp+6103@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Stefano Rivera (stefanor) wrote :

There may be a few other corner cases that I'm missing, but this seems to help.

Revision history for this message
Michael Gorven (mgorven) wrote :

 review approve

review: Approve
Revision history for this message
Jonathan Hitchcock (vhata) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ibid/plugins/__init__.py'
2--- ibid/plugins/__init__.py 2009-05-01 12:58:06 +0000
3+++ ibid/plugins/__init__.py 2009-05-01 21:25:54 +0000
4@@ -75,7 +75,7 @@
5 return function
6
7 def match(regex, version='clean'):
8- pattern = re.compile(regex, re.I)
9+ pattern = re.compile(regex, re.I | re.DOTALL)
10 def wrap(function):
11 function.handler = True
12 function.pattern = pattern
13
14=== modified file 'ibid/plugins/core.py'
15--- ibid/plugins/core.py 2009-05-01 21:07:20 +0000
16+++ ibid/plugins/core.py 2009-05-01 21:25:54 +0000
17@@ -15,8 +15,8 @@
18 verbs = Option('verbs', u'Verbs to ignore', ('is', 'has', 'was', 'might', 'may', 'would', 'will', "isn't", "hasn't", "wasn't", "wouldn't", "won't", 'can', "can't", 'did', "didn't", 'said', 'says', 'should', "shouldn't", 'does', "doesn't"))
19
20 def setup(self):
21- self.patterns = [ re.compile(r'^(%s)([:;.?>!,-]+)*\s+' % '|'.join(self.names), re.I),
22- re.compile(r',\s*(%s)\s*$' % '|'.join(self.names), re.I)
23+ self.patterns = [ re.compile(r'^(%s)([:;.?>!,-]+)*\s+' % '|'.join(self.names), re.I | re.DOTALL),
24+ re.compile(r',\s*(%s)\s*$' % '|'.join(self.names), re.I | re.DOTALL)
25 ]
26
27 @handler
28@@ -39,7 +39,7 @@
29
30 priority = -1600
31 addressed = False
32- pattern = re.compile(r'^\s*(.*?)[?!.]*\s*$')
33+ pattern = re.compile(r'^\s*(.*?)[?!.]*\s*$', re.DOTALL)
34
35 @handler
36 def handle_strip(self, event):

Subscribers

People subscribed via source and target branches