2002-07-04 11:51:49 -03:00
|
|
|
"""Text wrapping and filling.
|
2002-06-07 18:43:37 -03:00
|
|
|
"""
|
|
|
|
|
2002-10-13 16:23:18 -03:00
|
|
|
# Copyright (C) 1999-2001 Gregory P. Ward.
|
2003-06-15 12:37:18 -03:00
|
|
|
# Copyright (C) 2002, 2003 Python Software Foundation.
|
2002-06-07 19:40:23 -03:00
|
|
|
# Written by Greg Ward <gward@python.net>
|
|
|
|
|
2002-06-07 18:43:37 -03:00
|
|
|
__revision__ = "$Id$"
|
|
|
|
|
|
|
|
import string, re
|
|
|
|
|
2003-06-15 12:37:18 -03:00
|
|
|
# Do the right thing with boolean values for all known Python versions
|
|
|
|
# (so this module can be copied to projects that don't depend on Python
|
2008-07-31 22:34:05 -03:00
|
|
|
# 2.3, e.g. Optik and Docutils) by uncommenting the block of code below.
|
|
|
|
#try:
|
|
|
|
# True, False
|
|
|
|
#except NameError:
|
|
|
|
# (True, False) = (1, 0)
|
2003-06-15 12:37:18 -03:00
|
|
|
|
Merged revisions 67571,67574-67576,67579-67581,67583,67591,67597,67608,67631 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67571 | georg.brandl | 2008-12-05 10:13:45 +0100 (Fri, 05 Dec 2008) | 2 lines
Use markup.
........
r67574 | georg.brandl | 2008-12-05 10:25:32 +0100 (Fri, 05 Dec 2008) | 2 lines
#4441 followup: Add link to open() docs for Windows.
........
r67575 | georg.brandl | 2008-12-05 12:34:51 +0100 (Fri, 05 Dec 2008) | 2 lines
#4544: add `dedent` to textwrap.__all__.
........
r67576 | georg.brandl | 2008-12-05 13:09:41 +0100 (Fri, 05 Dec 2008) | 2 lines
#4529: fix parser's validation for try-except-finally statements.
........
r67579 | georg.brandl | 2008-12-05 16:29:39 +0100 (Fri, 05 Dec 2008) | 2 lines
#4517: add "special method" glossary entry and clarify when __getattribute__ is bypassed.
........
r67580 | georg.brandl | 2008-12-05 16:32:29 +0100 (Fri, 05 Dec 2008) | 2 lines
#4478: document that copyfile() can raise Error.
........
r67581 | georg.brandl | 2008-12-05 16:42:03 +0100 (Fri, 05 Dec 2008) | 2 lines
#3171: document that *slice are removed in 3k.
........
r67583 | georg.brandl | 2008-12-05 16:52:20 +0100 (Fri, 05 Dec 2008) | 4 lines
Move __import__ to the bottom of the functions list.
It doesn't make sense for such a fundamental document to have
the most obscure function listed at the top.
........
r67591 | georg.brandl | 2008-12-05 19:00:06 +0100 (Fri, 05 Dec 2008) | 2 lines
Followup to #4511: add link from decorator glossary entry to definition.
........
r67597 | georg.brandl | 2008-12-05 20:03:19 +0100 (Fri, 05 Dec 2008) | 2 lines
Remove confusing sentence part.
........
r67608 | georg.brandl | 2008-12-06 12:57:12 +0100 (Sat, 06 Dec 2008) | 2 lines
Follow-up to #4488: document PIPE and STDOUT properly.
........
r67631 | georg.brandl | 2008-12-07 12:54:07 +0100 (Sun, 07 Dec 2008) | 2 lines
Add link to the favicon to the docs.
........
2008-12-07 10:47:12 -04:00
|
|
|
__all__ = ['TextWrapper', 'wrap', 'fill', 'dedent']
|
2003-02-03 10:46:57 -04:00
|
|
|
|
2002-12-12 13:24:35 -04:00
|
|
|
# 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).
|
2003-02-03 10:46:57 -04:00
|
|
|
_whitespace = '\t\n\x0b\x0c\r '
|
2002-12-12 13:24:35 -04:00
|
|
|
|
2002-06-07 18:43:37 -03:00
|
|
|
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().
|
|
|
|
|
2002-06-10 17:26:02 -03:00
|
|
|
Several instance attributes control various aspects of wrapping:
|
|
|
|
width (default: 70)
|
|
|
|
the maximum width of wrapped lines (unless break_long_words
|
|
|
|
is false)
|
2002-06-10 18:37:12 -03:00
|
|
|
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.
|
2002-06-07 18:56:16 -03:00
|
|
|
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
|
2003-02-13 21:14:15 -04:00
|
|
|
by two spaces. Off by default because the algorithm is
|
2002-06-07 18:56:16 -03:00
|
|
|
(unavoidably) imperfect.
|
|
|
|
break_long_words (default: true)
|
2002-06-10 17:26:02 -03:00
|
|
|
Break words longer than 'width'. If false, those words will not
|
|
|
|
be broken, and some lines might be longer than 'width'.
|
2008-05-11 07:42:28 -03:00
|
|
|
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.
|
2007-03-13 15:15:41 -03:00
|
|
|
drop_whitespace (default: true)
|
|
|
|
Drop leading and trailing whitespace from lines.
|
2002-06-07 18:43:37 -03:00
|
|
|
"""
|
|
|
|
|
2003-02-03 10:46:57 -04:00
|
|
|
whitespace_trans = string.maketrans(_whitespace, ' ' * len(_whitespace))
|
2002-06-07 18:43:37 -03:00
|
|
|
|
2002-12-09 12:23:08 -04:00
|
|
|
unicode_whitespace_trans = {}
|
2002-12-11 09:54:20 -04:00
|
|
|
uspace = ord(u' ')
|
2003-02-03 10:46:57 -04:00
|
|
|
for x in map(ord, _whitespace):
|
2002-12-11 09:54:20 -04:00
|
|
|
unicode_whitespace_trans[x] = uspace
|
2002-12-09 12:23:08 -04:00
|
|
|
|
2002-07-16 18:35:23 -03:00
|
|
|
# This funky little regex is just the trick for splitting
|
2002-06-07 18:43:37 -03:00
|
|
|
# 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).
|
Merged revisions 67952-67953,67955,67957-67958,67960-67961,67963,67965,67967,67970-67971,67973,67982,67988,67990,67995,68014,68016,68030,68057,68061,68112,68115-68118,68120-68121,68123-68128 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67952 | georg.brandl | 2008-12-27 18:42:40 +0100 (Sat, 27 Dec 2008) | 2 lines
#4752: actually use custom handler in example.
........
r67953 | georg.brandl | 2008-12-27 19:20:04 +0100 (Sat, 27 Dec 2008) | 3 lines
Patch #4739 by David Laban: add symbols to pydoc help topics,
so that ``help('@')`` works as expected.
........
r67955 | georg.brandl | 2008-12-27 19:27:53 +0100 (Sat, 27 Dec 2008) | 3 lines
Follow-up to r67746 in order to restore backwards-compatibility for
those who (monkey-)patch TextWrapper.wordsep_re with a custom RE.
........
r67957 | georg.brandl | 2008-12-27 19:49:19 +0100 (Sat, 27 Dec 2008) | 2 lines
#4754: improve winsound documentation.
........
r67958 | georg.brandl | 2008-12-27 20:02:59 +0100 (Sat, 27 Dec 2008) | 2 lines
#4682: 'b' is actually unsigned char.
........
r67960 | georg.brandl | 2008-12-27 20:04:44 +0100 (Sat, 27 Dec 2008) | 2 lines
#4695: fix backslashery.
........
r67961 | georg.brandl | 2008-12-27 20:06:04 +0100 (Sat, 27 Dec 2008) | 2 lines
Use :samp: role.
........
r67963 | georg.brandl | 2008-12-27 20:11:15 +0100 (Sat, 27 Dec 2008) | 2 lines
#4671: document that pydoc imports modules.
........
r67965 | antoine.pitrou | 2008-12-27 21:34:52 +0100 (Sat, 27 Dec 2008) | 3 lines
Issue #4677: add two list comprehension tests to pybench.
........
r67967 | benjamin.peterson | 2008-12-27 23:18:58 +0100 (Sat, 27 Dec 2008) | 1 line
fix markup
........
r67970 | alexandre.vassalotti | 2008-12-28 02:52:58 +0100 (Sun, 28 Dec 2008) | 2 lines
Fix name mangling of PyUnicode_ClearFreeList.
........
r67971 | alexandre.vassalotti | 2008-12-28 03:10:35 +0100 (Sun, 28 Dec 2008) | 2 lines
Sort UCS-2/UCS-4 name mangling list.
........
r67973 | alexandre.vassalotti | 2008-12-28 03:58:22 +0100 (Sun, 28 Dec 2008) | 2 lines
Document Py_VaBuildValue.
........
r67982 | benjamin.peterson | 2008-12-28 16:37:31 +0100 (Sun, 28 Dec 2008) | 1 line
fix WORD_BIGEDIAN declaration in Universal builds; fixes #4060 and #4728
........
r67988 | ronald.oussoren | 2008-12-28 20:40:56 +0100 (Sun, 28 Dec 2008) | 1 line
Issue4064: architecture string for universal builds on OSX
........
r67990 | ronald.oussoren | 2008-12-28 20:50:40 +0100 (Sun, 28 Dec 2008) | 3 lines
Update the fix for issue4064 to deal correctly with all three variants of
universal builds that are presented by the configure script.
........
r67995 | benjamin.peterson | 2008-12-28 22:16:07 +0100 (Sun, 28 Dec 2008) | 1 line
#4763 PyErr_ExceptionMatches won't blow up with NULL arguments
........
r68014 | benjamin.peterson | 2008-12-29 18:47:42 +0100 (Mon, 29 Dec 2008) | 1 line
#4764 set IOError.filename when trying to open a directory on POSIX platforms
........
r68016 | benjamin.peterson | 2008-12-29 18:56:58 +0100 (Mon, 29 Dec 2008) | 1 line
#4764 in io.open, set IOError.filename when trying to open a directory on POSIX platforms
........
r68030 | benjamin.peterson | 2008-12-29 22:38:14 +0100 (Mon, 29 Dec 2008) | 1 line
fix French
........
r68057 | vinay.sajip | 2008-12-30 08:01:25 +0100 (Tue, 30 Dec 2008) | 1 line
Minor documentation change relating to NullHandler.
........
r68061 | georg.brandl | 2008-12-30 11:15:49 +0100 (Tue, 30 Dec 2008) | 2 lines
#4778: attributes can't be called.
........
r68112 | benjamin.peterson | 2009-01-01 00:48:39 +0100 (Thu, 01 Jan 2009) | 1 line
#4795 inspect.isgeneratorfunction() should return False instead of None
........
r68115 | benjamin.peterson | 2009-01-01 05:04:41 +0100 (Thu, 01 Jan 2009) | 1 line
simplfy code
........
r68116 | georg.brandl | 2009-01-01 12:46:51 +0100 (Thu, 01 Jan 2009) | 2 lines
#4100: note that element children are not necessarily present on "start" events.
........
r68117 | georg.brandl | 2009-01-01 12:53:55 +0100 (Thu, 01 Jan 2009) | 2 lines
#4156: make clear that "protocol" is to be replaced with the protocol name.
........
r68118 | georg.brandl | 2009-01-01 13:00:19 +0100 (Thu, 01 Jan 2009) | 2 lines
#4185: clarify escape behavior of replacement strings.
........
r68120 | georg.brandl | 2009-01-01 13:15:31 +0100 (Thu, 01 Jan 2009) | 4 lines
#4228: Pack negative values the same way as 2.4
in struct's L format.
........
r68121 | georg.brandl | 2009-01-01 13:43:33 +0100 (Thu, 01 Jan 2009) | 2 lines
Point to types module in new module deprecation notice.
........
r68123 | georg.brandl | 2009-01-01 13:52:29 +0100 (Thu, 01 Jan 2009) | 2 lines
#4784: ... on three counts ...
........
r68124 | georg.brandl | 2009-01-01 13:53:19 +0100 (Thu, 01 Jan 2009) | 2 lines
#4782: Fix markup error that hid load() and loads().
........
r68125 | georg.brandl | 2009-01-01 14:02:09 +0100 (Thu, 01 Jan 2009) | 2 lines
#4776: add data_files and package_dir arguments.
........
r68126 | georg.brandl | 2009-01-01 14:05:13 +0100 (Thu, 01 Jan 2009) | 2 lines
Handlers are in the `logging.handlers` module.
........
r68127 | georg.brandl | 2009-01-01 14:14:49 +0100 (Thu, 01 Jan 2009) | 2 lines
#4767: Use correct submodules for all MIME classes.
........
r68128 | antoine.pitrou | 2009-01-01 15:11:22 +0100 (Thu, 01 Jan 2009) | 3 lines
Issue #3680: Reference cycles created through a dict, set or deque iterator did not get collected.
........
2009-01-01 11:46:10 -04:00
|
|
|
wordsep_re = re.compile(
|
2005-03-04 22:53:17 -04:00
|
|
|
r'(\s+|' # any whitespace
|
Merged revisions 67654,67676-67677,67681,67692,67725,67746,67748,67761,67784-67785,67787-67788,67802,67832,67848-67849,67859,67862-67864,67880,67882,67885,67889-67892,67895 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
................
r67654 | georg.brandl | 2008-12-07 16:42:09 -0600 (Sun, 07 Dec 2008) | 2 lines
#4457: rewrite __import__() documentation.
................
r67676 | benjamin.peterson | 2008-12-08 20:03:03 -0600 (Mon, 08 Dec 2008) | 1 line
specify how things are copied
................
r67677 | benjamin.peterson | 2008-12-08 20:05:11 -0600 (Mon, 08 Dec 2008) | 1 line
revert unrelated change to installer script
................
r67681 | jeremy.hylton | 2008-12-09 15:03:10 -0600 (Tue, 09 Dec 2008) | 2 lines
Add simple unittests for Request
................
r67692 | amaury.forgeotdarc | 2008-12-10 18:03:42 -0600 (Wed, 10 Dec 2008) | 2 lines
#1030250: correctly pass the dry_run option to the mkpath() function.
................
r67725 | benjamin.peterson | 2008-12-12 22:02:20 -0600 (Fri, 12 Dec 2008) | 1 line
fix incorrect example
................
r67746 | antoine.pitrou | 2008-12-13 17:12:30 -0600 (Sat, 13 Dec 2008) | 3 lines
Issue #4163: Use unicode-friendly word splitting in the textwrap functions when given an unicode string.
................
r67748 | benjamin.peterson | 2008-12-13 19:46:11 -0600 (Sat, 13 Dec 2008) | 1 line
remove has_key usage
................
r67761 | benjamin.peterson | 2008-12-14 11:26:04 -0600 (Sun, 14 Dec 2008) | 1 line
fix missing bracket
................
r67784 | georg.brandl | 2008-12-15 02:33:58 -0600 (Mon, 15 Dec 2008) | 2 lines
#4446: document "platforms" argument for setup().
................
r67785 | georg.brandl | 2008-12-15 02:36:11 -0600 (Mon, 15 Dec 2008) | 2 lines
#4611: fix typo.
................
r67787 | georg.brandl | 2008-12-15 02:58:59 -0600 (Mon, 15 Dec 2008) | 2 lines
#4578: fix has_key() usage in compiler package.
................
r67788 | georg.brandl | 2008-12-15 03:07:39 -0600 (Mon, 15 Dec 2008) | 2 lines
#4568: remove limitation in varargs callback example.
................
r67802 | amaury.forgeotdarc | 2008-12-15 16:29:14 -0600 (Mon, 15 Dec 2008) | 4 lines
#3632: the "pyo" macro from gdbinit can now run when the GIL is released.
Patch by haypo.
................
r67832 | antoine.pitrou | 2008-12-17 16:46:54 -0600 (Wed, 17 Dec 2008) | 4 lines
Issue #2467: gc.DEBUG_STATS reports invalid elapsed times.
Patch by Neil Schemenauer, very slightly modified.
................
r67848 | benjamin.peterson | 2008-12-18 20:28:56 -0600 (Thu, 18 Dec 2008) | 1 line
fix typo
................
r67849 | benjamin.peterson | 2008-12-18 20:31:35 -0600 (Thu, 18 Dec 2008) | 1 line
_call_method -> _callmethod and _get_value to _getvalue
................
r67859 | amaury.forgeotdarc | 2008-12-19 16:56:48 -0600 (Fri, 19 Dec 2008) | 4 lines
#4700: crtlicense.txt is displayed by the license() command and should be kept ascii-only.
Will port to 3.0
................
r67862 | benjamin.peterson | 2008-12-19 20:48:02 -0600 (Fri, 19 Dec 2008) | 1 line
copy sentence from docstring
................
r67863 | benjamin.peterson | 2008-12-19 20:51:26 -0600 (Fri, 19 Dec 2008) | 1 line
add headings
................
r67864 | benjamin.peterson | 2008-12-19 20:57:19 -0600 (Fri, 19 Dec 2008) | 1 line
beef up docstring
................
r67880 | benjamin.peterson | 2008-12-20 16:49:24 -0600 (Sat, 20 Dec 2008) | 1 line
remove redundant sentence
................
r67882 | benjamin.peterson | 2008-12-20 16:59:49 -0600 (Sat, 20 Dec 2008) | 1 line
add some recent releases to the list
................
r67885 | benjamin.peterson | 2008-12-20 17:48:54 -0600 (Sat, 20 Dec 2008) | 1 line
silence annoying DeprecationWarning
................
r67889 | benjamin.peterson | 2008-12-20 19:04:32 -0600 (Sat, 20 Dec 2008) | 1 line
sphinx.web is long gone
................
r67890 | benjamin.peterson | 2008-12-20 19:12:26 -0600 (Sat, 20 Dec 2008) | 1 line
update readme
................
r67891 | benjamin.peterson | 2008-12-20 19:14:47 -0600 (Sat, 20 Dec 2008) | 1 line
there are way too many places which need to have the current version added
................
r67892 | benjamin.peterson | 2008-12-20 19:29:32 -0600 (Sat, 20 Dec 2008) | 9 lines
Merged revisions 67809 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r67809 | benjamin.peterson | 2008-12-15 21:54:45 -0600 (Mon, 15 Dec 2008) | 1 line
fix logic error
........
................
r67895 | neal.norwitz | 2008-12-21 08:28:32 -0600 (Sun, 21 Dec 2008) | 2 lines
Add Tarek for work on distutils.
................
2008-12-21 13:01:26 -04:00
|
|
|
r'[^\s\w]*\w+[^0-9\W]-(?=\w+[^0-9\W])|' # hyphenated words
|
2005-03-04 22:53:17 -04:00
|
|
|
r'(?<=[\w\!\"\'\&\.\,\?])-{2,}(?=\w))') # em-dash
|
2002-06-07 18:43:37 -03:00
|
|
|
|
2008-05-11 07:42:28 -03:00
|
|
|
# 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!/
|
Merged revisions 67952-67953,67955,67957-67958,67960-67961,67963,67965,67967,67970-67971,67973,67982,67988,67990,67995,68014,68016,68030,68057,68061,68112,68115-68118,68120-68121,68123-68128 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67952 | georg.brandl | 2008-12-27 18:42:40 +0100 (Sat, 27 Dec 2008) | 2 lines
#4752: actually use custom handler in example.
........
r67953 | georg.brandl | 2008-12-27 19:20:04 +0100 (Sat, 27 Dec 2008) | 3 lines
Patch #4739 by David Laban: add symbols to pydoc help topics,
so that ``help('@')`` works as expected.
........
r67955 | georg.brandl | 2008-12-27 19:27:53 +0100 (Sat, 27 Dec 2008) | 3 lines
Follow-up to r67746 in order to restore backwards-compatibility for
those who (monkey-)patch TextWrapper.wordsep_re with a custom RE.
........
r67957 | georg.brandl | 2008-12-27 19:49:19 +0100 (Sat, 27 Dec 2008) | 2 lines
#4754: improve winsound documentation.
........
r67958 | georg.brandl | 2008-12-27 20:02:59 +0100 (Sat, 27 Dec 2008) | 2 lines
#4682: 'b' is actually unsigned char.
........
r67960 | georg.brandl | 2008-12-27 20:04:44 +0100 (Sat, 27 Dec 2008) | 2 lines
#4695: fix backslashery.
........
r67961 | georg.brandl | 2008-12-27 20:06:04 +0100 (Sat, 27 Dec 2008) | 2 lines
Use :samp: role.
........
r67963 | georg.brandl | 2008-12-27 20:11:15 +0100 (Sat, 27 Dec 2008) | 2 lines
#4671: document that pydoc imports modules.
........
r67965 | antoine.pitrou | 2008-12-27 21:34:52 +0100 (Sat, 27 Dec 2008) | 3 lines
Issue #4677: add two list comprehension tests to pybench.
........
r67967 | benjamin.peterson | 2008-12-27 23:18:58 +0100 (Sat, 27 Dec 2008) | 1 line
fix markup
........
r67970 | alexandre.vassalotti | 2008-12-28 02:52:58 +0100 (Sun, 28 Dec 2008) | 2 lines
Fix name mangling of PyUnicode_ClearFreeList.
........
r67971 | alexandre.vassalotti | 2008-12-28 03:10:35 +0100 (Sun, 28 Dec 2008) | 2 lines
Sort UCS-2/UCS-4 name mangling list.
........
r67973 | alexandre.vassalotti | 2008-12-28 03:58:22 +0100 (Sun, 28 Dec 2008) | 2 lines
Document Py_VaBuildValue.
........
r67982 | benjamin.peterson | 2008-12-28 16:37:31 +0100 (Sun, 28 Dec 2008) | 1 line
fix WORD_BIGEDIAN declaration in Universal builds; fixes #4060 and #4728
........
r67988 | ronald.oussoren | 2008-12-28 20:40:56 +0100 (Sun, 28 Dec 2008) | 1 line
Issue4064: architecture string for universal builds on OSX
........
r67990 | ronald.oussoren | 2008-12-28 20:50:40 +0100 (Sun, 28 Dec 2008) | 3 lines
Update the fix for issue4064 to deal correctly with all three variants of
universal builds that are presented by the configure script.
........
r67995 | benjamin.peterson | 2008-12-28 22:16:07 +0100 (Sun, 28 Dec 2008) | 1 line
#4763 PyErr_ExceptionMatches won't blow up with NULL arguments
........
r68014 | benjamin.peterson | 2008-12-29 18:47:42 +0100 (Mon, 29 Dec 2008) | 1 line
#4764 set IOError.filename when trying to open a directory on POSIX platforms
........
r68016 | benjamin.peterson | 2008-12-29 18:56:58 +0100 (Mon, 29 Dec 2008) | 1 line
#4764 in io.open, set IOError.filename when trying to open a directory on POSIX platforms
........
r68030 | benjamin.peterson | 2008-12-29 22:38:14 +0100 (Mon, 29 Dec 2008) | 1 line
fix French
........
r68057 | vinay.sajip | 2008-12-30 08:01:25 +0100 (Tue, 30 Dec 2008) | 1 line
Minor documentation change relating to NullHandler.
........
r68061 | georg.brandl | 2008-12-30 11:15:49 +0100 (Tue, 30 Dec 2008) | 2 lines
#4778: attributes can't be called.
........
r68112 | benjamin.peterson | 2009-01-01 00:48:39 +0100 (Thu, 01 Jan 2009) | 1 line
#4795 inspect.isgeneratorfunction() should return False instead of None
........
r68115 | benjamin.peterson | 2009-01-01 05:04:41 +0100 (Thu, 01 Jan 2009) | 1 line
simplfy code
........
r68116 | georg.brandl | 2009-01-01 12:46:51 +0100 (Thu, 01 Jan 2009) | 2 lines
#4100: note that element children are not necessarily present on "start" events.
........
r68117 | georg.brandl | 2009-01-01 12:53:55 +0100 (Thu, 01 Jan 2009) | 2 lines
#4156: make clear that "protocol" is to be replaced with the protocol name.
........
r68118 | georg.brandl | 2009-01-01 13:00:19 +0100 (Thu, 01 Jan 2009) | 2 lines
#4185: clarify escape behavior of replacement strings.
........
r68120 | georg.brandl | 2009-01-01 13:15:31 +0100 (Thu, 01 Jan 2009) | 4 lines
#4228: Pack negative values the same way as 2.4
in struct's L format.
........
r68121 | georg.brandl | 2009-01-01 13:43:33 +0100 (Thu, 01 Jan 2009) | 2 lines
Point to types module in new module deprecation notice.
........
r68123 | georg.brandl | 2009-01-01 13:52:29 +0100 (Thu, 01 Jan 2009) | 2 lines
#4784: ... on three counts ...
........
r68124 | georg.brandl | 2009-01-01 13:53:19 +0100 (Thu, 01 Jan 2009) | 2 lines
#4782: Fix markup error that hid load() and loads().
........
r68125 | georg.brandl | 2009-01-01 14:02:09 +0100 (Thu, 01 Jan 2009) | 2 lines
#4776: add data_files and package_dir arguments.
........
r68126 | georg.brandl | 2009-01-01 14:05:13 +0100 (Thu, 01 Jan 2009) | 2 lines
Handlers are in the `logging.handlers` module.
........
r68127 | georg.brandl | 2009-01-01 14:14:49 +0100 (Thu, 01 Jan 2009) | 2 lines
#4767: Use correct submodules for all MIME classes.
........
r68128 | antoine.pitrou | 2009-01-01 15:11:22 +0100 (Thu, 01 Jan 2009) | 3 lines
Issue #3680: Reference cycles created through a dict, set or deque iterator did not get collected.
........
2009-01-01 11:46:10 -04:00
|
|
|
wordsep_simple_re = re.compile(r'(\s+)')
|
2008-05-11 07:42:28 -03:00
|
|
|
|
2004-06-02 22:59:41 -03:00
|
|
|
# XXX this is not locale- or charset-aware -- string.lowercase
|
|
|
|
# is US-ASCII only (and therefore English-only)
|
2002-06-07 19:04:15 -03:00
|
|
|
sentence_end_re = re.compile(r'[%s]' # lowercase letter
|
|
|
|
r'[\.\!\?]' # sentence-ending punct.
|
|
|
|
r'[\"\']?' # optional end-of-quote
|
2008-04-25 13:59:09 -03:00
|
|
|
r'\Z' # end of chunk
|
2002-06-07 19:04:15 -03:00
|
|
|
% string.lowercase)
|
2002-06-07 18:56:16 -03:00
|
|
|
|
2002-06-07 18:43:37 -03:00
|
|
|
|
2004-05-12 22:53:10 -03:00
|
|
|
def __init__(self,
|
|
|
|
width=70,
|
|
|
|
initial_indent="",
|
|
|
|
subsequent_indent="",
|
|
|
|
expand_tabs=True,
|
|
|
|
replace_whitespace=True,
|
|
|
|
fix_sentence_endings=False,
|
2007-03-13 15:15:41 -03:00
|
|
|
break_long_words=True,
|
2008-05-11 07:42:28 -03:00
|
|
|
drop_whitespace=True,
|
|
|
|
break_on_hyphens=True):
|
2002-06-10 17:26:02 -03:00
|
|
|
self.width = width
|
2002-06-10 18:37:12 -03:00
|
|
|
self.initial_indent = initial_indent
|
|
|
|
self.subsequent_indent = subsequent_indent
|
2002-06-08 21:22:07 -03:00
|
|
|
self.expand_tabs = expand_tabs
|
|
|
|
self.replace_whitespace = replace_whitespace
|
|
|
|
self.fix_sentence_endings = fix_sentence_endings
|
|
|
|
self.break_long_words = break_long_words
|
2007-03-13 15:15:41 -03:00
|
|
|
self.drop_whitespace = drop_whitespace
|
2008-05-11 07:42:28 -03:00
|
|
|
self.break_on_hyphens = break_on_hyphens
|
2002-07-16 18:35:23 -03:00
|
|
|
|
Merged revisions 67952-67953,67955,67957-67958,67960-67961,67963,67965,67967,67970-67971,67973,67982,67988,67990,67995,68014,68016,68030,68057,68061,68112,68115-68118,68120-68121,68123-68128 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67952 | georg.brandl | 2008-12-27 18:42:40 +0100 (Sat, 27 Dec 2008) | 2 lines
#4752: actually use custom handler in example.
........
r67953 | georg.brandl | 2008-12-27 19:20:04 +0100 (Sat, 27 Dec 2008) | 3 lines
Patch #4739 by David Laban: add symbols to pydoc help topics,
so that ``help('@')`` works as expected.
........
r67955 | georg.brandl | 2008-12-27 19:27:53 +0100 (Sat, 27 Dec 2008) | 3 lines
Follow-up to r67746 in order to restore backwards-compatibility for
those who (monkey-)patch TextWrapper.wordsep_re with a custom RE.
........
r67957 | georg.brandl | 2008-12-27 19:49:19 +0100 (Sat, 27 Dec 2008) | 2 lines
#4754: improve winsound documentation.
........
r67958 | georg.brandl | 2008-12-27 20:02:59 +0100 (Sat, 27 Dec 2008) | 2 lines
#4682: 'b' is actually unsigned char.
........
r67960 | georg.brandl | 2008-12-27 20:04:44 +0100 (Sat, 27 Dec 2008) | 2 lines
#4695: fix backslashery.
........
r67961 | georg.brandl | 2008-12-27 20:06:04 +0100 (Sat, 27 Dec 2008) | 2 lines
Use :samp: role.
........
r67963 | georg.brandl | 2008-12-27 20:11:15 +0100 (Sat, 27 Dec 2008) | 2 lines
#4671: document that pydoc imports modules.
........
r67965 | antoine.pitrou | 2008-12-27 21:34:52 +0100 (Sat, 27 Dec 2008) | 3 lines
Issue #4677: add two list comprehension tests to pybench.
........
r67967 | benjamin.peterson | 2008-12-27 23:18:58 +0100 (Sat, 27 Dec 2008) | 1 line
fix markup
........
r67970 | alexandre.vassalotti | 2008-12-28 02:52:58 +0100 (Sun, 28 Dec 2008) | 2 lines
Fix name mangling of PyUnicode_ClearFreeList.
........
r67971 | alexandre.vassalotti | 2008-12-28 03:10:35 +0100 (Sun, 28 Dec 2008) | 2 lines
Sort UCS-2/UCS-4 name mangling list.
........
r67973 | alexandre.vassalotti | 2008-12-28 03:58:22 +0100 (Sun, 28 Dec 2008) | 2 lines
Document Py_VaBuildValue.
........
r67982 | benjamin.peterson | 2008-12-28 16:37:31 +0100 (Sun, 28 Dec 2008) | 1 line
fix WORD_BIGEDIAN declaration in Universal builds; fixes #4060 and #4728
........
r67988 | ronald.oussoren | 2008-12-28 20:40:56 +0100 (Sun, 28 Dec 2008) | 1 line
Issue4064: architecture string for universal builds on OSX
........
r67990 | ronald.oussoren | 2008-12-28 20:50:40 +0100 (Sun, 28 Dec 2008) | 3 lines
Update the fix for issue4064 to deal correctly with all three variants of
universal builds that are presented by the configure script.
........
r67995 | benjamin.peterson | 2008-12-28 22:16:07 +0100 (Sun, 28 Dec 2008) | 1 line
#4763 PyErr_ExceptionMatches won't blow up with NULL arguments
........
r68014 | benjamin.peterson | 2008-12-29 18:47:42 +0100 (Mon, 29 Dec 2008) | 1 line
#4764 set IOError.filename when trying to open a directory on POSIX platforms
........
r68016 | benjamin.peterson | 2008-12-29 18:56:58 +0100 (Mon, 29 Dec 2008) | 1 line
#4764 in io.open, set IOError.filename when trying to open a directory on POSIX platforms
........
r68030 | benjamin.peterson | 2008-12-29 22:38:14 +0100 (Mon, 29 Dec 2008) | 1 line
fix French
........
r68057 | vinay.sajip | 2008-12-30 08:01:25 +0100 (Tue, 30 Dec 2008) | 1 line
Minor documentation change relating to NullHandler.
........
r68061 | georg.brandl | 2008-12-30 11:15:49 +0100 (Tue, 30 Dec 2008) | 2 lines
#4778: attributes can't be called.
........
r68112 | benjamin.peterson | 2009-01-01 00:48:39 +0100 (Thu, 01 Jan 2009) | 1 line
#4795 inspect.isgeneratorfunction() should return False instead of None
........
r68115 | benjamin.peterson | 2009-01-01 05:04:41 +0100 (Thu, 01 Jan 2009) | 1 line
simplfy code
........
r68116 | georg.brandl | 2009-01-01 12:46:51 +0100 (Thu, 01 Jan 2009) | 2 lines
#4100: note that element children are not necessarily present on "start" events.
........
r68117 | georg.brandl | 2009-01-01 12:53:55 +0100 (Thu, 01 Jan 2009) | 2 lines
#4156: make clear that "protocol" is to be replaced with the protocol name.
........
r68118 | georg.brandl | 2009-01-01 13:00:19 +0100 (Thu, 01 Jan 2009) | 2 lines
#4185: clarify escape behavior of replacement strings.
........
r68120 | georg.brandl | 2009-01-01 13:15:31 +0100 (Thu, 01 Jan 2009) | 4 lines
#4228: Pack negative values the same way as 2.4
in struct's L format.
........
r68121 | georg.brandl | 2009-01-01 13:43:33 +0100 (Thu, 01 Jan 2009) | 2 lines
Point to types module in new module deprecation notice.
........
r68123 | georg.brandl | 2009-01-01 13:52:29 +0100 (Thu, 01 Jan 2009) | 2 lines
#4784: ... on three counts ...
........
r68124 | georg.brandl | 2009-01-01 13:53:19 +0100 (Thu, 01 Jan 2009) | 2 lines
#4782: Fix markup error that hid load() and loads().
........
r68125 | georg.brandl | 2009-01-01 14:02:09 +0100 (Thu, 01 Jan 2009) | 2 lines
#4776: add data_files and package_dir arguments.
........
r68126 | georg.brandl | 2009-01-01 14:05:13 +0100 (Thu, 01 Jan 2009) | 2 lines
Handlers are in the `logging.handlers` module.
........
r68127 | georg.brandl | 2009-01-01 14:14:49 +0100 (Thu, 01 Jan 2009) | 2 lines
#4767: Use correct submodules for all MIME classes.
........
r68128 | antoine.pitrou | 2009-01-01 15:11:22 +0100 (Thu, 01 Jan 2009) | 3 lines
Issue #3680: Reference cycles created through a dict, set or deque iterator did not get collected.
........
2009-01-01 11:46:10 -04:00
|
|
|
# recompile the regexes for Unicode mode -- done in this clumsy way for
|
|
|
|
# backwards compatibility because it's rather common to monkey-patch
|
|
|
|
# the TextWrapper class' wordsep_re attribute.
|
|
|
|
self.wordsep_re_uni = re.compile(self.wordsep_re.pattern, re.U)
|
|
|
|
self.wordsep_simple_re_uni = re.compile(
|
|
|
|
self.wordsep_simple_re.pattern, re.U)
|
|
|
|
|
2002-06-07 18:43:37 -03:00
|
|
|
|
|
|
|
# -- Private methods -----------------------------------------------
|
|
|
|
# (possibly useful for subclasses to override)
|
|
|
|
|
2002-06-07 19:32:15 -03:00
|
|
|
def _munge_whitespace(self, text):
|
2002-06-07 18:43:37 -03:00
|
|
|
"""_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:
|
2002-12-09 12:23:08 -04:00
|
|
|
if isinstance(text, str):
|
|
|
|
text = text.translate(self.whitespace_trans)
|
|
|
|
elif isinstance(text, unicode):
|
|
|
|
text = text.translate(self.unicode_whitespace_trans)
|
2002-06-07 18:43:37 -03:00
|
|
|
return text
|
|
|
|
|
|
|
|
|
2002-06-07 19:32:15 -03:00
|
|
|
def _split(self, text):
|
2002-06-07 18:43:37 -03:00
|
|
|
"""_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!'
|
2008-05-11 07:42:28 -03:00
|
|
|
if break_on_hyphens is True, or in:
|
|
|
|
'Look,', ' ', 'goof-ball', ' ', '--', ' ',
|
|
|
|
'use', ' ', 'the', ' ', '-b', ' ', option!'
|
|
|
|
otherwise.
|
2002-06-07 18:43:37 -03:00
|
|
|
"""
|
Merged revisions 67952-67953,67955,67957-67958,67960-67961,67963,67965,67967,67970-67971,67973,67982,67988,67990,67995,68014,68016,68030,68057,68061,68112,68115-68118,68120-68121,68123-68128 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67952 | georg.brandl | 2008-12-27 18:42:40 +0100 (Sat, 27 Dec 2008) | 2 lines
#4752: actually use custom handler in example.
........
r67953 | georg.brandl | 2008-12-27 19:20:04 +0100 (Sat, 27 Dec 2008) | 3 lines
Patch #4739 by David Laban: add symbols to pydoc help topics,
so that ``help('@')`` works as expected.
........
r67955 | georg.brandl | 2008-12-27 19:27:53 +0100 (Sat, 27 Dec 2008) | 3 lines
Follow-up to r67746 in order to restore backwards-compatibility for
those who (monkey-)patch TextWrapper.wordsep_re with a custom RE.
........
r67957 | georg.brandl | 2008-12-27 19:49:19 +0100 (Sat, 27 Dec 2008) | 2 lines
#4754: improve winsound documentation.
........
r67958 | georg.brandl | 2008-12-27 20:02:59 +0100 (Sat, 27 Dec 2008) | 2 lines
#4682: 'b' is actually unsigned char.
........
r67960 | georg.brandl | 2008-12-27 20:04:44 +0100 (Sat, 27 Dec 2008) | 2 lines
#4695: fix backslashery.
........
r67961 | georg.brandl | 2008-12-27 20:06:04 +0100 (Sat, 27 Dec 2008) | 2 lines
Use :samp: role.
........
r67963 | georg.brandl | 2008-12-27 20:11:15 +0100 (Sat, 27 Dec 2008) | 2 lines
#4671: document that pydoc imports modules.
........
r67965 | antoine.pitrou | 2008-12-27 21:34:52 +0100 (Sat, 27 Dec 2008) | 3 lines
Issue #4677: add two list comprehension tests to pybench.
........
r67967 | benjamin.peterson | 2008-12-27 23:18:58 +0100 (Sat, 27 Dec 2008) | 1 line
fix markup
........
r67970 | alexandre.vassalotti | 2008-12-28 02:52:58 +0100 (Sun, 28 Dec 2008) | 2 lines
Fix name mangling of PyUnicode_ClearFreeList.
........
r67971 | alexandre.vassalotti | 2008-12-28 03:10:35 +0100 (Sun, 28 Dec 2008) | 2 lines
Sort UCS-2/UCS-4 name mangling list.
........
r67973 | alexandre.vassalotti | 2008-12-28 03:58:22 +0100 (Sun, 28 Dec 2008) | 2 lines
Document Py_VaBuildValue.
........
r67982 | benjamin.peterson | 2008-12-28 16:37:31 +0100 (Sun, 28 Dec 2008) | 1 line
fix WORD_BIGEDIAN declaration in Universal builds; fixes #4060 and #4728
........
r67988 | ronald.oussoren | 2008-12-28 20:40:56 +0100 (Sun, 28 Dec 2008) | 1 line
Issue4064: architecture string for universal builds on OSX
........
r67990 | ronald.oussoren | 2008-12-28 20:50:40 +0100 (Sun, 28 Dec 2008) | 3 lines
Update the fix for issue4064 to deal correctly with all three variants of
universal builds that are presented by the configure script.
........
r67995 | benjamin.peterson | 2008-12-28 22:16:07 +0100 (Sun, 28 Dec 2008) | 1 line
#4763 PyErr_ExceptionMatches won't blow up with NULL arguments
........
r68014 | benjamin.peterson | 2008-12-29 18:47:42 +0100 (Mon, 29 Dec 2008) | 1 line
#4764 set IOError.filename when trying to open a directory on POSIX platforms
........
r68016 | benjamin.peterson | 2008-12-29 18:56:58 +0100 (Mon, 29 Dec 2008) | 1 line
#4764 in io.open, set IOError.filename when trying to open a directory on POSIX platforms
........
r68030 | benjamin.peterson | 2008-12-29 22:38:14 +0100 (Mon, 29 Dec 2008) | 1 line
fix French
........
r68057 | vinay.sajip | 2008-12-30 08:01:25 +0100 (Tue, 30 Dec 2008) | 1 line
Minor documentation change relating to NullHandler.
........
r68061 | georg.brandl | 2008-12-30 11:15:49 +0100 (Tue, 30 Dec 2008) | 2 lines
#4778: attributes can't be called.
........
r68112 | benjamin.peterson | 2009-01-01 00:48:39 +0100 (Thu, 01 Jan 2009) | 1 line
#4795 inspect.isgeneratorfunction() should return False instead of None
........
r68115 | benjamin.peterson | 2009-01-01 05:04:41 +0100 (Thu, 01 Jan 2009) | 1 line
simplfy code
........
r68116 | georg.brandl | 2009-01-01 12:46:51 +0100 (Thu, 01 Jan 2009) | 2 lines
#4100: note that element children are not necessarily present on "start" events.
........
r68117 | georg.brandl | 2009-01-01 12:53:55 +0100 (Thu, 01 Jan 2009) | 2 lines
#4156: make clear that "protocol" is to be replaced with the protocol name.
........
r68118 | georg.brandl | 2009-01-01 13:00:19 +0100 (Thu, 01 Jan 2009) | 2 lines
#4185: clarify escape behavior of replacement strings.
........
r68120 | georg.brandl | 2009-01-01 13:15:31 +0100 (Thu, 01 Jan 2009) | 4 lines
#4228: Pack negative values the same way as 2.4
in struct's L format.
........
r68121 | georg.brandl | 2009-01-01 13:43:33 +0100 (Thu, 01 Jan 2009) | 2 lines
Point to types module in new module deprecation notice.
........
r68123 | georg.brandl | 2009-01-01 13:52:29 +0100 (Thu, 01 Jan 2009) | 2 lines
#4784: ... on three counts ...
........
r68124 | georg.brandl | 2009-01-01 13:53:19 +0100 (Thu, 01 Jan 2009) | 2 lines
#4782: Fix markup error that hid load() and loads().
........
r68125 | georg.brandl | 2009-01-01 14:02:09 +0100 (Thu, 01 Jan 2009) | 2 lines
#4776: add data_files and package_dir arguments.
........
r68126 | georg.brandl | 2009-01-01 14:05:13 +0100 (Thu, 01 Jan 2009) | 2 lines
Handlers are in the `logging.handlers` module.
........
r68127 | georg.brandl | 2009-01-01 14:14:49 +0100 (Thu, 01 Jan 2009) | 2 lines
#4767: Use correct submodules for all MIME classes.
........
r68128 | antoine.pitrou | 2009-01-01 15:11:22 +0100 (Thu, 01 Jan 2009) | 3 lines
Issue #3680: Reference cycles created through a dict, set or deque iterator did not get collected.
........
2009-01-01 11:46:10 -04:00
|
|
|
if isinstance(text, unicode):
|
|
|
|
if self.break_on_hyphens:
|
|
|
|
pat = self.wordsep_re_uni
|
|
|
|
else:
|
|
|
|
pat = self.wordsep_simple_re_uni
|
2008-05-11 07:42:28 -03:00
|
|
|
else:
|
Merged revisions 67952-67953,67955,67957-67958,67960-67961,67963,67965,67967,67970-67971,67973,67982,67988,67990,67995,68014,68016,68030,68057,68061,68112,68115-68118,68120-68121,68123-68128 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67952 | georg.brandl | 2008-12-27 18:42:40 +0100 (Sat, 27 Dec 2008) | 2 lines
#4752: actually use custom handler in example.
........
r67953 | georg.brandl | 2008-12-27 19:20:04 +0100 (Sat, 27 Dec 2008) | 3 lines
Patch #4739 by David Laban: add symbols to pydoc help topics,
so that ``help('@')`` works as expected.
........
r67955 | georg.brandl | 2008-12-27 19:27:53 +0100 (Sat, 27 Dec 2008) | 3 lines
Follow-up to r67746 in order to restore backwards-compatibility for
those who (monkey-)patch TextWrapper.wordsep_re with a custom RE.
........
r67957 | georg.brandl | 2008-12-27 19:49:19 +0100 (Sat, 27 Dec 2008) | 2 lines
#4754: improve winsound documentation.
........
r67958 | georg.brandl | 2008-12-27 20:02:59 +0100 (Sat, 27 Dec 2008) | 2 lines
#4682: 'b' is actually unsigned char.
........
r67960 | georg.brandl | 2008-12-27 20:04:44 +0100 (Sat, 27 Dec 2008) | 2 lines
#4695: fix backslashery.
........
r67961 | georg.brandl | 2008-12-27 20:06:04 +0100 (Sat, 27 Dec 2008) | 2 lines
Use :samp: role.
........
r67963 | georg.brandl | 2008-12-27 20:11:15 +0100 (Sat, 27 Dec 2008) | 2 lines
#4671: document that pydoc imports modules.
........
r67965 | antoine.pitrou | 2008-12-27 21:34:52 +0100 (Sat, 27 Dec 2008) | 3 lines
Issue #4677: add two list comprehension tests to pybench.
........
r67967 | benjamin.peterson | 2008-12-27 23:18:58 +0100 (Sat, 27 Dec 2008) | 1 line
fix markup
........
r67970 | alexandre.vassalotti | 2008-12-28 02:52:58 +0100 (Sun, 28 Dec 2008) | 2 lines
Fix name mangling of PyUnicode_ClearFreeList.
........
r67971 | alexandre.vassalotti | 2008-12-28 03:10:35 +0100 (Sun, 28 Dec 2008) | 2 lines
Sort UCS-2/UCS-4 name mangling list.
........
r67973 | alexandre.vassalotti | 2008-12-28 03:58:22 +0100 (Sun, 28 Dec 2008) | 2 lines
Document Py_VaBuildValue.
........
r67982 | benjamin.peterson | 2008-12-28 16:37:31 +0100 (Sun, 28 Dec 2008) | 1 line
fix WORD_BIGEDIAN declaration in Universal builds; fixes #4060 and #4728
........
r67988 | ronald.oussoren | 2008-12-28 20:40:56 +0100 (Sun, 28 Dec 2008) | 1 line
Issue4064: architecture string for universal builds on OSX
........
r67990 | ronald.oussoren | 2008-12-28 20:50:40 +0100 (Sun, 28 Dec 2008) | 3 lines
Update the fix for issue4064 to deal correctly with all three variants of
universal builds that are presented by the configure script.
........
r67995 | benjamin.peterson | 2008-12-28 22:16:07 +0100 (Sun, 28 Dec 2008) | 1 line
#4763 PyErr_ExceptionMatches won't blow up with NULL arguments
........
r68014 | benjamin.peterson | 2008-12-29 18:47:42 +0100 (Mon, 29 Dec 2008) | 1 line
#4764 set IOError.filename when trying to open a directory on POSIX platforms
........
r68016 | benjamin.peterson | 2008-12-29 18:56:58 +0100 (Mon, 29 Dec 2008) | 1 line
#4764 in io.open, set IOError.filename when trying to open a directory on POSIX platforms
........
r68030 | benjamin.peterson | 2008-12-29 22:38:14 +0100 (Mon, 29 Dec 2008) | 1 line
fix French
........
r68057 | vinay.sajip | 2008-12-30 08:01:25 +0100 (Tue, 30 Dec 2008) | 1 line
Minor documentation change relating to NullHandler.
........
r68061 | georg.brandl | 2008-12-30 11:15:49 +0100 (Tue, 30 Dec 2008) | 2 lines
#4778: attributes can't be called.
........
r68112 | benjamin.peterson | 2009-01-01 00:48:39 +0100 (Thu, 01 Jan 2009) | 1 line
#4795 inspect.isgeneratorfunction() should return False instead of None
........
r68115 | benjamin.peterson | 2009-01-01 05:04:41 +0100 (Thu, 01 Jan 2009) | 1 line
simplfy code
........
r68116 | georg.brandl | 2009-01-01 12:46:51 +0100 (Thu, 01 Jan 2009) | 2 lines
#4100: note that element children are not necessarily present on "start" events.
........
r68117 | georg.brandl | 2009-01-01 12:53:55 +0100 (Thu, 01 Jan 2009) | 2 lines
#4156: make clear that "protocol" is to be replaced with the protocol name.
........
r68118 | georg.brandl | 2009-01-01 13:00:19 +0100 (Thu, 01 Jan 2009) | 2 lines
#4185: clarify escape behavior of replacement strings.
........
r68120 | georg.brandl | 2009-01-01 13:15:31 +0100 (Thu, 01 Jan 2009) | 4 lines
#4228: Pack negative values the same way as 2.4
in struct's L format.
........
r68121 | georg.brandl | 2009-01-01 13:43:33 +0100 (Thu, 01 Jan 2009) | 2 lines
Point to types module in new module deprecation notice.
........
r68123 | georg.brandl | 2009-01-01 13:52:29 +0100 (Thu, 01 Jan 2009) | 2 lines
#4784: ... on three counts ...
........
r68124 | georg.brandl | 2009-01-01 13:53:19 +0100 (Thu, 01 Jan 2009) | 2 lines
#4782: Fix markup error that hid load() and loads().
........
r68125 | georg.brandl | 2009-01-01 14:02:09 +0100 (Thu, 01 Jan 2009) | 2 lines
#4776: add data_files and package_dir arguments.
........
r68126 | georg.brandl | 2009-01-01 14:05:13 +0100 (Thu, 01 Jan 2009) | 2 lines
Handlers are in the `logging.handlers` module.
........
r68127 | georg.brandl | 2009-01-01 14:14:49 +0100 (Thu, 01 Jan 2009) | 2 lines
#4767: Use correct submodules for all MIME classes.
........
r68128 | antoine.pitrou | 2009-01-01 15:11:22 +0100 (Thu, 01 Jan 2009) | 3 lines
Issue #3680: Reference cycles created through a dict, set or deque iterator did not get collected.
........
2009-01-01 11:46:10 -04:00
|
|
|
if self.break_on_hyphens:
|
|
|
|
pat = self.wordsep_re
|
|
|
|
else:
|
|
|
|
pat = self.wordsep_simple_re
|
|
|
|
chunks = pat.split(text)
|
2007-03-13 15:15:41 -03:00
|
|
|
chunks = filter(None, chunks) # remove empty chunks
|
2002-06-07 18:43:37 -03:00
|
|
|
return chunks
|
|
|
|
|
2002-06-07 19:32:15 -03:00
|
|
|
def _fix_sentence_endings(self, chunks):
|
2002-06-07 18:43:37 -03:00
|
|
|
"""_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
|
2002-06-07 19:04:15 -03:00
|
|
|
pat = self.sentence_end_re
|
2002-06-07 18:43:37 -03:00
|
|
|
while i < len(chunks)-1:
|
2002-06-07 19:04:15 -03:00
|
|
|
if chunks[i+1] == " " and pat.search(chunks[i]):
|
2002-06-07 18:43:37 -03:00
|
|
|
chunks[i+1] = " "
|
|
|
|
i += 2
|
|
|
|
else:
|
|
|
|
i += 1
|
|
|
|
|
2005-07-15 03:53:35 -03:00
|
|
|
def _handle_long_word(self, reversed_chunks, cur_line, cur_len, width):
|
2002-06-07 18:43:37 -03:00
|
|
|
"""_handle_long_word(chunks : [string],
|
|
|
|
cur_line : [string],
|
2002-06-10 18:37:12 -03:00
|
|
|
cur_len : int, width : int)
|
2002-06-07 18:43:37 -03:00
|
|
|
|
|
|
|
Handle a chunk of text (most likely a word, not whitespace) that
|
|
|
|
is too long to fit in any line.
|
|
|
|
"""
|
2008-01-19 15:48:19 -04:00
|
|
|
# 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
|
2002-06-07 18:43:37 -03:00
|
|
|
|
|
|
|
# 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:
|
2005-07-15 03:53:35 -03:00
|
|
|
cur_line.append(reversed_chunks[-1][:space_left])
|
|
|
|
reversed_chunks[-1] = reversed_chunks[-1][space_left:]
|
2002-06-07 18:43:37 -03:00
|
|
|
|
|
|
|
# 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:
|
2005-07-15 03:53:35 -03:00
|
|
|
cur_line.append(reversed_chunks.pop())
|
2002-06-07 18:43:37 -03:00
|
|
|
|
|
|
|
# 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.
|
|
|
|
|
2002-06-10 17:26:02 -03:00
|
|
|
def _wrap_chunks(self, chunks):
|
|
|
|
"""_wrap_chunks(chunks : [string]) -> [string]
|
2002-06-07 18:43:37 -03:00
|
|
|
|
|
|
|
Wrap a sequence of text chunks and return a list of lines of
|
2002-06-10 17:26:02 -03:00
|
|
|
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.
|
2002-06-07 18:43:37 -03:00
|
|
|
"""
|
|
|
|
lines = []
|
2003-05-06 21:55:35 -03:00
|
|
|
if self.width <= 0:
|
|
|
|
raise ValueError("invalid width %r (must be > 0)" % self.width)
|
2002-06-07 18:43:37 -03:00
|
|
|
|
2005-07-15 03:53:35 -03:00
|
|
|
# Arrange in reverse order so items can be efficiently popped
|
|
|
|
# from a stack of chucks.
|
|
|
|
chunks.reverse()
|
|
|
|
|
2002-06-07 18:43:37 -03:00
|
|
|
while chunks:
|
|
|
|
|
2002-06-10 18:37:12 -03:00
|
|
|
# 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)
|
2002-06-07 18:43:37 -03:00
|
|
|
|
2002-12-09 12:26:05 -04:00
|
|
|
# First chunk on line is whitespace -- drop it, unless this
|
|
|
|
# is the very beginning of the text (ie. no lines started yet).
|
2007-03-13 15:15:41 -03:00
|
|
|
if self.drop_whitespace and chunks[-1].strip() == '' and lines:
|
2005-07-15 03:53:35 -03:00
|
|
|
del chunks[-1]
|
2002-06-07 18:43:37 -03:00
|
|
|
|
|
|
|
while chunks:
|
2005-07-15 03:53:35 -03:00
|
|
|
l = len(chunks[-1])
|
2002-06-07 18:43:37 -03:00
|
|
|
|
|
|
|
# Can at least squeeze this chunk onto the current line.
|
|
|
|
if cur_len + l <= width:
|
2005-07-15 03:53:35 -03:00
|
|
|
cur_line.append(chunks.pop())
|
2002-06-07 18:43:37 -03:00
|
|
|
cur_len += l
|
|
|
|
|
|
|
|
# Nope, this line is full.
|
|
|
|
else:
|
|
|
|
break
|
|
|
|
|
|
|
|
# The current line is full, and the next chunk is too big to
|
2002-07-16 18:35:23 -03:00
|
|
|
# fit on *any* line (not just this one).
|
2005-07-15 03:53:35 -03:00
|
|
|
if chunks and len(chunks[-1]) > width:
|
2002-06-10 18:37:12 -03:00
|
|
|
self._handle_long_word(chunks, cur_line, cur_len, width)
|
2002-06-07 18:43:37 -03:00
|
|
|
|
|
|
|
# If the last chunk on this line is all whitespace, drop it.
|
2007-03-13 15:15:41 -03:00
|
|
|
if self.drop_whitespace and cur_line and cur_line[-1].strip() == '':
|
2002-06-07 18:43:37 -03:00
|
|
|
del cur_line[-1]
|
|
|
|
|
|
|
|
# Convert current line back to a string and store it in list
|
|
|
|
# of all lines (return value).
|
|
|
|
if cur_line:
|
2002-06-10 18:37:12 -03:00
|
|
|
lines.append(indent + ''.join(cur_line))
|
2002-06-07 18:43:37 -03:00
|
|
|
|
|
|
|
return lines
|
|
|
|
|
|
|
|
|
|
|
|
# -- Public interface ----------------------------------------------
|
|
|
|
|
2002-06-10 17:26:02 -03:00
|
|
|
def wrap(self, text):
|
|
|
|
"""wrap(text : string) -> [string]
|
2002-06-07 18:43:37 -03:00
|
|
|
|
2002-07-04 11:51:49 -03:00
|
|
|
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.
|
2002-06-07 18:43:37 -03:00
|
|
|
"""
|
|
|
|
text = self._munge_whitespace(text)
|
|
|
|
chunks = self._split(text)
|
2002-06-07 18:56:16 -03:00
|
|
|
if self.fix_sentence_endings:
|
|
|
|
self._fix_sentence_endings(chunks)
|
2002-06-10 17:26:02 -03:00
|
|
|
return self._wrap_chunks(chunks)
|
2002-06-07 18:43:37 -03:00
|
|
|
|
2002-06-10 18:37:12 -03:00
|
|
|
def fill(self, text):
|
|
|
|
"""fill(text : string) -> string
|
2002-06-07 18:43:37 -03:00
|
|
|
|
2002-07-04 11:51:49 -03:00
|
|
|
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.
|
2002-06-07 18:43:37 -03:00
|
|
|
"""
|
2002-06-10 18:37:12 -03:00
|
|
|
return "\n".join(self.wrap(text))
|
2002-06-07 18:43:37 -03:00
|
|
|
|
|
|
|
|
2002-07-04 11:51:49 -03:00
|
|
|
# -- Convenience interface ---------------------------------------------
|
2002-06-07 18:43:37 -03:00
|
|
|
|
2002-06-10 17:36:07 -03:00
|
|
|
def wrap(text, width=70, **kwargs):
|
2002-07-04 11:51:49 -03:00
|
|
|
"""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.
|
|
|
|
"""
|
2002-06-10 17:36:07 -03:00
|
|
|
w = TextWrapper(width=width, **kwargs)
|
|
|
|
return w.wrap(text)
|
2002-06-07 18:43:37 -03:00
|
|
|
|
2002-06-10 18:37:12 -03:00
|
|
|
def fill(text, width=70, **kwargs):
|
2002-07-04 11:51:49 -03:00
|
|
|
"""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.
|
|
|
|
"""
|
2002-06-10 17:36:07 -03:00
|
|
|
w = TextWrapper(width=width, **kwargs)
|
2002-06-10 18:37:12 -03:00
|
|
|
return w.fill(text)
|
2003-05-07 22:58:05 -03:00
|
|
|
|
|
|
|
|
|
|
|
# -- Loosely related functionality -------------------------------------
|
|
|
|
|
2006-06-10 21:40:49 -03:00
|
|
|
_whitespace_only_re = re.compile('^[ \t]+$', re.MULTILINE)
|
|
|
|
_leading_whitespace_re = re.compile('(^[ \t]*)(?:[^ \t\n])', re.MULTILINE)
|
2003-05-07 22:58:05 -03:00
|
|
|
|
2006-06-10 21:40:49 -03:00
|
|
|
def dedent(text):
|
|
|
|
"""Remove any common leading whitespace from every line in `text`.
|
2003-05-07 22:58:05 -03:00
|
|
|
|
2006-06-10 21:40:49 -03:00
|
|
|
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.
|
2003-05-07 22:58:05 -03:00
|
|
|
|
2006-06-10 21:40:49 -03:00
|
|
|
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.)
|
2003-05-07 22:58:05 -03:00
|
|
|
"""
|
2006-06-10 21:40:49 -03:00
|
|
|
# Look for the longest leading string of spaces and tabs common to
|
|
|
|
# all lines.
|
2003-05-07 22:58:05 -03:00
|
|
|
margin = None
|
2006-06-10 21:40:49 -03:00
|
|
|
text = _whitespace_only_re.sub('', text)
|
|
|
|
indents = _leading_whitespace_re.findall(text)
|
|
|
|
for indent in indents:
|
2003-05-07 22:58:05 -03:00
|
|
|
if margin is None:
|
|
|
|
margin = indent
|
|
|
|
|
2006-06-10 21:40:49 -03:00
|
|
|
# Current line more deeply indented than previous winner:
|
|
|
|
# no change (previous winner is still on top).
|
2006-06-11 16:42:51 -03:00
|
|
|
elif indent.startswith(margin):
|
|
|
|
pass
|
2006-06-10 21:40:49 -03:00
|
|
|
|
|
|
|
# Current line consistent with and no deeper than previous winner:
|
|
|
|
# it's the new winner.
|
2006-06-11 16:42:51 -03:00
|
|
|
elif margin.startswith(indent):
|
|
|
|
margin = indent
|
2003-05-07 22:58:05 -03:00
|
|
|
|
2006-06-10 21:40:49 -03:00
|
|
|
# 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.")
|