Rev 5934: Remerge the missing commit in http://bazaar.launchpad.net/~vila/bzr/integration/

[Vincent Ladeuil]

At http://bazaar.launchpad.net/~vila/bzr/integration/

------------------------------------------------------------
revno: 5934 [merge]
revision-id: v.ladeuil+lp at free.fr-20110528050403-lz0xe4ippec32cl8
parent: pqm at pqm.ubuntu.com-20110528005310-y2p8pdhock5cund7
parent: v.ladeuil+lp at free.fr-20110527211636-84s1jad05ndvyj49
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Sat 2011-05-28 07:04:03 +0200
message:
  Remerge the missing commit
modified:
  bzrlib/tests/test_utextwrap.py test_utextwrap.py-20110504151300-vdvrs19wd20a5cy0-1
-------------- next part --------------
=== modified file 'bzrlib/tests/test_utextwrap.py'
--- a/bzrlib/tests/test_utextwrap.py	2011-05-26 18:26:45 +0000
+++ b/bzrlib/tests/test_utextwrap.py	2011-05-27 21:16:36 +0000
@@ -174,12 +174,13 @@
         
         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
+            # 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):
-                raise tests.TestSkipped('sphinx monkeypatch textwrap')
-        testcase.debug()
+                raise tests.TestSkipped(
+                    'sphinx textwrap monkeypatch breaks utextwrap')
         super(base_class, testcase).setUp()
         override_textwrap_symbols(testcase)
         reused_class.setUp(testcase)