[Python-checkins] python/dist/src/Lib textwrap.py,1.33,1.34
gward at users.sourceforge.net
gward at users.sourceforge.net
Wed May 12 21:53:13 EDT 2004
Update of /cvsroot/python/python/dist/src/Lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5197/Lib
Modified Files:
textwrap.py
Log Message:
SF #847346: merge from release23-maint branch: remove misguided
optimization for short input; beef up tests for fix_sentence_endings
feature.
Index: textwrap.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/textwrap.py,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** textwrap.py 30 Aug 2003 14:43:55 -0000 1.33
--- textwrap.py 13 May 2004 01:53:10 -0000 1.34
***************
*** 91,102 ****
! def __init__ (self,
! width=70,
! initial_indent="",
! subsequent_indent="",
! expand_tabs=True,
! replace_whitespace=True,
! fix_sentence_endings=False,
! break_long_words=True):
self.width = width
self.initial_indent = initial_indent
--- 91,102 ----
! def __init__(self,
! width=70,
! initial_indent="",
! subsequent_indent="",
! expand_tabs=True,
! replace_whitespace=True,
! fix_sentence_endings=False,
! break_long_words=True):
self.width = width
self.initial_indent = initial_indent
***************
*** 269,274 ****
text = self._munge_whitespace(text)
indent = self.initial_indent
- if len(text) + len(indent) <= self.width:
- return [indent + text]
chunks = self._split(text)
if self.fix_sentence_endings:
--- 269,272 ----
More information about the Python-checkins
mailing list