Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merge with 3.3

This commit is contained in:
Terry Jan Reedy 2014-01-26 20:17:48 -05:00
parent ddc5758885 a4b6b53114
commit 0902ce437d
1 changed files with 4 additions and 0 deletions
Show Stats 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), '''\
(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