mirror of
https://github.com/python/cpython.git
synced 2025-08-01 15:43:13 +00:00

svn+ssh://pythondev@svn.python.org/python/trunk ................ r62425 | andrew.kuchling | 2008-04-21 03:45:57 +0200 (Mon, 21 Apr 2008) | 1 line Comment typo ................ r62426 | mark.dickinson | 2008-04-21 03:55:50 +0200 (Mon, 21 Apr 2008) | 2 lines Silence 'r may be used uninitialized' compiler warning. ................ r62427 | andrew.kuchling | 2008-04-21 04:08:00 +0200 (Mon, 21 Apr 2008) | 1 line Markup fix ................ r62428 | andrew.kuchling | 2008-04-21 04:08:13 +0200 (Mon, 21 Apr 2008) | 1 line Wording changes ................ r62429 | andrew.kuchling | 2008-04-21 04:14:24 +0200 (Mon, 21 Apr 2008) | 1 line Add various items ................ r62434 | thomas.heller | 2008-04-21 15:46:55 +0200 (Mon, 21 Apr 2008) | 1 line Fix typo. ................ r62435 | david.goodger | 2008-04-21 16:40:22 +0200 (Mon, 21 Apr 2008) | 1 line corrections ("reStructuredText" is one word) ................ r62436 | david.goodger | 2008-04-21 16:43:33 +0200 (Mon, 21 Apr 2008) | 1 line capitalization ................ r62441 | gregory.p.smith | 2008-04-21 19:46:40 +0200 (Mon, 21 Apr 2008) | 2 lines explicitly flush after the ... since there wasn't a newline ................ r62444 | jeroen.ruigrok | 2008-04-21 22:15:39 +0200 (Mon, 21 Apr 2008) | 2 lines Windows x64 also falls under VER_PLATFORM_WIN32_NT. ................ r62446 | gregory.p.smith | 2008-04-21 23:31:08 +0200 (Mon, 21 Apr 2008) | 3 lines If sys.stdin is not a tty, fall back to default_getpass after printing a warning instead of failing with a termios.error. ................ r62447 | mark.dickinson | 2008-04-22 00:32:24 +0200 (Tue, 22 Apr 2008) | 8 lines test_math and test_cmath are failing on the FreeBSD 6.2 trunk buildbot, apparently because tanh(-0.) loses the sign of zero on that platform. If true, this is a bug in FreeBSD. Added a configure test to verify this. I still need to figure out how best to deal with this failure. ................ r62448 | amaury.forgeotdarc | 2008-04-22 00:35:30 +0200 (Tue, 22 Apr 2008) | 7 lines Issue 2665: On Windows, sys.stderr does not contain a valid file when running without a console. It seems to work, but will fail at the first flush. This causes IDLE to crash when too many warnings are printed. Will backport. ................ r62450 | benjamin.peterson | 2008-04-22 00:57:00 +0200 (Tue, 22 Apr 2008) | 2 lines Fix Sphinx warnings ................ r62451 | mark.dickinson | 2008-04-22 02:54:27 +0200 (Tue, 22 Apr 2008) | 3 lines Make configure test for tanh(-0.) == -0. committed in r62447 actually work. (The test wasn't properly linked with libm. Sigh.) ................ r62452 | benjamin.peterson | 2008-04-22 04:16:03 +0200 (Tue, 22 Apr 2008) | 2 lines Various io doc updates ................ r62453 | neal.norwitz | 2008-04-22 07:07:47 +0200 (Tue, 22 Apr 2008) | 1 line Add Thomas Lee ................ r62454 | gregory.p.smith | 2008-04-22 10:08:41 +0200 (Tue, 22 Apr 2008) | 8 lines Major improvements: * Default to using /dev/tty for the password prompt and input before falling back to sys.stdin and sys.stderr. * Use sys.stderr instead of sys.stdout. * print the 'password may be echoed' warning to stream used to display the prompt rather than always sys.stderr. * warn() with GetPassWarning when input may be echoed. ................ r62455 | gregory.p.smith | 2008-04-22 10:11:33 +0200 (Tue, 22 Apr 2008) | 2 lines update the getpass entry ................ r62463 | amaury.forgeotdarc | 2008-04-22 23:14:41 +0200 (Tue, 22 Apr 2008) | 5 lines Issue #2670: urllib2.build_opener() failed when two handlers derive the same default base class. Will backport. ................ r62465 | skip.montanaro | 2008-04-23 00:45:09 +0200 (Wed, 23 Apr 2008) | 3 lines Factor in documentation changes from issue 1753732. ................ r62466 | gregory.p.smith | 2008-04-23 03:06:42 +0200 (Wed, 23 Apr 2008) | 2 lines syntax fixup ................ r62469 | benjamin.peterson | 2008-04-23 22:38:06 +0200 (Wed, 23 Apr 2008) | 2 lines #2673 Fix example typo in optparse docs ................ r62474 | martin.v.loewis | 2008-04-24 11:50:50 +0200 (Thu, 24 Apr 2008) | 2 lines Add Guilherme Polo. ................ r62476 | martin.v.loewis | 2008-04-24 15:16:36 +0200 (Thu, 24 Apr 2008) | 3 lines Remove Py_Refcnt, Py_Type, Py_Size, as they were added only for backwards compatibility, yet 2.5 did not have them at all. ................ r62477 | martin.v.loewis | 2008-04-24 15:17:24 +0200 (Thu, 24 Apr 2008) | 2 lines Fix typo. ................ r62478 | martin.v.loewis | 2008-04-24 15:18:03 +0200 (Thu, 24 Apr 2008) | 2 lines Add Jesus Cea. ................ r62480 | amaury.forgeotdarc | 2008-04-24 20:07:05 +0200 (Thu, 24 Apr 2008) | 4 lines Issue2681: the literal 0o8 was wrongly accepted, and evaluated as float(0.0). This happened only when 8 is the first digit. Credits go to Lukas Meuser. ................ r62485 | amaury.forgeotdarc | 2008-04-24 22:10:26 +0200 (Thu, 24 Apr 2008) | 5 lines Disable gc when running test_trace, or we may record the __del__ of collected objects. See http://mail.python.org/pipermail/python-checkins/2008-April/068633.html the extra events perfectly match several calls to socket._fileobject.__del__() ................ r62492 | neal.norwitz | 2008-04-25 05:40:17 +0200 (Fri, 25 Apr 2008) | 1 line Fix typo (now -> no) ................ r62497 | armin.rigo | 2008-04-25 11:35:18 +0200 (Fri, 25 Apr 2008) | 2 lines A new crasher. ................ r62498 | thomas.heller | 2008-04-25 17:44:16 +0200 (Fri, 25 Apr 2008) | 1 line Add from_buffer and from_buffer_copy class methods to ctypes types. ................ r62500 | mark.dickinson | 2008-04-25 18:59:09 +0200 (Fri, 25 Apr 2008) | 3 lines Issue 2635: fix bug in the fix_sentence_endings option to textwrap.fill. ................ r62507 | benjamin.peterson | 2008-04-25 23:43:56 +0200 (Fri, 25 Apr 2008) | 2 lines Allow test_import to work when it is invoked directly ................ r62513 | georg.brandl | 2008-04-26 20:31:07 +0200 (Sat, 26 Apr 2008) | 2 lines #2691: document PyLong (s)size_t APIs, patch by Alexander Belopolsky. ................ r62514 | georg.brandl | 2008-04-26 20:32:17 +0200 (Sat, 26 Apr 2008) | 2 lines Add missing return type to dealloc. ................ r62516 | alexandre.vassalotti | 2008-04-27 02:52:24 +0200 (Sun, 27 Apr 2008) | 2 lines Fixed URL of PEP 205 in weakref's module docstring. ................ r62521 | georg.brandl | 2008-04-27 11:39:59 +0200 (Sun, 27 Apr 2008) | 2 lines #2677: add note that not all functions may accept keyword args. ................ r62531 | georg.brandl | 2008-04-27 19:38:55 +0200 (Sun, 27 Apr 2008) | 2 lines Use correct XHTML tags. ................ r62535 | benjamin.peterson | 2008-04-27 20:14:39 +0200 (Sun, 27 Apr 2008) | 2 lines #2700 Document PyNumber_ToBase ................ r62545 | skip.montanaro | 2008-04-27 22:53:57 +0200 (Sun, 27 Apr 2008) | 1 line minor wording changes, rewrap a few lines ................ r62546 | kurt.kaiser | 2008-04-27 23:07:41 +0200 (Sun, 27 Apr 2008) | 7 lines Home / Control-A toggles between left margin and end of leading white space. Patch 1196903 Jeff Shute. M idlelib/PyShell.py M idlelib/EditorWindow.py M idlelib/NEWS.txt ................ r62548 | kurt.kaiser | 2008-04-27 23:38:05 +0200 (Sun, 27 Apr 2008) | 2 lines Improved AutoCompleteWindow logic. Patch 2062 Tal Einat. ................ r62549 | kurt.kaiser | 2008-04-27 23:52:19 +0200 (Sun, 27 Apr 2008) | 4 lines Autocompletion of filenames now support alternate separators, e.g. the '/' char on Windows. Patch 2061 Tal Einat. ................ r62550 | skip.montanaro | 2008-04-28 00:49:56 +0200 (Mon, 28 Apr 2008) | 6 lines A few small changes: * The only exception we should catch when trying to import cStringIO is an ImportError. * Delete the function signatures embedded in the mk*temp docstrings. * The tempdir global variable was initialized twice. ................ r62551 | skip.montanaro | 2008-04-28 00:52:02 +0200 (Mon, 28 Apr 2008) | 4 lines Wrap some long paragraphs and include the default values for optional function parameters. ................ r62553 | skip.montanaro | 2008-04-28 04:57:23 +0200 (Mon, 28 Apr 2008) | 7 lines Minor cleanups: * Avoid creating unused local variables where we can. Where we can't prefix the unused variables with '_'. * Avoid shadowing builtins where it won't change the external interface of a function. * Use None as default path arg to readmodule and readmodule_ex. ................ r62554 | skip.montanaro | 2008-04-28 04:59:45 +0200 (Mon, 28 Apr 2008) | 6 lines Correct documentation to match implementation: "Class" instead of "class_descriptor", "Function" instead of "function_descriptor". Note default path value for readmodule*. Wrap some long paragraphs. Don't mention 'inpackage' which isn't part of the public API. ................ r62555 | brett.cannon | 2008-04-28 05:23:50 +0200 (Mon, 28 Apr 2008) | 5 lines Fix a bug introduced by the warnings rewrite where tracebacks were being improperly indented. Closes issue #2699. ................ r62556 | skip.montanaro | 2008-04-28 05:25:37 +0200 (Mon, 28 Apr 2008) | 2 lines Wrap some long lines. ................ r62557 | skip.montanaro | 2008-04-28 05:27:53 +0200 (Mon, 28 Apr 2008) | 6 lines Get rid of _test(), _main(), _debug() and _check(). Tests are no longer needed (better set available in Lib/test/test_robotparser.py). Clean up a few PEP 8 nits (compound statements on a single line, whitespace around operators). ................ r62558 | brett.cannon | 2008-04-28 06:50:06 +0200 (Mon, 28 Apr 2008) | 3 lines Rename the test_traceback_print() function to traceback_print() to prevent test_capi from automatically calling the function. ................ r62559 | georg.brandl | 2008-04-28 07:16:30 +0200 (Mon, 28 Apr 2008) | 2 lines Fix markup. ................ r62569 | amaury.forgeotdarc | 2008-04-28 23:07:06 +0200 (Mon, 28 Apr 2008) | 5 lines test_sundry performs minimal tests (a simple import...) on modules that are not tested otherwise. Some of them now have tests and can be removed. Only 70 to go... ................ r62574 | andrew.kuchling | 2008-04-29 04:03:54 +0200 (Tue, 29 Apr 2008) | 1 line Strip down SSL docs; I'm not managing to get test programs working, so I'll just give a minimal description ................ r62577 | martin.v.loewis | 2008-04-29 08:10:53 +0200 (Tue, 29 Apr 2008) | 2 lines Add Rodrigo and Heiko. ................ r62593 | nick.coghlan | 2008-04-30 16:23:36 +0200 (Wed, 30 Apr 2008) | 1 line Update command line usage documentation to reflect 2.6 changes (also includes some minor cleanups). Addresses TODO list issue 2258 ................ r62595 | andrew.kuchling | 2008-04-30 18:19:55 +0200 (Wed, 30 Apr 2008) | 1 line Typo fix ................ r62604 | benjamin.peterson | 2008-04-30 23:03:58 +0200 (Wed, 30 Apr 2008) | 2 lines make test_support's captured_output a bit more robust when exceptions happen ................ r62605 | georg.brandl | 2008-04-30 23:08:42 +0200 (Wed, 30 Apr 2008) | 2 lines #1748: use functools.wraps instead of rolling own metadata update. ................ r62606 | benjamin.peterson | 2008-04-30 23:25:55 +0200 (Wed, 30 Apr 2008) | 2 lines Remove some from __future__ import with_statements ................ r62608 | benjamin.peterson | 2008-05-01 00:03:36 +0200 (Thu, 01 May 2008) | 2 lines Fix typo in whatsnew ................ r62616 | georg.brandl | 2008-05-01 20:24:32 +0200 (Thu, 01 May 2008) | 2 lines Fix synopsis. ................ r62626 | brett.cannon | 2008-05-02 04:25:09 +0200 (Fri, 02 May 2008) | 6 lines Fix a backwards-compatibility mistake where a new optional argument for warnings.showwarning() was being used. This broke pre-existing replacements for the function since they didn't support the extra argument. Closes issue 2705. ................ r62627 | gregory.p.smith | 2008-05-02 09:26:52 +0200 (Fri, 02 May 2008) | 20 lines This should fix issue2632. A long description of the two competing problems is in the bug report (one old, one recently introduced trying to fix the old one). In short: buffer data during socket._fileobject.read() and readlines() within a cStringIO object instead of a [] of str()s returned from the recv() call. This prevents excessive memory use due to the size parameter being passed to recv() being grossly larger than the actual size of the data returned *and* prevents excessive cpu usage due to looping in python calling recv() with a very tiny size value if min() is used as the previous memory-use bug "fix" did. It also documents what the socket._fileobject._rbufsize member is actually used for. This is a candidate for back porting to 2.5. ................ r62636 | mark.hammond | 2008-05-02 14:48:15 +0200 (Fri, 02 May 2008) | 2 lines #2581: Vista UAC/elevation support for bdist_wininst ................ r62638 | facundo.batista | 2008-05-02 19:39:00 +0200 (Fri, 02 May 2008) | 3 lines Fixed some test structures. Thanks Mark Dickinson. ................ r62644 | ronald.oussoren | 2008-05-02 21:45:11 +0200 (Fri, 02 May 2008) | 7 lines Fix for issue #2573: Can't change the framework name on OS X builds This introduces a new configure option: --with-framework-name=NAME (defaulting to 'Python'). This allows you to install several copies of the Python framework with different names (such as a normal build and a debug build). ................ r62645 | ronald.oussoren | 2008-05-02 21:58:56 +0200 (Fri, 02 May 2008) | 2 lines Finish fix for issue2573, previous patch was incomplete. ................ r62647 | martin.v.loewis | 2008-05-02 23:30:20 +0200 (Fri, 02 May 2008) | 13 lines Merged revisions 62263-62646 via svnmerge from svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r62470 | david.wolever | 2008-04-24 02:11:07 +0200 (Do, 24 Apr 2008) | 3 lines Fixed up and applied the patch for #2431 -- speeding up 2to3 with a lookup table. ........ r62646 | martin.v.loewis | 2008-05-02 23:29:27 +0200 (Fr, 02 Mai 2008) | 2 lines Fix whitespace. ........ ................ r62648 | ronald.oussoren | 2008-05-02 23:42:35 +0200 (Fri, 02 May 2008) | 4 lines Fix for #1905: PythonLauncher not working correctly on OSX 10.5/Leopard This fixes both Python Launchar and the terminalcommand module. ................ r62651 | ronald.oussoren | 2008-05-02 23:54:56 +0200 (Fri, 02 May 2008) | 2 lines Fix for issue #2520 (cannot import macerrors) ................ r62652 | benjamin.peterson | 2008-05-03 00:12:58 +0200 (Sat, 03 May 2008) | 2 lines capitalization nit for reStructuredText ................ r62653 | brett.cannon | 2008-05-03 03:02:41 +0200 (Sat, 03 May 2008) | 2 lines Fix some indentation errors. ................ r62656 | brett.cannon | 2008-05-03 05:19:39 +0200 (Sat, 03 May 2008) | 6 lines Fix the C implementation of 'warnings' to infer the filename of the module that raised an exception properly when __file__ is not set, __name__ == '__main__', and sys.argv[0] is a false value. Closes issue2743. ................ r62661 | amaury.forgeotdarc | 2008-05-03 14:21:13 +0200 (Sat, 03 May 2008) | 8 lines In test_io, StatefulIncrementalDecoderTest was not part of the test suite. And of course, the test failed: a bytearray was used without reason in io.TextIOWrapper.tell(). The difference is that iterating over bytes (i.e. str in python2.6) returns 1-char bytes, whereas bytearrays yield integers. This code should still work with python3.0 ................ r62663 | benjamin.peterson | 2008-05-03 17:56:42 +0200 (Sat, 03 May 2008) | 2 lines The compiling struct is now passed around to all AST helpers (see issue 2720) ................ r62680 | benjamin.peterson | 2008-05-03 23:35:18 +0200 (Sat, 03 May 2008) | 2 lines Moved testing of builtin types out of test_builtin and into type specific modules ................ r62686 | mark.dickinson | 2008-05-04 04:25:46 +0200 (Sun, 04 May 2008) | 4 lines Make sure that Context traps and flags dictionaries have values 0 and 1 (as documented) rather than True and False. ................ r62687 | benjamin.peterson | 2008-05-04 05:05:49 +0200 (Sun, 04 May 2008) | 2 lines Fix typo in whatsnew ................ r62696 | georg.brandl | 2008-05-04 11:15:04 +0200 (Sun, 04 May 2008) | 2 lines #2752: wrong meaning of '' for socket host. ................ r62699 | christian.heimes | 2008-05-04 13:50:53 +0200 (Sun, 04 May 2008) | 1 line Added note that Python requires at least Win2k SP4 ................ r62700 | gerhard.haering | 2008-05-04 14:59:57 +0200 (Sun, 04 May 2008) | 3 lines SQLite requires 64-bit integers in order to build. So the whole HAVE_LONG_LONG #ifdefing was useless. ................ r62701 | gerhard.haering | 2008-05-04 15:15:12 +0200 (Sun, 04 May 2008) | 3 lines Applied sqliterow-richcmp.diff patch from Thomas Heller in Issue2152. The sqlite3.Row type is now correctly hashable. ................ r62702 | gerhard.haering | 2008-05-04 15:42:44 +0200 (Sun, 04 May 2008) | 5 lines Implemented feature request 2157: Converter names are cut off at '(' characters. This avoids the common case of something like 'NUMBER(10)' not being parsed as 'NUMBER', like expected. Also corrected the docs about converter names being case-sensitive. They aren't any longer. ................ r62703 | georg.brandl | 2008-05-04 17:45:05 +0200 (Sun, 04 May 2008) | 2 lines #2757: Remove spare newline. ................ r62711 | benjamin.peterson | 2008-05-04 21:10:02 +0200 (Sun, 04 May 2008) | 2 lines Fix typo in bugs.rst ................
580 lines
21 KiB
Python
580 lines
21 KiB
Python
#
|
|
# Test suite for the textwrap module.
|
|
#
|
|
# Original tests written by Greg Ward <gward@python.net>.
|
|
# Converted to PyUnit by Peter Hansen <peter@engcorp.com>.
|
|
# Currently maintained by Greg Ward.
|
|
#
|
|
# $Id$
|
|
#
|
|
|
|
import unittest
|
|
from test import test_support
|
|
|
|
from textwrap import TextWrapper, wrap, fill, dedent
|
|
|
|
|
|
class BaseTestCase(unittest.TestCase):
|
|
'''Parent class with utility methods for textwrap tests.'''
|
|
|
|
def show(self, textin):
|
|
if isinstance(textin, list):
|
|
result = []
|
|
for i in range(len(textin)):
|
|
result.append(" %d: %r" % (i, textin[i]))
|
|
result = '\n'.join(result)
|
|
elif isinstance(textin, str):
|
|
result = " %s\n" % repr(textin)
|
|
return result
|
|
|
|
|
|
def check(self, result, expect):
|
|
self.assertEquals(result, expect,
|
|
'expected:\n%s\nbut got:\n%s' % (
|
|
self.show(expect), self.show(result)))
|
|
|
|
def check_wrap(self, text, width, expect, **kwargs):
|
|
result = wrap(text, width, **kwargs)
|
|
self.check(result, expect)
|
|
|
|
def check_split(self, text, expect):
|
|
result = self.wrapper._split(text)
|
|
self.assertEquals(result, expect,
|
|
"\nexpected %r\n"
|
|
"but got %r" % (expect, result))
|
|
|
|
|
|
class WrapTestCase(BaseTestCase):
|
|
|
|
def setUp(self):
|
|
self.wrapper = TextWrapper(width=45)
|
|
|
|
def test_simple(self):
|
|
# Simple case: just words, spaces, and a bit of punctuation
|
|
|
|
text = "Hello there, how are you this fine day? I'm glad to hear it!"
|
|
|
|
self.check_wrap(text, 12,
|
|
["Hello there,",
|
|
"how are you",
|
|
"this fine",
|
|
"day? I'm",
|
|
"glad to hear",
|
|
"it!"])
|
|
self.check_wrap(text, 42,
|
|
["Hello there, how are you this fine day?",
|
|
"I'm glad to hear it!"])
|
|
self.check_wrap(text, 80, [text])
|
|
|
|
|
|
def test_whitespace(self):
|
|
# Whitespace munging and end-of-sentence detection
|
|
|
|
text = """\
|
|
This is a paragraph that already has
|
|
line breaks. But some of its lines are much longer than the others,
|
|
so it needs to be wrapped.
|
|
Some lines are \ttabbed too.
|
|
What a mess!
|
|
"""
|
|
|
|
expect = ["This is a paragraph that already has line",
|
|
"breaks. But some of its lines are much",
|
|
"longer than the others, so it needs to be",
|
|
"wrapped. Some lines are tabbed too. What a",
|
|
"mess!"]
|
|
|
|
wrapper = TextWrapper(45, fix_sentence_endings=True)
|
|
result = wrapper.wrap(text)
|
|
self.check(result, expect)
|
|
|
|
result = wrapper.fill(text)
|
|
self.check(result, '\n'.join(expect))
|
|
|
|
def test_fix_sentence_endings(self):
|
|
wrapper = TextWrapper(60, fix_sentence_endings=True)
|
|
|
|
# SF #847346: ensure that fix_sentence_endings=True does the
|
|
# right thing even on input short enough that it doesn't need to
|
|
# be wrapped.
|
|
text = "A short line. Note the single space."
|
|
expect = ["A short line. Note the single space."]
|
|
self.check(wrapper.wrap(text), expect)
|
|
|
|
# Test some of the hairy end cases that _fix_sentence_endings()
|
|
# is supposed to handle (the easy stuff is tested in
|
|
# test_whitespace() above).
|
|
text = "Well, Doctor? What do you think?"
|
|
expect = ["Well, Doctor? What do you think?"]
|
|
self.check(wrapper.wrap(text), expect)
|
|
|
|
text = "Well, Doctor?\nWhat do you think?"
|
|
self.check(wrapper.wrap(text), expect)
|
|
|
|
text = 'I say, chaps! Anyone for "tennis?"\nHmmph!'
|
|
expect = ['I say, chaps! Anyone for "tennis?" Hmmph!']
|
|
self.check(wrapper.wrap(text), expect)
|
|
|
|
wrapper.width = 20
|
|
expect = ['I say, chaps!', 'Anyone for "tennis?"', 'Hmmph!']
|
|
self.check(wrapper.wrap(text), expect)
|
|
|
|
text = 'And she said, "Go to hell!"\nCan you believe that?'
|
|
expect = ['And she said, "Go to',
|
|
'hell!" Can you',
|
|
'believe that?']
|
|
self.check(wrapper.wrap(text), expect)
|
|
|
|
wrapper.width = 60
|
|
expect = ['And she said, "Go to hell!" Can you believe that?']
|
|
self.check(wrapper.wrap(text), expect)
|
|
|
|
text = 'File stdio.h is nice.'
|
|
expect = ['File stdio.h is nice.']
|
|
self.check(wrapper.wrap(text), expect)
|
|
|
|
def test_wrap_short(self):
|
|
# Wrapping to make short lines longer
|
|
|
|
text = "This is a\nshort paragraph."
|
|
|
|
self.check_wrap(text, 20, ["This is a short",
|
|
"paragraph."])
|
|
self.check_wrap(text, 40, ["This is a short paragraph."])
|
|
|
|
|
|
def test_wrap_short_1line(self):
|
|
# Test endcases
|
|
|
|
text = "This is a short line."
|
|
|
|
self.check_wrap(text, 30, ["This is a short line."])
|
|
self.check_wrap(text, 30, ["(1) This is a short line."],
|
|
initial_indent="(1) ")
|
|
|
|
|
|
def test_hyphenated(self):
|
|
# Test breaking hyphenated words
|
|
|
|
text = ("this-is-a-useful-feature-for-"
|
|
"reformatting-posts-from-tim-peters'ly")
|
|
|
|
self.check_wrap(text, 40,
|
|
["this-is-a-useful-feature-for-",
|
|
"reformatting-posts-from-tim-peters'ly"])
|
|
self.check_wrap(text, 41,
|
|
["this-is-a-useful-feature-for-",
|
|
"reformatting-posts-from-tim-peters'ly"])
|
|
self.check_wrap(text, 42,
|
|
["this-is-a-useful-feature-for-reformatting-",
|
|
"posts-from-tim-peters'ly"])
|
|
|
|
def test_hyphenated_numbers(self):
|
|
# Test that hyphenated numbers (eg. dates) are not broken like words.
|
|
text = ("Python 1.0.0 was released on 1994-01-26. Python 1.0.1 was\n"
|
|
"released on 1994-02-15.")
|
|
|
|
self.check_wrap(text, 30, ['Python 1.0.0 was released on',
|
|
'1994-01-26. Python 1.0.1 was',
|
|
'released on 1994-02-15.'])
|
|
self.check_wrap(text, 40, ['Python 1.0.0 was released on 1994-01-26.',
|
|
'Python 1.0.1 was released on 1994-02-15.'])
|
|
|
|
text = "I do all my shopping at 7-11."
|
|
self.check_wrap(text, 25, ["I do all my shopping at",
|
|
"7-11."])
|
|
self.check_wrap(text, 27, ["I do all my shopping at",
|
|
"7-11."])
|
|
self.check_wrap(text, 29, ["I do all my shopping at 7-11."])
|
|
|
|
def test_em_dash(self):
|
|
# Test text with em-dashes
|
|
text = "Em-dashes should be written -- thus."
|
|
self.check_wrap(text, 25,
|
|
["Em-dashes should be",
|
|
"written -- thus."])
|
|
|
|
# Probe the boundaries of the properly written em-dash,
|
|
# ie. " -- ".
|
|
self.check_wrap(text, 29,
|
|
["Em-dashes should be written",
|
|
"-- thus."])
|
|
expect = ["Em-dashes should be written --",
|
|
"thus."]
|
|
self.check_wrap(text, 30, expect)
|
|
self.check_wrap(text, 35, expect)
|
|
self.check_wrap(text, 36,
|
|
["Em-dashes should be written -- thus."])
|
|
|
|
# The improperly written em-dash is handled too, because
|
|
# it's adjacent to non-whitespace on both sides.
|
|
text = "You can also do--this or even---this."
|
|
expect = ["You can also do",
|
|
"--this or even",
|
|
"---this."]
|
|
self.check_wrap(text, 15, expect)
|
|
self.check_wrap(text, 16, expect)
|
|
expect = ["You can also do--",
|
|
"this or even---",
|
|
"this."]
|
|
self.check_wrap(text, 17, expect)
|
|
self.check_wrap(text, 19, expect)
|
|
expect = ["You can also do--this or even",
|
|
"---this."]
|
|
self.check_wrap(text, 29, expect)
|
|
self.check_wrap(text, 31, expect)
|
|
expect = ["You can also do--this or even---",
|
|
"this."]
|
|
self.check_wrap(text, 32, expect)
|
|
self.check_wrap(text, 35, expect)
|
|
|
|
# All of the above behaviour could be deduced by probing the
|
|
# _split() method.
|
|
text = "Here's an -- em-dash and--here's another---and another!"
|
|
expect = ["Here's", " ", "an", " ", "--", " ", "em-", "dash", " ",
|
|
"and", "--", "here's", " ", "another", "---",
|
|
"and", " ", "another!"]
|
|
self.check_split(text, expect)
|
|
|
|
text = "and then--bam!--he was gone"
|
|
expect = ["and", " ", "then", "--", "bam!", "--",
|
|
"he", " ", "was", " ", "gone"]
|
|
self.check_split(text, expect)
|
|
|
|
|
|
def test_unix_options (self):
|
|
# Test that Unix-style command-line options are wrapped correctly.
|
|
# Both Optik (OptionParser) and Docutils rely on this behaviour!
|
|
|
|
text = "You should use the -n option, or --dry-run in its long form."
|
|
self.check_wrap(text, 20,
|
|
["You should use the",
|
|
"-n option, or --dry-",
|
|
"run in its long",
|
|
"form."])
|
|
self.check_wrap(text, 21,
|
|
["You should use the -n",
|
|
"option, or --dry-run",
|
|
"in its long form."])
|
|
expect = ["You should use the -n option, or",
|
|
"--dry-run in its long form."]
|
|
self.check_wrap(text, 32, expect)
|
|
self.check_wrap(text, 34, expect)
|
|
self.check_wrap(text, 35, expect)
|
|
self.check_wrap(text, 38, expect)
|
|
expect = ["You should use the -n option, or --dry-",
|
|
"run in its long form."]
|
|
self.check_wrap(text, 39, expect)
|
|
self.check_wrap(text, 41, expect)
|
|
expect = ["You should use the -n option, or --dry-run",
|
|
"in its long form."]
|
|
self.check_wrap(text, 42, expect)
|
|
|
|
# Again, all of the above can be deduced from _split().
|
|
text = "the -n option, or --dry-run or --dryrun"
|
|
expect = ["the", " ", "-n", " ", "option,", " ", "or", " ",
|
|
"--dry-", "run", " ", "or", " ", "--dryrun"]
|
|
self.check_split(text, expect)
|
|
|
|
def test_funky_hyphens (self):
|
|
# Screwy edge cases cooked up by David Goodger. All reported
|
|
# in SF bug #596434.
|
|
self.check_split("what the--hey!", ["what", " ", "the", "--", "hey!"])
|
|
self.check_split("what the--", ["what", " ", "the--"])
|
|
self.check_split("what the--.", ["what", " ", "the--."])
|
|
self.check_split("--text--.", ["--text--."])
|
|
|
|
# When I first read bug #596434, this is what I thought David
|
|
# was talking about. I was wrong; these have always worked
|
|
# fine. The real problem is tested in test_funky_parens()
|
|
# below...
|
|
self.check_split("--option", ["--option"])
|
|
self.check_split("--option-opt", ["--option-", "opt"])
|
|
self.check_split("foo --option-opt bar",
|
|
["foo", " ", "--option-", "opt", " ", "bar"])
|
|
|
|
def test_punct_hyphens(self):
|
|
# Oh bother, SF #965425 found another problem with hyphens --
|
|
# hyphenated words in single quotes weren't handled correctly.
|
|
# In fact, the bug is that *any* punctuation around a hyphenated
|
|
# word was handled incorrectly, except for a leading "--", which
|
|
# was special-cased for Optik and Docutils. So test a variety
|
|
# of styles of punctuation around a hyphenated word.
|
|
# (Actually this is based on an Optik bug report, #813077).
|
|
self.check_split("the 'wibble-wobble' widget",
|
|
['the', ' ', "'wibble-", "wobble'", ' ', 'widget'])
|
|
self.check_split('the "wibble-wobble" widget',
|
|
['the', ' ', '"wibble-', 'wobble"', ' ', 'widget'])
|
|
self.check_split("the (wibble-wobble) widget",
|
|
['the', ' ', "(wibble-", "wobble)", ' ', 'widget'])
|
|
self.check_split("the ['wibble-wobble'] widget",
|
|
['the', ' ', "['wibble-", "wobble']", ' ', 'widget'])
|
|
|
|
def test_funky_parens (self):
|
|
# Second part of SF bug #596434: long option strings inside
|
|
# parentheses.
|
|
self.check_split("foo (--option) bar",
|
|
["foo", " ", "(--option)", " ", "bar"])
|
|
|
|
# Related stuff -- make sure parens work in simpler contexts.
|
|
self.check_split("foo (bar) baz",
|
|
["foo", " ", "(bar)", " ", "baz"])
|
|
self.check_split("blah (ding dong), wubba",
|
|
["blah", " ", "(ding", " ", "dong),",
|
|
" ", "wubba"])
|
|
|
|
def test_initial_whitespace(self):
|
|
# SF bug #622849 reported inconsistent handling of leading
|
|
# whitespace; let's test that a bit, shall we?
|
|
text = " This is a sentence with leading whitespace."
|
|
self.check_wrap(text, 50,
|
|
[" This is a sentence with leading whitespace."])
|
|
self.check_wrap(text, 30,
|
|
[" This is a sentence with", "leading whitespace."])
|
|
|
|
def test_no_drop_whitespace(self):
|
|
# SF patch #1581073
|
|
text = " This is a sentence with much whitespace."
|
|
self.check_wrap(text, 10,
|
|
[" This is a", " ", "sentence ",
|
|
"with ", "much white", "space."],
|
|
drop_whitespace=False)
|
|
|
|
def test_split(self):
|
|
# Ensure that the standard _split() method works as advertised
|
|
# in the comments
|
|
|
|
text = "Hello there -- you goof-ball, use the -b option!"
|
|
|
|
result = self.wrapper._split(text)
|
|
self.check(result,
|
|
["Hello", " ", "there", " ", "--", " ", "you", " ", "goof-",
|
|
"ball,", " ", "use", " ", "the", " ", "-b", " ", "option!"])
|
|
|
|
def test_bad_width(self):
|
|
# Ensure that width <= 0 is caught.
|
|
text = "Whatever, it doesn't matter."
|
|
self.assertRaises(ValueError, wrap, text, 0)
|
|
self.assertRaises(ValueError, wrap, text, -1)
|
|
|
|
|
|
class LongWordTestCase (BaseTestCase):
|
|
def setUp(self):
|
|
self.wrapper = TextWrapper()
|
|
self.text = '''\
|
|
Did you say "supercalifragilisticexpialidocious?"
|
|
How *do* you spell that odd word, anyways?
|
|
'''
|
|
|
|
def test_break_long(self):
|
|
# Wrap text with long words and lots of punctuation
|
|
|
|
self.check_wrap(self.text, 30,
|
|
['Did you say "supercalifragilis',
|
|
'ticexpialidocious?" How *do*',
|
|
'you spell that odd word,',
|
|
'anyways?'])
|
|
self.check_wrap(self.text, 50,
|
|
['Did you say "supercalifragilisticexpialidocious?"',
|
|
'How *do* you spell that odd word, anyways?'])
|
|
|
|
# SF bug 797650. Prevent an infinite loop by making sure that at
|
|
# least one character gets split off on every pass.
|
|
self.check_wrap('-'*10+'hello', 10,
|
|
['----------',
|
|
' h',
|
|
' e',
|
|
' l',
|
|
' l',
|
|
' o'],
|
|
subsequent_indent = ' '*15)
|
|
|
|
# bug 1146. Prevent a long word to be wrongly wrapped when the
|
|
# preceding word is exactly one character shorter than the width
|
|
self.check_wrap(self.text, 12,
|
|
['Did you say ',
|
|
'"supercalifr',
|
|
'agilisticexp',
|
|
'ialidocious?',
|
|
'" How *do*',
|
|
'you spell',
|
|
'that odd',
|
|
'word,',
|
|
'anyways?'])
|
|
|
|
def test_nobreak_long(self):
|
|
# Test with break_long_words disabled
|
|
self.wrapper.break_long_words = 0
|
|
self.wrapper.width = 30
|
|
expect = ['Did you say',
|
|
'"supercalifragilisticexpialidocious?"',
|
|
'How *do* you spell that odd',
|
|
'word, anyways?'
|
|
]
|
|
result = self.wrapper.wrap(self.text)
|
|
self.check(result, expect)
|
|
|
|
# Same thing with kwargs passed to standalone wrap() function.
|
|
result = wrap(self.text, width=30, break_long_words=0)
|
|
self.check(result, expect)
|
|
|
|
|
|
class IndentTestCases(BaseTestCase):
|
|
|
|
# called before each test method
|
|
def setUp(self):
|
|
self.text = '''\
|
|
This paragraph will be filled, first without any indentation,
|
|
and then with some (including a hanging indent).'''
|
|
|
|
|
|
def test_fill(self):
|
|
# Test the fill() method
|
|
|
|
expect = '''\
|
|
This paragraph will be filled, first
|
|
without any indentation, and then with
|
|
some (including a hanging indent).'''
|
|
|
|
result = fill(self.text, 40)
|
|
self.check(result, expect)
|
|
|
|
|
|
def test_initial_indent(self):
|
|
# Test initial_indent parameter
|
|
|
|
expect = [" This paragraph will be filled,",
|
|
"first without any indentation, and then",
|
|
"with some (including a hanging indent)."]
|
|
result = wrap(self.text, 40, initial_indent=" ")
|
|
self.check(result, expect)
|
|
|
|
expect = "\n".join(expect)
|
|
result = fill(self.text, 40, initial_indent=" ")
|
|
self.check(result, expect)
|
|
|
|
|
|
def test_subsequent_indent(self):
|
|
# Test subsequent_indent parameter
|
|
|
|
expect = '''\
|
|
* This paragraph will be filled, first
|
|
without any indentation, and then
|
|
with some (including a hanging
|
|
indent).'''
|
|
|
|
result = fill(self.text, 40,
|
|
initial_indent=" * ", subsequent_indent=" ")
|
|
self.check(result, expect)
|
|
|
|
|
|
# Despite the similar names, DedentTestCase is *not* the inverse
|
|
# of IndentTestCase!
|
|
class DedentTestCase(unittest.TestCase):
|
|
|
|
def assertUnchanged(self, text):
|
|
"""assert that dedent() has no effect on 'text'"""
|
|
self.assertEquals(text, dedent(text))
|
|
|
|
def test_dedent_nomargin(self):
|
|
# No lines indented.
|
|
text = "Hello there.\nHow are you?\nOh good, I'm glad."
|
|
self.assertUnchanged(text)
|
|
|
|
# Similar, with a blank line.
|
|
text = "Hello there.\n\nBoo!"
|
|
self.assertUnchanged(text)
|
|
|
|
# Some lines indented, but overall margin is still zero.
|
|
text = "Hello there.\n This is indented."
|
|
self.assertUnchanged(text)
|
|
|
|
# Again, add a blank line.
|
|
text = "Hello there.\n\n Boo!\n"
|
|
self.assertUnchanged(text)
|
|
|
|
def test_dedent_even(self):
|
|
# All lines indented by two spaces.
|
|
text = " Hello there.\n How are ya?\n Oh good."
|
|
expect = "Hello there.\nHow are ya?\nOh good."
|
|
self.assertEquals(expect, dedent(text))
|
|
|
|
# Same, with blank lines.
|
|
text = " Hello there.\n\n How are ya?\n Oh good.\n"
|
|
expect = "Hello there.\n\nHow are ya?\nOh good.\n"
|
|
self.assertEquals(expect, dedent(text))
|
|
|
|
# Now indent one of the blank lines.
|
|
text = " Hello there.\n \n How are ya?\n Oh good.\n"
|
|
expect = "Hello there.\n\nHow are ya?\nOh good.\n"
|
|
self.assertEquals(expect, dedent(text))
|
|
|
|
def test_dedent_uneven(self):
|
|
# Lines indented unevenly.
|
|
text = '''\
|
|
def foo():
|
|
while 1:
|
|
return foo
|
|
'''
|
|
expect = '''\
|
|
def foo():
|
|
while 1:
|
|
return foo
|
|
'''
|
|
self.assertEquals(expect, dedent(text))
|
|
|
|
# Uneven indentation with a blank line.
|
|
text = " Foo\n Bar\n\n Baz\n"
|
|
expect = "Foo\n Bar\n\n Baz\n"
|
|
self.assertEquals(expect, dedent(text))
|
|
|
|
# Uneven indentation with a whitespace-only line.
|
|
text = " Foo\n Bar\n \n Baz\n"
|
|
expect = "Foo\n Bar\n\n Baz\n"
|
|
self.assertEquals(expect, dedent(text))
|
|
|
|
# dedent() should not mangle internal tabs
|
|
def test_dedent_preserve_internal_tabs(self):
|
|
text = " hello\tthere\n how are\tyou?"
|
|
expect = "hello\tthere\nhow are\tyou?"
|
|
self.assertEquals(expect, dedent(text))
|
|
|
|
# make sure that it preserves tabs when it's not making any
|
|
# changes at all
|
|
self.assertEquals(expect, dedent(expect))
|
|
|
|
# dedent() should not mangle tabs in the margin (i.e.
|
|
# tabs and spaces both count as margin, but are *not*
|
|
# considered equivalent)
|
|
def test_dedent_preserve_margin_tabs(self):
|
|
text = " hello there\n\thow are you?"
|
|
self.assertUnchanged(text)
|
|
|
|
# same effect even if we have 8 spaces
|
|
text = " hello there\n\thow are you?"
|
|
self.assertUnchanged(text)
|
|
|
|
# dedent() only removes whitespace that can be uniformly removed!
|
|
text = "\thello there\n\thow are you?"
|
|
expect = "hello there\nhow are you?"
|
|
self.assertEquals(expect, dedent(text))
|
|
|
|
text = " \thello there\n \thow are you?"
|
|
self.assertEquals(expect, dedent(text))
|
|
|
|
text = " \t hello there\n \t how are you?"
|
|
self.assertEquals(expect, dedent(text))
|
|
|
|
text = " \thello there\n \t how are you?"
|
|
expect = "hello there\n how are you?"
|
|
self.assertEquals(expect, dedent(text))
|
|
|
|
|
|
def test_main():
|
|
test_support.run_unittest(WrapTestCase,
|
|
LongWordTestCase,
|
|
IndentTestCases,
|
|
DedentTestCase)
|
|
|
|
if __name__ == '__main__':
|
|
test_main()
|