[Python-checkins] CVS: python/dist/src/Lib/test/output test_extcall,1.5,1.6 test_pyexpat,1.4,1.5

[Ka-Ping Yee]

Update of /cvsroot/python/python/dist/src/Lib/test/output
In directory usw-pr-cvs1:/tmp/cvs-serv31281/Lib/test/output

Modified Files:
	test_extcall test_pyexpat 
Log Message:
This patch makes sure that the function name always appears in the error
message, and tries to make the messages more consistent and helpful when
the wrong number of arguments or duplicate keyword arguments are supplied.
Comes with more tests for test_extcall.py and and an update to an error
message in test/output/test_pyexpat.


Index: test_extcall
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/output/test_extcall,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** test_extcall	2000/10/30 19:41:33	1.5
--- test_extcall	2001/01/15 22:14:16	1.6
***************
*** 10,16 ****
  (1, 2, 3, 4, 5) {'b': 7, 'a': 6}
  (1, 2, 3, 6, 7) {'y': 5, 'b': 9, 'x': 4, 'a': 8}
! TypeError: not enough arguments to g(); expected 1, got 0
! TypeError: not enough arguments to g(); expected 1, got 0
! TypeError: not enough arguments to g(); expected 1, got 0
  1 () {}
  1 (2,) {}
--- 10,16 ----
  (1, 2, 3, 4, 5) {'b': 7, 'a': 6}
  (1, 2, 3, 6, 7) {'y': 5, 'b': 9, 'x': 4, 'a': 8}
! TypeError: g() takes at least 1 argument (0 given)
! TypeError: g() takes at least 1 argument (0 given)
! TypeError: g() takes at least 1 argument (0 given)
  1 () {}
  1 (2,) {}
***************
*** 21,33 ****
  {'b': 2, 'c': 3, 'a': 1}
  {'b': 2, 'c': 3, 'a': 1}
! keyword parameter 'x' redefined in call to g()
! keyword parameter 'b' redefined in function call
! keywords must be strings
  h() got an unexpected keyword argument 'e'
! * argument must be a sequence
! ** argument must be a dictionary
  3 512 1
  3
  3
! unbound method must be called with instance as first argument
! unbound method must be called with instance as first argument
--- 21,108 ----
  {'b': 2, 'c': 3, 'a': 1}
  {'b': 2, 'c': 3, 'a': 1}
! g() got multiple values for keyword argument 'x'
! g() got multiple values for keyword argument 'b'
! f() keywords must be strings
  h() got an unexpected keyword argument 'e'
! h() argument after * must be a sequence
! h() argument after ** must be a dictionary
  3 512 1
  3
  3
