Georg Brandl
f3a0b86408
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 14:47:12 +00:00
Brett Cannon
791ec1fc13
Remove assignment to True/False to silence the SyntaxWarning that is triggered
...
by -3.
2008-08-01 01:34:05 +00:00
Georg Brandl
6f95ae55b1
#2659 : add ``break_on_hyphens`` to TextWrapper.
2008-05-11 10:42:28 +00:00
Mark Dickinson
fe536f53ea
Issue 2635: fix bug in the fix_sentence_endings option to textwrap.fill.
2008-04-25 16:59:09 +00:00
Georg Brandl
c6fde7293e
Fix #1146 : TextWrap vs words 1-character shorter than the width.
...
Patch by Quentin Gallet-Gilles.
2008-01-19 19:48:19 +00:00
Georg Brandl
9e6b47002a
Patch #1581073 : add a flag to textwrap that prevents the dropping of
...
whitespace while wrapping.
2007-03-13 18:15:41 +00:00
Tim Peters
4f96f1f2b5
Whitespace normalization.
2006-06-11 19:42:51 +00:00
Greg Ward
7f54740c4d
Bug #1361643 : fix textwrap.dedent() so it handles tabs appropriately,
...
i.e. do *not* expand tabs, but treat them as whitespace that is not
equivalent to spaces. Add a couple of test cases. Clarify docs.
2006-06-11 00:40:49 +00:00
Raymond Hettinger
8bfa8935ea
textwrap now processes text chucks at O(n) speed instead of O(n**2).
...
Patch #1209527 (Contributed by Connelly).
2005-07-15 06:53:35 +00:00
Greg Ward
40407943b7
SF #1149508 : ensure textwrap handles hyphenated numbers correctly,
...
eg. "2004-03-04" is not broken across lines. (Merged from 2.4 branch.)
2005-03-05 02:53:17 +00:00
Raymond Hettinger
0c26ab02e6
Removed unused line.
2005-01-03 07:14:12 +00:00
Greg Ward
6186410db0
SF #965425 : fix so hyphenated words surrounded by punctuation are
...
wrapped correctly.
2004-06-03 01:59:41 +00:00
Greg Ward
f0ba764dbb
SF #847346 : merge from release23-maint branch: remove misguided
...
optimization for short input; beef up tests for fix_sentence_endings
feature.
2004-05-13 01:53:10 +00:00
Raymond Hettinger
c11dbcd4bf
SF bug 797650: Infinite loop in textwrap.py
...
When the indents were set to longer than the width and long word breaking
was enabled, an infinite loop would result because the inner loop did not
assure that at least one character was stripped off on every pass.
2003-08-30 14:43:55 +00:00
Greg Ward
523008c6cf
Update copyright dates.
...
Define True and False (if necessary) so this module can be copied as-is
to other projects (eg. Optik, Docutils) that don't depend on Python 2.3.
2003-06-15 15:37:18 +00:00
Greg Ward
52ae0a596f
Remove comment about Unicode: SF #622831 was fixed loooong ago!
2003-06-14 00:26:39 +00:00
Tim Peters
c2659cff5d
Whitespace normalization.
2003-05-12 20:19:37 +00:00
Greg Ward
86e1790cad
Clarify the dedent() example a bit by indenting the input lines unevenly.
2003-05-08 02:12:35 +00:00
Greg Ward
2557100b9e
Minor clarification of dedent().
2003-05-08 02:02:50 +00:00
Greg Ward
478cd48dee
SF patch #598163 (Ville Vainio, vvainio@users.sourceforge.net):
...
add dedent() function, to remove indentation from multiline strings
(eg. triple-quoted strings). Differs from inspect.getdoc() by not
special-casing the first line (often a sensible approach for
non-docstring multiline strings). This should make this function more
general (symmetric 'indent' also possible), and more fitting for the
textwrap module.
2003-05-08 01:58:05 +00:00
Greg Ward
a409f7c491
SF #596434 : tweak wordsep_re so the definition of an em-dash is
...
stricter: specifically, "--" must be preceded by a limited set of
characters, not by any non-whitespace character.
2003-05-07 01:20:58 +00:00
Greg Ward
21820cd925
SF #726446 : raise ValueError if width <= 0.
2003-05-07 00:55:35 +00:00
Andrew M. Kuchling
a2ecabe420
Fix docstring typo
2003-02-14 01:14:15 +00:00
Greg Ward
4c6c9c42fb
Add __all__ (suggested by Raymond Hettinger).
...
Rename 'whitespace' global to '_whitespace' -- it's not part of the
public interface.
2003-02-03 14:46:57 +00:00
Greg Ward
afd44de812
Hardcode the recognized whitespace characters to the US-ASCII whitespace
...
chars. See the comment for rationale.
2002-12-12 17:24:35 +00:00
Greg Ward
0e88c9f65d
Tweak generation of unicode_whitespace_trans -- clearer, more
...
efficient. Suggested by MAL.
2002-12-11 13:54:20 +00:00
Greg Ward
ab73d46e45
Fix SF bug #622849 : in _wrap_chunks(), ensure that leading whitespace in
...
the input string is always preserved.
2002-12-09 16:26:05 +00:00
Greg Ward
2e74541d7e
Fix SF bug #622831 (I think): add unicode_whitespace_trans class
...
attribute, and modify _munge_whitespace() to recognize Unicode strings
and use unicode_whitespace_trans to munge them. Still need to add a
test to make sure I've really fixed the bug.
2002-12-09 16:23:08 +00:00
Greg Ward
4c486bc0c0
Add comment about inability to handle Unicode strings (hopefully a
...
temporary condition).
2002-10-22 18:31:50 +00:00
Greg Ward
78cc051617
Fix copyright date: the core of this code actually dates back to 1999
...
(rev. 1.4 of distutils/fancy_getopt.py).
2002-10-13 19:23:18 +00:00
Guido van Rossum
eb287a2662
Fix an endcase bug: initial_indent was ignored when the text was short
...
enough to fit in one line.
2002-10-02 15:47:32 +00:00
Greg Ward
e3bd104aa7
Tweak wordsep_re again: this time to recognize an em-dash with
...
any non-whitespace characters adjacent, not just \w.
2002-08-22 21:28:00 +00:00
Greg Ward
cce4d67fc4
Fix SF bug #596434 : tweak wordsep_re so "--foo-bar" now splits
...
into /--foo-/bar/ rather than /--/foo-/bar/. Needed for Optik and
Docutils to handle Unix-style command-line options properly.
2002-08-22 21:04:21 +00:00
Tim Peters
c411dbaeee
Whitespace normalization.
2002-07-16 21:35:23 +00:00
Greg Ward
e807e571a1
Docstring improvements. In particular, added docstrings for the
...
standalone wrap() and fill() functions. This should address the
misunderstanding that led to SF bug 577106.
2002-07-04 14:51:49 +00:00
Greg Ward
62080bee14
Took initial_tab and subsequent_tab away from the fill() method and
...
transformed them into the initial_indent and subsequent_indent instance
attributes. Now they actually work as advertised, ie. they are
accounted for in the width of each output line. Plus you can use them
with wrap() as well as fill(), and fill() went from simple-and-broken to
trivial-and-working.
2002-06-10 21:37:12 +00:00
Greg Ward
cf02ac6154
Allow the standalone wrap() and fill() functions to take arbitrary
...
keyword args, which are passed directly to the TextWrapper constructor.
2002-06-10 20:36:07 +00:00
Greg Ward
d34c959140
Make 'width' an instance attribute rather than an argument to the wrap()
...
and fill() methods. Keep interface of existing wrap() and fill()
functions by going back to having them construct a new TextWrapper
instance on each call, with the preferred width passed to the
constructor.
2002-06-10 20:26:02 +00:00
Greg Ward
47df99d575
Make all of TextWrapper's options keyword args to the constructor.
2002-06-09 00:22:07 +00:00
Greg Ward
698d9f01c6
Record copyright and author.
2002-06-07 22:40:23 +00:00
Greg Ward
70c726aa44
Use True/False instead of 1/0.
2002-06-07 22:35:41 +00:00
Greg Ward
f404c7ee84
Remove islower() -- not used anymore.
2002-06-07 22:33:11 +00:00
Greg Ward
cb320eb938
Conform to the bloody coding standards: "def foo()" not "def foo ()".
...
Yuck.
2002-06-07 22:32:15 +00:00
Greg Ward
9b4864e40a
Convert _fix_sentence_endings() to use a regex, and augment it to
...
handle sentences like this:
And she said, "Go to hell!" Can you believe that?
2002-06-07 22:04:15 +00:00
Greg Ward
62e4f3bf22
Add fix_sentence_endings option to control whether we ensure that
...
sentences are separated by two spaces.
Improve _fix_sentence_endings() a bit -- look for ".!?" instead of just
".", and factor out the list of sentence-ending punctuation characters
to a class attribute.
2002-06-07 21:56:16 +00:00
Greg Ward
0093582489
Initial revision. Currently biased towards English in a fixed-width font,
...
according to the conventions that I (and Tim Peters) learned in school.
2002-06-07 21:43:37 +00:00