1
=== modified file 'bzrlib/lazy_regex.py'
2
--- bzrlib/lazy_regex.py	2017-01-17 13:48:10 +0000
3
+++ bzrlib/lazy_regex.py	2017-01-30 14:32:50 +0000
4
@@ -133,11 +133,11 @@
5
133
        " cause infinite recursion")
133
        " cause infinite recursion")
6
134
134
7
135
135
10
136
# re.finditer get confused if it receives a LazyRegex
136
# Some libraries calls re.finditer which fails it if receives a LazyRegex.
11
137
if getattr(re, 'finditer', None is not None):
137
if getattr(re, 'finditer', False):
12
138
    def finditer_public(pattern, string, flags=0):
138
    def finditer_public(pattern, string, flags=0):
13
139
        if isinstance(pattern, LazyRegex):
139
        if isinstance(pattern, LazyRegex):
14
140
            return pattern.finditer(string)
140
            return pattern.finditer(string)
15
141
        else:
141
        else:
16
142
            return _real_re_compile(pattern, flags).finditer(string)
142
            return _real_re_compile(pattern, flags).finditer(string)
18
143
re.finditer = finditer_public
143
    re.finditer = finditer_public
19
144
144
20
=== modified file 'doc/en/release-notes/bzr-2.7.txt'
21
--- doc/en/release-notes/bzr-2.7.txt	2017-01-15 20:38:48 +0000
22
+++ doc/en/release-notes/bzr-2.7.txt	2017-01-30 14:32:50 +0000
23
@@ -31,7 +31,7 @@
24
31
*********
31
*********
25
32
32
26
33
* Complete monkey-patching of re.finditer or LazyRegexps leak.
33
* Complete monkey-patching of re.finditer or LazyRegexps leak.
28
34
  (Vincent Ladeuil, #1644003)
34
  (Vincent Ladeuil, #1644003, #1657238)
29
35
35
30
36
* Cope with paramiko making argument to SFTPFile.prefetch() mandatory.
36
* Cope with paramiko making argument to SFTPFile.prefetch() mandatory.
31
37
  (Jelmer Vernooij, #1579093)
37
  (Jelmer Vernooij, #1579093)
Reviewer	Review Type	Date Requested	Status
Vincent Ladeuil			Approve on 2017-01-30
Review via email: mp+315908@code.launchpad.net
1	=== modified file 'bzrlib/lazy_regex.py'
2	--- bzrlib/lazy_regex.py 2017-01-17 13:48:10 +0000
3	+++ bzrlib/lazy_regex.py 2017-01-30 14:32:50 +0000
4	@@ -133,11 +133,11 @@
5	133	" cause infinite recursion")	133	" cause infinite recursion")
6	134		134
7	135		135
10	136	# re.finditer get confused if it receives a LazyRegex	136	# Some libraries calls re.finditer which fails it if receives a LazyRegex.
11	137	if getattr(re, 'finditer', None is not None):	137	if getattr(re, 'finditer', False):
12	138	def finditer_public(pattern, string, flags=0):	138	def finditer_public(pattern, string, flags=0):
13	139	if isinstance(pattern, LazyRegex):	139	if isinstance(pattern, LazyRegex):
14	140	return pattern.finditer(string)	140	return pattern.finditer(string)
15	141	else:	141	else:
16	142	return _real_re_compile(pattern, flags).finditer(string)	142	return _real_re_compile(pattern, flags).finditer(string)
18	143	re.finditer = finditer_public	143	re.finditer = finditer_public
19	144		144
20	=== modified file 'doc/en/release-notes/bzr-2.7.txt'
21	--- doc/en/release-notes/bzr-2.7.txt 2017-01-15 20:38:48 +0000
22	+++ doc/en/release-notes/bzr-2.7.txt 2017-01-30 14:32:50 +0000
23	@@ -31,7 +31,7 @@
24	31	*********	31	*********
25	32		32
26	33	* Complete monkey-patching of re.finditer or LazyRegexps leak.	33	* Complete monkey-patching of re.finditer or LazyRegexps leak.
28	34	(Vincent Ladeuil, #1644003)	34	(Vincent Ladeuil, #1644003, #1657238)
29	35		35
30	36	* Cope with paramiko making argument to SFTPFile.prefetch() mandatory.	36	* Cope with paramiko making argument to SFTPFile.prefetch() mandatory.
31	37	(Jelmer Vernooij, #1579093)	37	(Jelmer Vernooij, #1579093)