mirror of https://github.com/python/cpython
Merge with 3.3
This commit is contained in:
Terry Jan Reedy
commit
83b8105c64
|
|
@ -159,111 +159,6 @@ def get_argspec(ob):
|
|||
argspec = _default_callable_argspec
|
||||
return argspec
|
||||
|
||||
#################################################
|
||||
#
|
||||
# Test code tests CallTips.fetch_tip, get_entity, and get_argspec
|
||||
|
||||
def main():
|
||||
# Putting expected in docstrings results in doubled tips for test
|
||||
def t1(): "()"
|
||||
def t2(a, b=None): "(a, b=None)"
|
||||
def t3(a, *args): "(a, *args)"
|
||||
def t4(*args): "(*args)"
|
||||
def t5(a, b=None, *args, **kw): "(a, b=None, *args, **kw)"
|
||||
|
||||
class TC(object):
|
||||
"(ai=None, *b)"
|
||||
def __init__(self, ai=None, *b): "(self, ai=None, *b)"
|
||||
def t1(self): "(self)"
|
||||
def t2(self, ai, b=None): "(self, ai, b=None)"
|
||||
def t3(self, ai, *args): "(self, ai, *args)"
|
||||
def t4(self, *args): "(self, *args)"
|
||||
def t5(self, ai, b=None, *args, **kw): "(self, ai, b=None, *args, **kw)"
|
||||
def t6(no, self): "(no, self)"
|
||||
@classmethod
|
||||
def cm(cls, a): "(cls, a)"
|
||||
@staticmethod
|
||||
def sm(b): "(b)"
|
||||
def __call__(self, ci): "(self, ci)"
|
||||
|
||||
tc = TC()
|
||||
|
||||
# Python classes that inherit builtin methods
|
||||
class Int(int): "Int(x[, base]) -> integer"
|
||||
class List(list): "List() -> new empty list"
|
||||
# Simulate builtin with no docstring for default argspec test
|
||||
class SB: __call__ = None
|
||||
|
||||
__main__.__dict__.update(locals()) # required for get_entity eval()
|
||||
|
||||
num_tests = num_fail = 0
|
||||
tip = CallTips().fetch_tip
|
||||
|
||||
def test(expression, expected):
|
||||
nonlocal num_tests, num_fail
|
||||
num_tests += 1
|
||||
argspec = tip(expression)
|
||||
if argspec != expected:
|
||||
num_fail += 1
|
||||
fmt = "%s - expected\n%r\n - but got\n%r"
|
||||
print(fmt % (expression, expected, argspec))
|
||||
|
||||
def test_builtins():
|
||||
# if first line of a possibly multiline compiled docstring changes,
|
||||
# must change corresponding test string
|
||||
test('int', "int(x=0) -> integer")
|
||||
test('Int', Int.__doc__)
|
||||
test('types.MethodType', "method(function, instance)")
|
||||
test('list', "list() -> new empty list")
|
||||
test('List', List.__doc__)
|
||||
test('list.__new__',
|
||||
'T.__new__(S, ...) -> a new object with type S, a subtype of T')
|
||||
test('list.__init__',
|
||||
'x.__init__(...) initializes x; see help(type(x)) for signature')
|
||||
append_doc = "L.append(object) -> None -- append object to end"
|
||||
test('list.append', append_doc)
|
||||
test('[].append', append_doc)
|
||||
test('List.append', append_doc)
|
||||
test('SB()', _default_callable_argspec)
|
||||
|
||||
def test_funcs():
|
||||
for func in (t1, t2, t3, t4, t5, TC,):
|
||||
fdoc = func.__doc__
|
||||
test(func.__name__, fdoc + "\n" + fdoc)
|
||||
for func in (TC.t1, TC.t2, TC.t3, TC.t4, TC.t5, TC.t6, TC.sm,
|
||||
TC.__call__):
|
||||
fdoc = func.__doc__
|
||||
test('TC.'+func.__name__, fdoc + "\n" + fdoc)
|
||||
fdoc = TC.cm.__func__.__doc__
|
||||
test('TC.cm.__func__', fdoc + "\n" + fdoc)
|
||||
|
||||
def test_methods():
|
||||
# test that first parameter is correctly removed from argspec
|
||||
# using _first_param re to calculate expected masks re errors
|
||||
for meth, mdoc in ((tc.t1, "()"), (tc.t4, "(*args)"), (tc.t6, "(self)"),
|
||||
(TC.cm, "(a)"),):
|
||||
test('tc.'+meth.__name__, mdoc + "\n" + meth.__doc__)
|
||||
test('tc', "(ci)" + "\n" + tc.__call__.__doc__)
|
||||
# directly test that re works to delete unicode parameter name
|
||||
uni = "(A\u0391\u0410\u05d0\u0627\u0905\u1e00\u3042, a)" # various As
|
||||
assert _first_param.sub('', uni) == '(a)'
|
||||
|
||||
def test_non_callables():
|
||||
# expression evaluates, but not to a callable
|
||||
for expr in ('0', '0.0' 'num_tests', b'num_tests', '[]', '{}'):
|
||||
test(expr, '')
|
||||
# expression does not evaluate, but raises an exception
|
||||
for expr in ('1a', 'xyx', 'num_tests.xyz', '[int][1]', '{0:int}[1]'):
|
||||
test(expr, '')
|
||||
|
||||
test_builtins()
|
||||
test_funcs()
|
||||
test_non_callables()
|
||||
test_methods()
|
||||
|
||||
print("%d of %d tests failed" % (num_fail, num_tests))
|
||||
|
||||
if __name__ == '__main__':
|
||||
#main()
|
||||
from unittest import main
|
||||
main('idlelib.idle_test.test_calltips', verbosity=2, exit=False)
|
||||
|
|
|
|||
|
|
@ -1,5 +1,105 @@
|
|||
import unittest
|
||||
import idlelib.CallTips as ct
|
||||
import types
|
||||
|
||||
|
||||
# Test Class TC is used in multiple get_argspec test methods
|
||||
class TC():
|
||||
'doc'
|
||||
tip = "(ai=None, *b)"
|
||||
def __init__(self, ai=None, *b): 'doc'
|
||||
__init__.tip = "(self, ai=None, *b)"
|
||||
def t1(self): 'doc'
|
||||
t1.tip = "(self)"
|
||||
def t2(self, ai, b=None): 'doc'
|
||||
t2.tip = "(self, ai, b=None)"
|
||||
def t3(self, ai, *args): 'doc'
|
||||
t3.tip = "(self, ai, *args)"
|
||||
def t4(self, *args): 'doc'
|
||||
t4.tip = "(self, *args)"
|
||||
def t5(self, ai, b=None, *args, **kw): 'doc'
|
||||
t5.tip = "(self, ai, b=None, *args, **kw)"
|
||||
def t6(no, self): 'doc'
|
||||
t6.tip = "(no, self)"
|
||||
def __call__(self, ci): 'doc'
|
||||
__call__.tip = "(self, ci)"
|
||||
# attaching .tip to wrapped methods does not work
|
||||
@classmethod
|
||||
def cm(cls, a): 'doc'
|
||||
@staticmethod
|
||||
def sm(b): 'doc'
|
||||
|
||||
tc = TC()
|
||||
|
||||
signature = ct.get_argspec # 2.7 and 3.x use different functions
|
||||
class Get_signatureTest(unittest.TestCase):
|
||||
|
||||
def test_builtins(self):
|
||||
# Python class that inherits builtin methods
|
||||
class List(list): "List() doc"
|
||||
# Simulate builtin with no docstring for default argspec test
|
||||
class SB: __call__ = None
|
||||
|
||||
def gtest(obj, out):
|
||||
self.assertEqual(signature(obj), out)
|
||||
|
||||
gtest(list, "list() -> new empty list")
|
||||
gtest(List, List.__doc__)
|
||||
gtest(list.__new__,
|
||||
'T.__new__(S, ...) -> a new object with type S, a subtype of T')
|
||||
gtest(list.__init__,
|
||||
'x.__init__(...) initializes x; see help(type(x)) for signature')
|
||||
append_doc = "L.append(object) -> None -- append object to end"
|
||||
gtest(list.append, append_doc)
|
||||
gtest([].append, append_doc)
|
||||
gtest(List.append, append_doc)
|
||||
|
||||
gtest(types.MethodType, "method(function, instance)")
|
||||
gtest(SB(), ct._default_callable_argspec)
|
||||
|
||||
def test_functions(self):
|
||||
def t1(): 'doc'
|
||||
t1.tip = "()"
|
||||
def t2(a, b=None): 'doc'
|
||||
t2.tip = "(a, b=None)"
|
||||
def t3(a, *args): 'doc'
|
||||
t3.tip = "(a, *args)"
|
||||
def t4(*args): 'doc'
|
||||
t4.tip = "(*args)"
|
||||
def t5(a, b=None, *args, **kw): 'doc'
|
||||
t5.tip = "(a, b=None, *args, **kw)"
|
||||
|
||||
for func in (t1, t2, t3, t4, t5, TC):
|
||||
self.assertEqual(signature(func), func.tip + '\ndoc')
|
||||
|
||||
def test_methods(self):
|
||||
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")
|
||||
|
||||
def test_bound_methods(self):
|
||||
# test that first parameter is correctly removed from argspec
|
||||
# using _first_param re to calculate expected masks re errors
|
||||
for meth, mtip in ((tc.t1, "()"), (tc.t4, "(*args)"), (tc.t6, "(self)"),
|
||||
(TC.cm, "(a)"),):
|
||||
self.assertEqual(signature(meth), mtip + "\ndoc")
|
||||
self.assertEqual(signature(tc), "(ci)\ndoc")
|
||||
# directly test that re works to delete first parameter even when it
|
||||
# non-ascii chars, such as various forms of A.
|
||||
uni = "(A\u0391\u0410\u05d0\u0627\u0905\u1e00\u3042, a)"
|
||||
assert ct._first_param.sub('', uni) == '(a)'
|
||||
|
||||
def test_no_docstring(self):
|
||||
def nd(s): pass
|
||||
TC.nd = nd
|
||||
self.assertEqual(signature(nd), "(s)")
|
||||
self.assertEqual(signature(TC.nd), "(s)")
|
||||
self.assertEqual(signature(tc.nd), "()")
|
||||
|
||||
def test_non_callables(self):
|
||||
for obj in (0, 0.0, '0', b'0', [], {}):
|
||||
self.assertEqual(signature(obj), '')
|
||||
|
||||
class Get_entityTest(unittest.TestCase):
|
||||
def test_bad_entity(self):
|
||||
|
|
|
|||
Loading…
Reference in New Issue