Rev 5935: sphinx-1.0.7 still has bug #785098 (Vincent Ladeuil) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5935 [merge]
revision-id: pqm at pqm.ubuntu.com-20110528072339-sz8zc51i8sv71lgx
parent: pqm at pqm.ubuntu.com-20110528054730-7q84gpthhiyk7zma
parent: v.ladeuil+lp at free.fr-20110528064401-s9kxi2rlqhqwvysy
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2011-05-28 07:23:39 +0000
message:
  sphinx-1.0.7 still has bug #785098 (Vincent Ladeuil)
modified:
  bzrlib/tests/test_utextwrap.py test_utextwrap.py-20110504151300-vdvrs19wd20a5cy0-1
  doc/en/release-notes/bzr-2.4.txt bzr2.4.txt-20110114053217-k7ym9jfz243fddjm-1
=== modified file 'bzrlib/tests/test_utextwrap.py'
--- a/bzrlib/tests/test_utextwrap.py	2011-05-27 21:16:36 +0000
+++ b/bzrlib/tests/test_utextwrap.py	2011-05-28 06:44:01 +0000
@@ -171,14 +171,14 @@
 
 
     def setup_both(testcase, base_class, reused_class):
-        
+
         if (features.sphinx.available()):
             # Until https://bitbucket.org/birkenfeld/sphinx/issue/706 is fixed,
             # we can't run these tests when sphinx <= 1.0.1 as it breaks
             # textwrap.TextWrapper.wordsep_re
             version = tuple(map(int,
                                 features.sphinx.module.__version__.split('.')))
-            if version <= (1, 0, 1):
+            if version <= (1, 0, 7):
                 raise tests.TestSkipped(
                     'sphinx textwrap monkeypatch breaks utextwrap')
         super(base_class, testcase).setUp()

=== modified file 'doc/en/release-notes/bzr-2.4.txt'
--- a/doc/en/release-notes/bzr-2.4.txt	2011-05-27 17:57:23 +0000
+++ b/doc/en/release-notes/bzr-2.4.txt	2011-05-28 06:44:01 +0000
@@ -84,6 +84,10 @@
   the default OS buffer size for pipes is small or the ``python -v``
   output is large.  (Andrew Bennetts, #784802)
 
+* Skip ``utextwrap`` tests when ``sphinx`` breaks text_wrap by an hostile
+  monkeypatch to textwrap.TextWrapper.wordsep_re.
+  (Vincent Ladeuil, #785098)
+
 * Multiple ``selftest --exclude`` options are now combined instead of
   overriding each other. (Vincent Ladeuil, #746991)