! unbound method method() must be called with instance as first argument
! unbound method method() must be called with instance as first argument
! za () {} -> za() takes exactly 1 argument (0 given)
! za () {'a': 'aa'} -> ok za aa B D E V a
! za () {'d': 'dd'} -> za() got an unexpected keyword argument 'd'
! za () {'d': 'dd', 'a': 'aa'} -> za() got an unexpected keyword argument 'd'
! za () {'d': 'dd', 'e': 'ee', 'b': 'bb', 'a': 'aa'} -> za() got an unexpected keyword argument 'd'
! za (1, 2) {} -> za() takes exactly 1 argument (2 given)
! za (1, 2) {'a': 'aa'} -> za() takes exactly 1 non-keyword argument (2 given)
! za (1, 2) {'d': 'dd'} -> za() takes exactly 1 non-keyword argument (2 given)
! za (1, 2) {'d': 'dd', 'a': 'aa'} -> za() takes exactly 1 non-keyword argument (2 given)
! za (1, 2) {'d': 'dd', 'e': 'ee', 'b': 'bb', 'a': 'aa'} -> za() takes exactly 1 non-keyword argument (2 given)
! za (1, 2, 3, 4, 5) {} -> za() takes exactly 1 argument (5 given)
! za (1, 2, 3, 4, 5) {'a': 'aa'} -> za() takes exactly 1 non-keyword argument (5 given)
! za (1, 2, 3, 4, 5) {'d': 'dd'} -> za() takes exactly 1 non-keyword argument (5 given)
! za (1, 2, 3, 4, 5) {'d': 'dd', 'a': 'aa'} -> za() takes exactly 1 non-keyword argument (5 given)
! za (1, 2, 3, 4, 5) {'d': 'dd', 'e': 'ee', 'b': 'bb', 'a': 'aa'} -> za() takes exactly 1 non-keyword argument (5 given)
! zade () {} -> zade() takes at least 1 argument (0 given)
! zade () {'a': 'aa'} -> ok zade aa B d e V a
! zade () {'d': 'dd'} -> zade() takes at least 1 non-keyword argument (0 given)
! zade () {'d': 'dd', 'a': 'aa'} -> ok zade aa B dd e V d
! zade () {'d': 'dd', 'e': 'ee', 'b': 'bb', 'a': 'aa'} -> zade() got an unexpected keyword argument 'b'
! zade (1, 2) {} -> ok zade 1 B 2 e V e
! zade (1, 2) {'a': 'aa'} -> zade() got multiple values for keyword argument 'a'
! zade (1, 2) {'d': 'dd'} -> zade() got multiple values for keyword argument 'd'
! zade (1, 2) {'d': 'dd', 'a': 'aa'} -> zade() got multiple values for keyword argument 'd'
! zade (1, 2) {'d': 'dd', 'e': 'ee', 'b': 'bb', 'a': 'aa'} -> zade() got multiple values for keyword argument 'd'
! zade (1, 2, 3, 4, 5) {} -> zade() takes at most 3 arguments (5 given)
! zade (1, 2, 3, 4, 5) {'a': 'aa'} -> zade() takes at most 3 non-keyword arguments (5 given)
! zade (1, 2, 3, 4, 5) {'d': 'dd'} -> zade() takes at most 3 non-keyword arguments (5 given)
! zade (1, 2, 3, 4, 5) {'d': 'dd', 'a': 'aa'} -> zade() takes at most 3 non-keyword arguments (5 given)
! zade (1, 2, 3, 4, 5) {'d': 'dd', 'e': 'ee', 'b': 'bb', 'a': 'aa'} -> zade() takes at most 3 non-keyword arguments (5 given)
! zabk () {} -> zabk() takes exactly 2 arguments (0 given)
! zabk () {'a': 'aa'} -> zabk() takes exactly 2 non-keyword arguments (1 given)
! zabk () {'d': 'dd'} -> zabk() takes exactly 2 non-keyword arguments (0 given)
! zabk () {'d': 'dd', 'a': 'aa'} -> zabk() takes exactly 2 non-keyword arguments (1 given)
! zabk () {'d': 'dd', 'e': 'ee', 'b': 'bb', 'a': 'aa'} -> ok zabk aa bb D E V {'d': 'dd', 'e': 'ee'}
! zabk (1, 2) {} -> ok zabk 1 2 D E V {}
! zabk (1, 2) {'a': 'aa'} -> zabk() got multiple values for keyword argument 'a'
! zabk (1, 2) {'d': 'dd'} -> ok zabk 1 2 D E V {'d': 'dd'}
! zabk (1, 2) {'d': 'dd', 'a': 'aa'} -> zabk() got multiple values for keyword argument 'a'
! zabk (1, 2) {'d': 'dd', 'e': 'ee', 'b': 'bb', 'a': 'aa'} -> zabk() got multiple values for keyword argument 'b'
! zabk (1, 2, 3, 4, 5) {} -> zabk() takes exactly 2 arguments (5 given)
! zabk (1, 2, 3, 4, 5) {'a': 'aa'} -> zabk() takes exactly 2 non-keyword arguments (5 given)
! zabk (1, 2, 3, 4, 5) {'d': 'dd'} -> zabk() takes exactly 2 non-keyword arguments (5 given)
! zabk (1, 2, 3, 4, 5) {'d': 'dd', 'a': 'aa'} -> zabk() takes exactly 2 non-keyword arguments (5 given)
! zabk (1, 2, 3, 4, 5) {'d': 'dd', 'e': 'ee', 'b': 'bb', 'a': 'aa'} -> zabk() takes exactly 2 non-keyword arguments (5 given)
! zabdv () {} -> zabdv() takes at least 2 arguments (0 given)
! zabdv () {'a': 'aa'} -> zabdv() takes at least 2 non-keyword arguments (1 given)
! zabdv () {'d': 'dd'} -> zabdv() takes at least 2 non-keyword arguments (0 given)
! zabdv () {'d': 'dd', 'a': 'aa'} -> zabdv() takes at least 2 non-keyword arguments (1 given)
! zabdv () {'d': 'dd', 'e': 'ee', 'b': 'bb', 'a': 'aa'} -> zabdv() got an unexpected keyword argument 'e'
! zabdv (1, 2) {} -> ok zabdv 1 2 d E () e
! zabdv (1, 2) {'a': 'aa'} -> zabdv() got multiple values for keyword argument 'a'
! zabdv (1, 2) {'d': 'dd'} -> ok zabdv 1 2 dd E () d
! zabdv (1, 2) {'d': 'dd', 'a': 'aa'} -> zabdv() got multiple values for keyword argument 'a'
! zabdv (1, 2) {'d': 'dd', 'e': 'ee', 'b': 'bb', 'a': 'aa'} -> zabdv() got an unexpected keyword argument 'e'
! zabdv (1, 2, 3, 4, 5) {} -> ok zabdv 1 2 3 E (4, 5) e
! zabdv (1, 2, 3, 4, 5) {'a': 'aa'} -> zabdv() got multiple values for keyword argument 'a'
! zabdv (1, 2, 3, 4, 5) {'d': 'dd'} -> zabdv() got multiple values for keyword argument 'd'
! zabdv (1, 2, 3, 4, 5) {'d': 'dd', 'a': 'aa'} -> zabdv() got multiple values for keyword argument 'd'
! zabdv (1, 2, 3, 4, 5) {'d': 'dd', 'e': 'ee', 'b': 'bb', 'a': 'aa'} -> zabdv() got multiple values for keyword argument 'd'
! zabdevk () {} -> zabdevk() takes at least 2 arguments (0 given)
! zabdevk () {'a': 'aa'} -> zabdevk() takes at least 2 non-keyword arguments (1 given)
! zabdevk () {'d': 'dd'} -> zabdevk() takes at least 2 non-keyword arguments (0 given)
! zabdevk () {'d': 'dd', 'a': 'aa'} -> zabdevk() takes at least 2 non-keyword arguments (1 given)
! zabdevk () {'d': 'dd', 'e': 'ee', 'b': 'bb', 'a': 'aa'} -> ok zabdevk aa bb dd ee () {}
! zabdevk (1, 2) {} -> ok zabdevk 1 2 d e () {}
! zabdevk (1, 2) {'a': 'aa'} -> zabdevk() got multiple values for keyword argument 'a'
! zabdevk (1, 2) {'d': 'dd'} -> ok zabdevk 1 2 dd e () {}
! zabdevk (1, 2) {'d': 'dd', 'a': 'aa'} -> zabdevk() got multiple values for keyword argument 'a'
! zabdevk (1, 2) {'d': 'dd', 'e': 'ee', 'b': 'bb', 'a': 'aa'} -> zabdevk() got multiple values for keyword argument 'b'
! zabdevk (1, 2, 3, 4, 5) {} -> ok zabdevk 1 2 3 4 (5,) {}
! zabdevk (1, 2, 3, 4, 5) {'a': 'aa'} -> zabdevk() got multiple values for keyword argument 'a'
! zabdevk (1, 2, 3, 4, 5) {'d': 'dd'} -> zabdevk() got multiple values for keyword argument 'd'
! zabdevk (1, 2, 3, 4, 5) {'d': 'dd', 'a': 'aa'} -> zabdevk() got multiple values for keyword argument 'd'
! zabdevk (1, 2, 3, 4, 5) {'d': 'dd', 'e': 'ee', 'b': 'bb', 'a': 'aa'} -> zabdevk() got multiple values for keyword argument 'd'

Index: test_pyexpat
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/output/test_pyexpat,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** test_pyexpat	2000/12/23 22:12:07	1.4
--- test_pyexpat	2001/01/15 22:14:16	1.5
***************
*** 98,102 ****
  Legal values tested o.k.
  Caught expected TypeError:
! ParserCreate, argument 2: expected string or None, int found
  Caught expected ValueError:
  namespace_separator must be one character, omitted, or None
--- 98,102 ----
  Legal values tested o.k.
  Caught expected TypeError:
! ParserCreate() argument 2 must be string or None, not int
  Caught expected ValueError:
  namespace_separator must be one character, omitted, or None