Merge lp:~vila/bzr/1657238-wrong-import into lp:bzr/2.7

[Vincent Ladeuil]

Properly monkey-patch re.finditer

The previous attempt was obviously broken (working but causing bug #1657238 in some contexts).

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'bzrlib/lazy_regex.py'
--- bzrlib/lazy_regex.py	2017-01-15 20:36:48 +0000
+++ bzrlib/lazy_regex.py	2017-01-30 09:10:45 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006 Canonical Ltd
+# Copyright (C) 2006, 2008-2011, 2017 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -133,11 +133,11 @@
         " cause infinite recursion")
 
 
-# re.finditer get confused if it receives a LazyRegex
-if getattr(re, 'finditer', None is not None):
+# Some libraries calls re.finditer which fails it if receives a LazyRegex.
+if getattr(re, 'finditer', False):
     def finditer_public(pattern, string, flags=0):
         if isinstance(pattern, LazyRegex):
             return pattern.finditer(string)
         else:
             return _real_re_compile(pattern, flags).finditer(string)
-re.finditer = finditer_public
+    re.finditer = finditer_public
 
=== 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 09:10:45 +0000
@@ -31,7 +31,7 @@
 *********
 
 * Complete monkey-patching of re.finditer or LazyRegexps leak.
-  (Vincent Ladeuil, #1644003)
+  (Vincent Ladeuil, #1644003, #1657238)
 
 * Cope with paramiko making argument to SFTPFile.prefetch() mandatory.
   (Jelmer Vernooij, #1579093)