SF #1149508: ensure textwrap handles hyphenated numbers correctly,

eg. "2004-03-04" is not broken across lines.  (Merged from 2.4 branch.)

1 files changed, 4 insertions, 3 deletions

diff --git a/Lib/textwrap.py b/Lib/textwrap.py
index 8e3d8cf594..4576ef2a3f 100644
--- a/Lib/textwrap.py
+++ b/Lib/textwrap.py
@@ -78,9 +78,10 @@ class TextWrapper:
     # splits into
     #   Hello/ /there/ /--/ /you/ /goof-/ball,/ /use/ /the/ /-b/ /option!
     # (after stripping out empty strings).
-    wordsep_re = re.compile(r'(\s+|'                  # any whitespace
-                            r'[^\s\w]*\w{2,}-(?=\w{2,})|' # hyphenated words
-                            r'(?<=[\w\!\"\'\&\.\,\?])-{2,}(?=\w))')   # em-dash
+    wordsep_re = re.compile(
+        r'(\s+|'                                  # any whitespace
+        r'[^\s\w]*\w+[a-zA-Z]-(?=\w+[a-zA-Z])|'   # hyphenated words
+        r'(?<=[\w\!\"\'\&\.\,\?])-{2,}(?=\w))')   # em-dash
 
     # XXX this is not locale- or charset-aware -- string.lowercase
     # is US-ASCII only (and therefore English-only)