diff options
Diffstat (limited to 'Lib/idlelib/idle_test/test_calltips.py')
| -rw-r--r-- | Lib/idlelib/idle_test/test_calltips.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Lib/idlelib/idle_test/test_calltips.py b/Lib/idlelib/idle_test/test_calltips.py index 4bf5e7e..8edaf6b 100644 --- a/Lib/idlelib/idle_test/test_calltips.py +++ b/Lib/idlelib/idle_test/test_calltips.py @@ -69,8 +69,12 @@ 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 |