From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Mon, 27 Jan 2014 01:17:48 +0000 (-0500)
Subject: Merge with 3.3
X-Git-Tag: v3.4.0rc1~229^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0902ce437def7c4af136d1100671b9221b7d63d1;p=python

Merge with 3.3
---

0902ce437def7c4af136d1100671b9221b7d63d1
diff --cc Lib/idlelib/idle_test/test_calltips.py
index 4bf5e7e5dc,e71656b6ae..8edaf6b1ef
--- a/Lib/idlelib/idle_test/test_calltips.py
+++ b/Lib/idlelib/idle_test/test_calltips.py
@@@ -69,8 -69,7 +69,12 @@@ class Get_signatureTest(unittest.TestCa
          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