Fix #706: use a custom TextWrapper instead of monkeypatching a new wordsep_re into the textwrap one.

1 files changed, 20 insertions, 13 deletions

diff --git a/sphinx/writers/text.py b/sphinx/writers/text.py
index 1d6ad648..b82bfcdb 100644
--- a/sphinx/writers/text.py
+++ b/sphinx/writers/text.py
@@ -18,6 +18,24 @@ from sphinx import addnodes
 from sphinx.locale import admonitionlabels, versionlabels, _
 
 
+class TextWrapper(textwrap.TextWrapper):
+    """Custom subclass that uses a different word separator regex."""
+
+    wordsep_re = re.compile(
+        r'(\s+|'                                  # any whitespace
+        r'(?<=\s)(?::[a-z-]+:)?`\S+|'             # interpreted text start
+        r'[^\s\w]*\w+[a-zA-Z]-(?=\w+[a-zA-Z])|'   # hyphenated words
+        r'(?<=[\w\!\"\'\&\.\,\?])-{2,}(?=\w))')   # em-dash
+
+
+MAXWIDTH = 70
+STDINDENT = 3
+
+def my_wrap(text, width=MAXWIDTH, **kwargs):
+    w = TextWrapper(width=width, **kwargs)
+    return w.wrap(text)
+
+
 class TextWriter(writers.Writer):
     supported = ('text',)
     settings_spec = ('No options here.', '', ())
@@ -34,17 +52,6 @@ class TextWriter(writers.Writer):
         self.document.walkabout(visitor)
         self.output = visitor.body
 
-# monkey-patch...
-new_wordsep_re = re.compile(
-        r'(\s+|'                                  # any whitespace
-        r'(?<=\s)(?::[a-z-]+:)?`\S+|'             # interpreted text start
-        r'[^\s\w]*\w+[a-zA-Z]-(?=\w+[a-zA-Z])|'   # hyphenated words
-        r'(?<=[\w\!\"\'\&\.\,\?])-{2,}(?=\w))')   # em-dash
-textwrap.TextWrapper.wordsep_re = new_wordsep_re
-
-MAXWIDTH = 70
-STDINDENT = 3
-
 
 class TextTranslator(nodes.NodeVisitor):
     sectionchars = '*=-~"+`'
@@ -73,7 +80,7 @@ class TextTranslator(nodes.NodeVisitor):
             if not toformat:
                 return
             if wrap:
-                res = textwrap.wrap(''.join(toformat), width=MAXWIDTH-maxindent)
+                res = my_wrap(''.join(toformat), width=MAXWIDTH-maxindent)
             else:
                 res = ''.join(toformat).splitlines()
             if end:
@@ -373,7 +380,7 @@ class TextTranslator(nodes.NodeVisitor):
             else:
                 cells = []
                 for i, cell in enumerate(line):
-                    par = textwrap.wrap(cell, width=colwidths[i])
+                    par = my_wrap(cell, width=colwidths[i])
                     if par:
                         maxwidth = max(map(len, par))
                     else: