summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2014-01-27 01:17:48 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2014-01-27 01:17:48 (GMT)
commit0902ce437def7c4af136d1100671b9221b7d63d1 (patch)
tree5569504fdb7efc061daa6001f7dfcc2a44777a53 /Lib
parentddc575888564ae010ecfcbcc413ef8eb19157051 (diff)
parenta4b6b5311482087afb2f0b1c0277878d19b75368 (diff)
downloadcpython-0902ce437def7c4af136d1100671b9221b7d63d1.zip
cpython-0902ce437def7c4af136d1100671b9221b7d63d1.tar.gz
cpython-0902ce437def7c4af136d1100671b9221b7d63d1.tar.bz2
Merge with 3.3
Diffstat (limited to 'Lib')
-rw-r--r--Lib/idlelib/idle_test/test_calltips.py4
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