summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2015-04-04 06:47:31 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2015-04-04 06:47:31 (GMT)
commit9fa84b202e56ac9b240d34562efa458a05cbe3dc (patch)
tree38f0a6bfeca6cee5359dd589b80826bfe1ff358e
parent9f8a8910a415e31808debe6e9fed7f7c3638d42a (diff)
downloadcpython-9fa84b202e56ac9b240d34562efa458a05cbe3dc.zip
cpython-9fa84b202e56ac9b240d34562efa458a05cbe3dc.tar.gz
cpython-9fa84b202e56ac9b240d34562efa458a05cbe3dc.tar.bz2
Issue #23825: Fixed test_idle under -OO.
-rw-r--r--Lib/idlelib/idle_test/test_calltips.py19
1 files changed, 12 insertions, 7 deletions
diff --git a/Lib/idlelib/idle_test/test_calltips.py b/Lib/idlelib/idle_test/test_calltips.py
index 4ee15ae..b2a733c 100644
--- a/Lib/idlelib/idle_test/test_calltips.py
+++ b/Lib/idlelib/idle_test/test_calltips.py
@@ -52,7 +52,8 @@ class Get_signatureTest(unittest.TestCase):
def gtest(obj, out):
self.assertEqual(signature(obj), out)
- gtest(List, List.__doc__)
+ if List.__doc__ is not None:
+ gtest(List, List.__doc__)
gtest(list.__new__,
'Create and return a new object. See help(type) for accurate signature.')
gtest(list.__init__,
@@ -66,7 +67,8 @@ class Get_signatureTest(unittest.TestCase):
gtest(SB(), default_tip)
def test_signature_wrap(self):
- self.assertEqual(signature(textwrap.TextWrapper), '''\
+ if textwrap.TextWrapper.__doc__ is not None:
+ 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,
drop_whitespace=True, break_on_hyphens=True, tabsize=8, *, max_lines=None,
@@ -108,20 +110,23 @@ bytes() -> empty bytes object''')
def t5(a, b=None, *args, **kw): 'doc'
t5.tip = "(a, b=None, *args, **kw)"
+ doc = '\ndoc' if t1.__doc__ is not None else ''
for func in (t1, t2, t3, t4, t5, TC):
- self.assertEqual(signature(func), func.tip + '\ndoc')
+ self.assertEqual(signature(func), func.tip + doc)
def test_methods(self):
+ doc = '\ndoc' if TC.__doc__ is not None else ''
for meth in (TC.t1, TC.t2, TC.t3, TC.t4, TC.t5, TC.t6, TC.__call__):
- self.assertEqual(signature(meth), meth.tip + "\ndoc")
- self.assertEqual(signature(TC.cm), "(a)\ndoc")
- self.assertEqual(signature(TC.sm), "(b)\ndoc")
+ self.assertEqual(signature(meth), meth.tip + doc)
+ self.assertEqual(signature(TC.cm), "(a)" + doc)
+ self.assertEqual(signature(TC.sm), "(b)" + doc)
def test_bound_methods(self):
# test that first parameter is correctly removed from argspec
+ doc = '\ndoc' if TC.__doc__ is not None else ''
for meth, mtip in ((tc.t1, "()"), (tc.t4, "(*args)"), (tc.t6, "(self)"),
(tc.__call__, '(ci)'), (tc, '(ci)'), (TC.cm, "(a)"),):
- self.assertEqual(signature(meth), mtip + "\ndoc")
+ self.assertEqual(signature(meth), mtip + doc)
def test_starred_parameter(self):
# test that starred first parameter is *not* removed from argspec