Merge lp:~vila/bzr/1644003-lazy-regex into lp:bzr/2.7
Proposed by
Vincent Ladeuil
Status: | Merged |
---|---|
Approved by: | Vincent Ladeuil |
Approved revision: | no longer in the source branch. |
Merged at revision: | 6621 |
Proposed branch: | lp:~vila/bzr/1644003-lazy-regex |
Merge into: | lp:bzr/2.7 |
Diff against target: |
50 lines (+15/-2) 4 files modified
bzrlib/lazy_regex.py (+10/-0) bzrlib/tests/test_http.py (+1/-1) bzrlib/transport/http/_pycurl.py (+1/-1) doc/en/release-notes/bzr-2.7.txt (+3/-0) |
To merge this branch: | bzr merge lp:~vila/bzr/1644003-lazy-regex |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jelmer Vernooij (community) | Approve | ||
Review via email: mp+314788@code.launchpad.net |
Commit message
Fix python re monkey-patching leak.
Description of the change
This fixes bug #1644003 by extending the monkey-patching of python's re.
'finditer' is public and once bzr starts replacing Regex objects with LazyRegexps objects, finditer() calls break.
To post a comment you must log in.
The attempt to merge lp:~vila/bzr/1644003-lazy-regex into lp:bzr/2.7 failed. Below is the output from the failed tests.
python tools/rst2html.py --link-stylesheet --footnote- references= superscript --halt=warning --stylesheet= ../../default. css doc/en/ tutorials/ tutorial. txt "doc/en/ tutorials/ tutorial. html" references= superscript --halt=warning --stylesheet= ../../default. css doc/en/ tutorials/ using_bazaar_ with_launchpad. txt "doc/en/ tutorials/ using_bazaar_ with_launchpad. html" references= superscript --halt=warning --stylesheet= ../../default. css doc/en/ tutorials/ centralized_ workflow. txt "doc/en/ tutorials/ centralized_ workflow. html" references= superscript --halt=warning --stylesheet= ../../default. css doc/ru/ tutorials/ centralized_ workflow. txt "doc/ru/ tutorials/ centralized_ workflow. html" references= superscript --halt=warning --stylesheet= ../../default. css doc/ru/ tutorials/ using_bazaar_ with_launchpad. txt "doc/ru/ tutorials/ using_bazaar_ with_launchpad. html" references= superscript --halt=warning --stylesheet= ../../default. css doc/ru/ tutorials/ tutorial. txt "doc/ru/ tutorials/ tutorial. html" references= superscript --halt=warning --stylesheet= ../../default. css doc/ja/ tutorials/ tutorial. txt "doc/ja/ tutorials/ tutorial. html" references= superscript --halt=warning --stylesheet= ../../default. css doc/ja/ tutorials/ using_bazaar_ with_launchpad. txt "doc/ja/ tutorials/ using_bazaar_ with_launchpad. html" references= superscript --halt=warning --stylesheet= ../../default. css doc/ja/ tutorials/ centralized_ workflow. txt "doc/ja/ tutorials/ centralized_ workflow. html" references= superscript --halt=warning --stylesheet= ../../default. css doc/en/ mini-tutorial/ index.txt "doc/en/ mini-tutorial/ index.html" references= superscript --halt=warning --stylesheet= ../../default. css doc/ja/ mini-tutorial/ index.txt "doc/ja/ mini-tutorial/ index.html" references= superscript --halt=warning --stylesheet= ../../default. css doc/ru/ mini-tutorial/ index.txt "doc/ru/ mini-tutorial/ index.html" references= superscript --halt=warning --stylesheet= ../../default. css doc/es/ mini-tutorial/ index.txt "doc/es/ mini-tutorial/ index.html" references= superscript --halt=warning --stylesheet= ../../default. css doc/en/ user-guide/ index-plain. txt doc/en/ user-guide/ index-plain. html references= superscript --halt=warning --stylesheet= ../../default. css doc/ja/ user-guide/ index-plain. txt "doc/ja/ user-guide/ index-plain. html" references= superscript --ha...
python tools/rst2html.py --link-stylesheet --footnote-
python tools/rst2html.py --link-stylesheet --footnote-
python tools/rst2html.py --link-stylesheet --footnote-
python tools/rst2html.py --link-stylesheet --footnote-
python tools/rst2html.py --link-stylesheet --footnote-
python tools/rst2html.py --link-stylesheet --footnote-
python tools/rst2html.py --link-stylesheet --footnote-
python tools/rst2html.py --link-stylesheet --footnote-
python tools/rst2html.py --link-stylesheet --footnote-
python tools/rst2html.py --link-stylesheet --footnote-
python tools/rst2html.py --link-stylesheet --footnote-
python tools/rst2html.py --link-stylesheet --footnote-
python tools/rst2html.py --link-stylesheet --footnote-
python tools/rst2html.py --link-stylesheet --footnote-
python tools/rst2html.py --link-stylesheet --footnote-