mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-25 12:44:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merge with 3.3

Browse source
This commit is contained in:
Terry Jan Reedy 2014-01-26 20:17:48 -05:00
commit 0902ce437d
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/idlelib/idle_test/test_calltips.py
View file

@ -69,8 +69,12 @@ class Get_signatureTest(unittest.TestCase):
self.assertEqual(signature(textwrap.TextWrapper), '''\ self.assertEqual(signature(textwrap.TextWrapper), '''\
(width=70, initial_indent='', subsequent_indent='', expand_tabs=True, (width=70, initial_indent='', subsequent_indent='', expand_tabs=True,
replace_whitespace=True, fix_sentence_endings=False, break_long_words=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, drop_whitespace=True, break_on_hyphens=True, tabsize=8, *, max_lines=None,
placeholder=' [...]')''') placeholder=' [...]')''')
=======
drop_whitespace=True, break_on_hyphens=True, tabsize=8)''')
>>>>>>> other
def test_docline_truncation(self): def test_docline_truncation(self):
def f(): pass def f(): pass