mirror of
https://github.com/python/cpython.git
synced 2024-11-24 18:34:43 +08:00
f3d7dbe72e
svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r75231 | benjamin.peterson | 2009-10-04 09:49:41 -0500 (Sun, 04 Oct 2009) | 166 lines Merged revisions 74779-74786,74793,74795,74811,74860-74861,74863,74876,74886,74896,74901,74903,74908,74912,74930,74933,74943,74946,74952-74955,75015,75019,75032,75068,75076,75095,75098,75102,75129,75139,75230 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r74779 | michael.foord | 2009-09-13 11:13:36 -0500 (Sun, 13 Sep 2009) | 1 line Change to tutorial wording for reading text / binary files on Windows. Issue #6301. ........ r74780 | michael.foord | 2009-09-13 11:40:02 -0500 (Sun, 13 Sep 2009) | 1 line Objects that compare equal automatically pass or fail assertAlmostEqual and assertNotAlmostEqual tests on unittest.TestCase. Issue 6567. ........ r74781 | michael.foord | 2009-09-13 11:46:19 -0500 (Sun, 13 Sep 2009) | 1 line Note that sys._getframe is not guaranteed to exist in all implementations of Python, and a corresponding note in inspect.currentframe. Issue 6712. ........ r74782 | michael.foord | 2009-09-13 12:07:46 -0500 (Sun, 13 Sep 2009) | 1 line Tutorial tweaks. Issue 6849. ........ r74783 | michael.foord | 2009-09-13 12:28:35 -0500 (Sun, 13 Sep 2009) | 1 line unittest.TestLoader.loadTestsFromName honors the loader suiteClass attribute. Issue 6866. ........ r74784 | georg.brandl | 2009-09-13 13:15:07 -0500 (Sun, 13 Sep 2009) | 1 line Typo fix. ........ r74785 | michael.foord | 2009-09-13 14:07:03 -0500 (Sun, 13 Sep 2009) | 1 line Test discovery in unittest will only attempt to import modules that are importable; i.e. their names are valid Python identifiers. If an import fails during discovery this will be recorded as an error and test discovery will continue. Issue 6568. ........ r74786 | michael.foord | 2009-09-13 14:08:18 -0500 (Sun, 13 Sep 2009) | 1 line Remove an extraneous space in unittest documentation. ........ r74793 | georg.brandl | 2009-09-14 09:50:47 -0500 (Mon, 14 Sep 2009) | 1 line #6908: fix association of hashlib hash attributes. ........ r74795 | benjamin.peterson | 2009-09-14 22:36:26 -0500 (Mon, 14 Sep 2009) | 1 line Py_SetPythonHome uses static storage #6913 ........ r74811 | georg.brandl | 2009-09-15 15:26:59 -0500 (Tue, 15 Sep 2009) | 1 line Add Armin Ronacher. ........ r74860 | benjamin.peterson | 2009-09-16 21:46:54 -0500 (Wed, 16 Sep 2009) | 1 line kill bare except ........ r74861 | benjamin.peterson | 2009-09-16 22:18:28 -0500 (Wed, 16 Sep 2009) | 1 line pep 8 defaults ........ r74863 | benjamin.peterson | 2009-09-16 22:27:33 -0500 (Wed, 16 Sep 2009) | 1 line rationalize a bit ........ r74876 | georg.brandl | 2009-09-17 11:15:53 -0500 (Thu, 17 Sep 2009) | 1 line #6932: remove paragraph that advises relying on __del__ being called. ........ r74886 | benjamin.peterson | 2009-09-17 16:33:46 -0500 (Thu, 17 Sep 2009) | 1 line use macros ........ r74896 | georg.brandl | 2009-09-18 02:22:41 -0500 (Fri, 18 Sep 2009) | 1 line #6936: for interactive use, quit() is just fine. ........ r74901 | georg.brandl | 2009-09-18 04:14:52 -0500 (Fri, 18 Sep 2009) | 1 line #6905: use better exception messages in inspect when the argument is of the wrong type. ........ r74903 | georg.brandl | 2009-09-18 04:18:27 -0500 (Fri, 18 Sep 2009) | 1 line #6938: "ident" is always a string, so use a format code which works. ........ r74908 | georg.brandl | 2009-09-18 08:57:11 -0500 (Fri, 18 Sep 2009) | 1 line Use str.format() to fix beginner's mistake with %-style string formatting. ........ r74912 | georg.brandl | 2009-09-18 11:19:56 -0500 (Fri, 18 Sep 2009) | 1 line Optimize optimization and fix method name in docstring. ........ r74930 | georg.brandl | 2009-09-18 16:21:41 -0500 (Fri, 18 Sep 2009) | 1 line #6925: rewrite docs for locals() and vars() a bit. ........ r74933 | georg.brandl | 2009-09-18 16:35:59 -0500 (Fri, 18 Sep 2009) | 1 line #6930: clarify description about byteorder handling in UTF decoder routines. ........ r74943 | georg.brandl | 2009-09-19 02:35:07 -0500 (Sat, 19 Sep 2009) | 1 line #6944: the argument to PyArg_ParseTuple should be a tuple, otherwise a SystemError is set. Also clean up another usage of PyArg_ParseTuple. ........ r74946 | georg.brandl | 2009-09-19 03:43:16 -0500 (Sat, 19 Sep 2009) | 1 line Update bug tracker reference. ........ r74952 | georg.brandl | 2009-09-19 05:42:34 -0500 (Sat, 19 Sep 2009) | 1 line #6946: fix duplicate index entries for datetime classes. ........ r74953 | georg.brandl | 2009-09-19 07:04:16 -0500 (Sat, 19 Sep 2009) | 1 line Fix references to threading.enumerate(). ........ r74954 | georg.brandl | 2009-09-19 08:13:56 -0500 (Sat, 19 Sep 2009) | 1 line Add Doug. ........ r74955 | georg.brandl | 2009-09-19 08:20:49 -0500 (Sat, 19 Sep 2009) | 1 line Add Mark Summerfield. ........ r75015 | georg.brandl | 2009-09-22 05:55:08 -0500 (Tue, 22 Sep 2009) | 1 line Fix encoding name. ........ r75019 | vinay.sajip | 2009-09-22 12:23:41 -0500 (Tue, 22 Sep 2009) | 1 line Fixed a typo, and added sections on optimization and using arbitrary objects as messages. ........ r75032 | benjamin.peterson | 2009-09-22 17:15:28 -0500 (Tue, 22 Sep 2009) | 1 line fix typos/rephrase ........ r75068 | benjamin.peterson | 2009-09-25 21:57:59 -0500 (Fri, 25 Sep 2009) | 1 line comment out ugly xxx ........ r75076 | vinay.sajip | 2009-09-26 09:53:32 -0500 (Sat, 26 Sep 2009) | 1 line Tidied up name of parameter in StreamHandler ........ r75095 | michael.foord | 2009-09-27 14:15:41 -0500 (Sun, 27 Sep 2009) | 1 line Test creation moved from TestProgram.parseArgs to TestProgram.createTests exclusively. Issue 6956. ........ r75098 | michael.foord | 2009-09-27 15:08:23 -0500 (Sun, 27 Sep 2009) | 1 line Documentation improvement for load_tests protocol in unittest. Issue 6515. ........ r75102 | skip.montanaro | 2009-09-27 21:12:27 -0500 (Sun, 27 Sep 2009) | 3 lines Patch from Thomas Barr so that csv.Sniffer will set doublequote property. Closes issue 6606. ........ r75129 | vinay.sajip | 2009-09-29 02:08:54 -0500 (Tue, 29 Sep 2009) | 1 line Issue #7014: logging: Improved IronPython 2.6 compatibility. ........ r75139 | raymond.hettinger | 2009-09-29 13:53:24 -0500 (Tue, 29 Sep 2009) | 3 lines Issue 7008: Better document str.title and show how to work around the apostrophe problem. ........ r75230 | benjamin.peterson | 2009-10-04 08:38:38 -0500 (Sun, 04 Oct 2009) | 1 line test logging ........ ................
390 lines
15 KiB
Python
390 lines
15 KiB
Python
"""Text wrapping and filling.
|
|
"""
|
|
|
|
# Copyright (C) 1999-2001 Gregory P. Ward.
|
|
# Copyright (C) 2002, 2003 Python Software Foundation.
|
|
# Written by Greg Ward <gward@python.net>
|
|
|
|
__revision__ = "$Id$"
|
|
|
|
import string, re
|
|
|
|
__all__ = ['TextWrapper', 'wrap', 'fill', 'dedent']
|
|
|
|
# Hardcode the recognized whitespace characters to the US-ASCII
|
|
# whitespace characters. The main reason for doing this is that in
|
|
# ISO-8859-1, 0xa0 is non-breaking whitespace, so in certain locales
|
|
# that character winds up in string.whitespace. Respecting
|
|
# string.whitespace in those cases would 1) make textwrap treat 0xa0 the
|
|
# same as any other whitespace char, which is clearly wrong (it's a
|
|
# *non-breaking* space), 2) possibly cause problems with Unicode,
|
|
# since 0xa0 is not in range(128).
|
|
_whitespace = '\t\n\x0b\x0c\r '
|
|
|
|
class TextWrapper:
|
|
"""
|
|
Object for wrapping/filling text. The public interface consists of
|
|
the wrap() and fill() methods; the other methods are just there for
|
|
subclasses to override in order to tweak the default behaviour.
|
|
If you want to completely replace the main wrapping algorithm,
|
|
you'll probably have to override _wrap_chunks().
|
|
|
|
Several instance attributes control various aspects of wrapping:
|
|
width (default: 70)
|
|
the maximum width of wrapped lines (unless break_long_words
|
|
is false)
|
|
initial_indent (default: "")
|
|
string that will be prepended to the first line of wrapped
|
|
output. Counts towards the line's width.
|
|
subsequent_indent (default: "")
|
|
string that will be prepended to all lines save the first
|
|
of wrapped output; also counts towards each line's width.
|
|
expand_tabs (default: true)
|
|
Expand tabs in input text to spaces before further processing.
|
|
Each tab will become 1 .. 8 spaces, depending on its position in
|
|
its line. If false, each tab is treated as a single character.
|
|
replace_whitespace (default: true)
|
|
Replace all whitespace characters in the input text by spaces
|
|
after tab expansion. Note that if expand_tabs is false and
|
|
replace_whitespace is true, every tab will be converted to a
|
|
single space!
|
|
fix_sentence_endings (default: false)
|
|
Ensure that sentence-ending punctuation is always followed
|
|
by two spaces. Off by default because the algorithm is
|
|
(unavoidably) imperfect.
|
|
break_long_words (default: true)
|
|
Break words longer than 'width'. If false, those words will not
|
|
be broken, and some lines might be longer than 'width'.
|
|
break_on_hyphens (default: true)
|
|
Allow breaking hyphenated words. If true, wrapping will occur
|
|
preferably on whitespaces and right after hyphens part of
|
|
compound words.
|
|
drop_whitespace (default: true)
|
|
Drop leading and trailing whitespace from lines.
|
|
"""
|
|
|
|
unicode_whitespace_trans = {}
|
|
uspace = ord(' ')
|
|
for x in _whitespace:
|
|
unicode_whitespace_trans[ord(x)] = uspace
|
|
|
|
# This funky little regex is just the trick for splitting
|
|
# text up into word-wrappable chunks. E.g.
|
|
# "Hello there -- you goof-ball, use the -b option!"
|
|
# 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+[^0-9\W]-(?=\w+[^0-9\W])|' # hyphenated words
|
|
r'(?<=[\w\!\"\'\&\.\,\?])-{2,}(?=\w))') # em-dash
|
|
|
|
# This less funky little regex just split on recognized spaces. E.g.
|
|
# "Hello there -- you goof-ball, use the -b option!"
|
|
# splits into
|
|
# Hello/ /there/ /--/ /you/ /goof-ball,/ /use/ /the/ /-b/ /option!/
|
|
wordsep_simple_re = re.compile(r'(\s+)')
|
|
|
|
# XXX this is not locale- or charset-aware -- string.lowercase
|
|
# is US-ASCII only (and therefore English-only)
|
|
sentence_end_re = re.compile(r'[a-z]' # lowercase letter
|
|
r'[\.\!\?]' # sentence-ending punct.
|
|
r'[\"\']?' # optional end-of-quote
|
|
r'\Z') # end of chunk
|
|
|
|
|
|
def __init__(self,
|
|
width=70,
|
|
initial_indent="",
|
|
subsequent_indent="",
|
|
expand_tabs=True,
|
|
replace_whitespace=True,
|
|
fix_sentence_endings=False,
|
|
break_long_words=True,
|
|
drop_whitespace=True,
|
|
break_on_hyphens=True):
|
|
self.width = width
|
|
self.initial_indent = initial_indent
|
|
self.subsequent_indent = subsequent_indent
|
|
self.expand_tabs = expand_tabs
|
|
self.replace_whitespace = replace_whitespace
|
|
self.fix_sentence_endings = fix_sentence_endings
|
|
self.break_long_words = break_long_words
|
|
self.drop_whitespace = drop_whitespace
|
|
self.break_on_hyphens = break_on_hyphens
|
|
|
|
|
|
# -- Private methods -----------------------------------------------
|
|
# (possibly useful for subclasses to override)
|
|
|
|
def _munge_whitespace(self, text):
|
|
"""_munge_whitespace(text : string) -> string
|
|
|
|
Munge whitespace in text: expand tabs and convert all other
|
|
whitespace characters to spaces. Eg. " foo\tbar\n\nbaz"
|
|
becomes " foo bar baz".
|
|
"""
|
|
if self.expand_tabs:
|
|
text = text.expandtabs()
|
|
if self.replace_whitespace:
|
|
text = text.translate(self.unicode_whitespace_trans)
|
|
return text
|
|
|
|
|
|
def _split(self, text):
|
|
"""_split(text : string) -> [string]
|
|
|
|
Split the text to wrap into indivisible chunks. Chunks are
|
|
not quite the same as words; see _wrap_chunks() for full
|
|
details. As an example, the text
|
|
Look, goof-ball -- use the -b option!
|
|
breaks into the following chunks:
|
|
'Look,', ' ', 'goof-', 'ball', ' ', '--', ' ',
|
|
'use', ' ', 'the', ' ', '-b', ' ', 'option!'
|
|
if break_on_hyphens is True, or in:
|
|
'Look,', ' ', 'goof-ball', ' ', '--', ' ',
|
|
'use', ' ', 'the', ' ', '-b', ' ', option!'
|
|
otherwise.
|
|
"""
|
|
if self.break_on_hyphens is True:
|
|
chunks = self.wordsep_re.split(text)
|
|
else:
|
|
chunks = self.wordsep_simple_re.split(text)
|
|
chunks = [c for c in chunks if c]
|
|
return chunks
|
|
|
|
def _fix_sentence_endings(self, chunks):
|
|
"""_fix_sentence_endings(chunks : [string])
|
|
|
|
Correct for sentence endings buried in 'chunks'. Eg. when the
|
|
original text contains "... foo.\nBar ...", munge_whitespace()
|
|
and split() will convert that to [..., "foo.", " ", "Bar", ...]
|
|
which has one too few spaces; this method simply changes the one
|
|
space to two.
|
|
"""
|
|
i = 0
|
|
patsearch = self.sentence_end_re.search
|
|
while i < len(chunks)-1:
|
|
if chunks[i+1] == " " and patsearch(chunks[i]):
|
|
chunks[i+1] = " "
|
|
i += 2
|
|
else:
|
|
i += 1
|
|
|
|
def _handle_long_word(self, reversed_chunks, cur_line, cur_len, width):
|
|
"""_handle_long_word(chunks : [string],
|
|
cur_line : [string],
|
|
cur_len : int, width : int)
|
|
|
|
Handle a chunk of text (most likely a word, not whitespace) that
|
|
is too long to fit in any line.
|
|
"""
|
|
# Figure out when indent is larger than the specified width, and make
|
|
# sure at least one character is stripped off on every pass
|
|
if width < 1:
|
|
space_left = 1
|
|
else:
|
|
space_left = width - cur_len
|
|
|
|
# If we're allowed to break long words, then do so: put as much
|
|
# of the next chunk onto the current line as will fit.
|
|
if self.break_long_words:
|
|
cur_line.append(reversed_chunks[-1][:space_left])
|
|
reversed_chunks[-1] = reversed_chunks[-1][space_left:]
|
|
|
|
# Otherwise, we have to preserve the long word intact. Only add
|
|
# it to the current line if there's nothing already there --
|
|
# that minimizes how much we violate the width constraint.
|
|
elif not cur_line:
|
|
cur_line.append(reversed_chunks.pop())
|
|
|
|
# If we're not allowed to break long words, and there's already
|
|
# text on the current line, do nothing. Next time through the
|
|
# main loop of _wrap_chunks(), we'll wind up here again, but
|
|
# cur_len will be zero, so the next line will be entirely
|
|
# devoted to the long word that we can't handle right now.
|
|
|
|
def _wrap_chunks(self, chunks):
|
|
"""_wrap_chunks(chunks : [string]) -> [string]
|
|
|
|
Wrap a sequence of text chunks and return a list of lines of
|
|
length 'self.width' or less. (If 'break_long_words' is false,
|
|
some lines may be longer than this.) Chunks correspond roughly
|
|
to words and the whitespace between them: each chunk is
|
|
indivisible (modulo 'break_long_words'), but a line break can
|
|
come between any two chunks. Chunks should not have internal
|
|
whitespace; ie. a chunk is either all whitespace or a "word".
|
|
Whitespace chunks will be removed from the beginning and end of
|
|
lines, but apart from that whitespace is preserved.
|
|
"""
|
|
lines = []
|
|
if self.width <= 0:
|
|
raise ValueError("invalid width %r (must be > 0)" % self.width)
|
|
|
|
# Arrange in reverse order so items can be efficiently popped
|
|
# from a stack of chucks.
|
|
chunks.reverse()
|
|
|
|
while chunks:
|
|
|
|
# Start the list of chunks that will make up the current line.
|
|
# cur_len is just the length of all the chunks in cur_line.
|
|
cur_line = []
|
|
cur_len = 0
|
|
|
|
# Figure out which static string will prefix this line.
|
|
if lines:
|
|
indent = self.subsequent_indent
|
|
else:
|
|
indent = self.initial_indent
|
|
|
|
# Maximum width for this line.
|
|
width = self.width - len(indent)
|
|
|
|
# First chunk on line is whitespace -- drop it, unless this
|
|
# is the very beginning of the text (ie. no lines started yet).
|
|
if self.drop_whitespace and chunks[-1].strip() == '' and lines:
|
|
del chunks[-1]
|
|
|
|
while chunks:
|
|
l = len(chunks[-1])
|
|
|
|
# Can at least squeeze this chunk onto the current line.
|
|
if cur_len + l <= width:
|
|
cur_line.append(chunks.pop())
|
|
cur_len += l
|
|
|
|
# Nope, this line is full.
|
|
else:
|
|
break
|
|
|
|
# The current line is full, and the next chunk is too big to
|
|
# fit on *any* line (not just this one).
|
|
if chunks and len(chunks[-1]) > width:
|
|
self._handle_long_word(chunks, cur_line, cur_len, width)
|
|
|
|
# If the last chunk on this line is all whitespace, drop it.
|
|
if self.drop_whitespace and cur_line and cur_line[-1].strip() == '':
|
|
del cur_line[-1]
|
|
|
|
# Convert current line back to a string and store it in list
|
|
# of all lines (return value).
|
|
if cur_line:
|
|
lines.append(indent + ''.join(cur_line))
|
|
|
|
return lines
|
|
|
|
|
|
# -- Public interface ----------------------------------------------
|
|
|
|
def wrap(self, text):
|
|
"""wrap(text : string) -> [string]
|
|
|
|
Reformat the single paragraph in 'text' so it fits in lines of
|
|
no more than 'self.width' columns, and return a list of wrapped
|
|
lines. Tabs in 'text' are expanded with string.expandtabs(),
|
|
and all other whitespace characters (including newline) are
|
|
converted to space.
|
|
"""
|
|
text = self._munge_whitespace(text)
|
|
chunks = self._split(text)
|
|
if self.fix_sentence_endings:
|
|
self._fix_sentence_endings(chunks)
|
|
return self._wrap_chunks(chunks)
|
|
|
|
def fill(self, text):
|
|
"""fill(text : string) -> string
|
|
|
|
Reformat the single paragraph in 'text' to fit in lines of no
|
|
more than 'self.width' columns, and return a new string
|
|
containing the entire wrapped paragraph.
|
|
"""
|
|
return "\n".join(self.wrap(text))
|
|
|
|
|
|
# -- Convenience interface ---------------------------------------------
|
|
|
|
def wrap(text, width=70, **kwargs):
|
|
"""Wrap a single paragraph of text, returning a list of wrapped lines.
|
|
|
|
Reformat the single paragraph in 'text' so it fits in lines of no
|
|
more than 'width' columns, and return a list of wrapped lines. By
|
|
default, tabs in 'text' are expanded with string.expandtabs(), and
|
|
all other whitespace characters (including newline) are converted to
|
|
space. See TextWrapper class for available keyword args to customize
|
|
wrapping behaviour.
|
|
"""
|
|
w = TextWrapper(width=width, **kwargs)
|
|
return w.wrap(text)
|
|
|
|
def fill(text, width=70, **kwargs):
|
|
"""Fill a single paragraph of text, returning a new string.
|
|
|
|
Reformat the single paragraph in 'text' to fit in lines of no more
|
|
than 'width' columns, and return a new string containing the entire
|
|
wrapped paragraph. As with wrap(), tabs are expanded and other
|
|
whitespace characters converted to space. See TextWrapper class for
|
|
available keyword args to customize wrapping behaviour.
|
|
"""
|
|
w = TextWrapper(width=width, **kwargs)
|
|
return w.fill(text)
|
|
|
|
|
|
# -- Loosely related functionality -------------------------------------
|
|
|
|
_whitespace_only_re = re.compile('^[ \t]+$', re.MULTILINE)
|
|
_leading_whitespace_re = re.compile('(^[ \t]*)(?:[^ \t\n])', re.MULTILINE)
|
|
|
|
def dedent(text):
|
|
"""Remove any common leading whitespace from every line in `text`.
|
|
|
|
This can be used to make triple-quoted strings line up with the left
|
|
edge of the display, while still presenting them in the source code
|
|
in indented form.
|
|
|
|
Note that tabs and spaces are both treated as whitespace, but they
|
|
are not equal: the lines " hello" and "\thello" are
|
|
considered to have no common leading whitespace. (This behaviour is
|
|
new in Python 2.5; older versions of this module incorrectly
|
|
expanded tabs before searching for common leading whitespace.)
|
|
"""
|
|
# Look for the longest leading string of spaces and tabs common to
|
|
# all lines.
|
|
margin = None
|
|
text = _whitespace_only_re.sub('', text)
|
|
indents = _leading_whitespace_re.findall(text)
|
|
for indent in indents:
|
|
if margin is None:
|
|
margin = indent
|
|
|
|
# Current line more deeply indented than previous winner:
|
|
# no change (previous winner is still on top).
|
|
elif indent.startswith(margin):
|
|
pass
|
|
|
|
# Current line consistent with and no deeper than previous winner:
|
|
# it's the new winner.
|
|
elif margin.startswith(indent):
|
|
margin = indent
|
|
|
|
# Current line and previous winner have no common whitespace:
|
|
# there is no margin.
|
|
else:
|
|
margin = ""
|
|
break
|
|
|
|
# sanity check (testing/debugging only)
|
|
if 0 and margin:
|
|
for line in text.split("\n"):
|
|
assert not line or line.startswith(margin), \
|
|
"line = %r, margin = %r" % (line, margin)
|
|
|
|
if margin:
|
|
text = re.sub(r'(?m)^' + margin, '', text)
|
|
return text
|
|
|
|
if __name__ == "__main__":
|
|
#print dedent("\tfoo\n\tbar")
|
|
#print dedent(" \thello there\n \t how are you?")
|
|
print(dedent("Hello there.\n This is indented."))
|