Merge lp:~vila/bzr/integration into lp:bzr

Proposed by Vincent Ladeuil on 2017-01-30
Status: Merged
Approved by: Vincent Ladeuil on 2017-01-30
Approved revision: 6621
Merged at revision: 6621
Proposed branch: lp:~vila/bzr/integration
Merge into: lp:bzr
Diff against target: 31 lines (+4/-4)
2 files modified
bzrlib/lazy_regex.py (+3/-3)
doc/en/release-notes/bzr-2.7.txt (+1/-1)
To merge this branch: bzr merge lp:~vila/bzr/integration
Reviewer Review Type Date Requested Status
Vincent Ladeuil Approve on 2017-01-30
Review via email: mp+315908@code.launchpad.net

Commit message

Merge 2.7 into trunk including fix for bug #1657238

Description of the change

Merge 2.7 into trunk including fix for bug #1657238

To post a comment you must log in.
Vincent Ladeuil (vila) wrote :

Re-sync trunk with 2.7.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'bzrlib/lazy_regex.py'
--- bzrlib/lazy_regex.py 2017-01-17 13:48:10 +0000
+++ bzrlib/lazy_regex.py 2017-01-30 14:32:50 +0000
@@ -133,11 +133,11 @@
133 " cause infinite recursion")133 " cause infinite recursion")
134134
135135
136# re.finditer get confused if it receives a LazyRegex136# Some libraries calls re.finditer which fails it if receives a LazyRegex.
137if getattr(re, 'finditer', None is not None):137if getattr(re, 'finditer', False):
138 def finditer_public(pattern, string, flags=0):138 def finditer_public(pattern, string, flags=0):
139 if isinstance(pattern, LazyRegex):139 if isinstance(pattern, LazyRegex):
140 return pattern.finditer(string)140 return pattern.finditer(string)
141 else:141 else:
142 return _real_re_compile(pattern, flags).finditer(string)142 return _real_re_compile(pattern, flags).finditer(string)
143re.finditer = finditer_public143 re.finditer = finditer_public
144144
=== modified file 'doc/en/release-notes/bzr-2.7.txt'
--- doc/en/release-notes/bzr-2.7.txt 2017-01-15 20:38:48 +0000
+++ doc/en/release-notes/bzr-2.7.txt 2017-01-30 14:32:50 +0000
@@ -31,7 +31,7 @@
31*********31*********
3232
33* Complete monkey-patching of re.finditer or LazyRegexps leak.33* Complete monkey-patching of re.finditer or LazyRegexps leak.
34 (Vincent Ladeuil, #1644003)34 (Vincent Ladeuil, #1644003, #1657238)
3535
36* Cope with paramiko making argument to SFTPFile.prefetch() mandatory.36* Cope with paramiko making argument to SFTPFile.prefetch() mandatory.
37 (Jelmer Vernooij, #1579093)37 (Jelmer Vernooij, #1579093)