diff options
| author | Terry Jan Reedy <tjreedy@udel.edu> | 2014-01-26 20:24:35 -0500 |
|---|---|---|
| committer | Terry Jan Reedy <tjreedy@udel.edu> | 2014-01-26 20:24:35 -0500 |
| commit | 1b60cb75fe4a3176ae6e013d0d5bf8e82d9a5288 (patch) | |
| tree | 4d20ede3ae1010b9e3ba426e3a4f18d29786638c /Lib/idlelib/idle_test/test_calltips.py | |
| parent | 848d1a4bad4350140c5f560283a6105389de8517 (diff) | |
| download | cpython-1b60cb75fe4a3176ae6e013d0d5bf8e82d9a5288.tar.gz | |
White space and merge cleanup.
Diffstat (limited to 'Lib/idlelib/idle_test/test_calltips.py')
| -rw-r--r-- | Lib/idlelib/idle_test/test_calltips.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Lib/idlelib/idle_test/test_calltips.py b/Lib/idlelib/idle_test/test_calltips.py index 8edaf6b1ef..4bf5e7e5dc 100644 --- a/Lib/idlelib/idle_test/test_calltips.py +++ b/Lib/idlelib/idle_test/test_calltips.py @@ -69,12 +69,8 @@ class Get_signatureTest(unittest.TestCase): self.assertEqual(signature(textwrap.TextWrapper), '''\ (width=70, initial_indent='', subsequent_indent='', expand_tabs=True, replace_whitespace=True, fix_sentence_endings=False, break_long_words=True, -<<<<<<< local drop_whitespace=True, break_on_hyphens=True, tabsize=8, *, max_lines=None, placeholder=' [...]')''') -======= - drop_whitespace=True, break_on_hyphens=True, tabsize=8)''') ->>>>>>> other def test_docline_truncation(self): def f(): pass |