diff options
| author | Terry Jan Reedy <tjreedy@udel.edu> | 2014-01-27 01:24:35 (GMT) |
|---|---|---|
| committer | Terry Jan Reedy <tjreedy@udel.edu> | 2014-01-27 01:24:35 (GMT) |
| commit | 76964877e3b40b79319dda095ba8ca6b50074c56 (patch) | |
| tree | d3a4faed49893f86665632bb58334a76032eb62a | |
| parent | 0902ce437def7c4af136d1100671b9221b7d63d1 (diff) | |
| download | cpython-76964877e3b40b79319dda095ba8ca6b50074c56.zip cpython-76964877e3b40b79319dda095ba8ca6b50074c56.tar.gz cpython-76964877e3b40b79319dda095ba8ca6b50074c56.tar.bz2 | |
White space and merge cleanup.
| -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 8edaf6b..4bf5e7e 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 |