[Python-checkins] CVS: python/dist/src/Lib/test/output test_unicode_file,NONE,1.1.4.1 test_coercion,1.3,1.3.6.1 test_cookie,1.6,1.6.4.1 test_extcall,1.8,1.8.4.1 test_minidom,1.12,1.12.6.1 test_pyexpat,1.6,1.6.6.1 test_scope,1.6,1.6.4.1 test_copy_reg,1.1,NONE test_descr,1.1.2.1,NONE test_difflib,1.2,NONE test_doctest,1.5,NONE test_dospath,1.1,NONE test_mailbox,1.1,NONE test_parser,1.4,NONE test_sha,1.1,NONE test_strop,1.2,NONE

Tim Peters tim_one@users.sourceforge.net
Sat, 07 Jul 2001 15:55:31 -0700


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

Modified Files:
      Tag: descr-branch
	test_coercion test_cookie test_extcall test_minidom 
	test_pyexpat test_scope 
Added Files:
      Tag: descr-branch
	test_unicode_file 
Removed Files:
      Tag: descr-branch
	test_copy_reg test_descr test_difflib test_doctest 
	test_dospath test_mailbox test_parser test_sha test_strop 
Log Message:
Merge of trunk tag date2001-07-06 into descr-branch.


--- NEW FILE: test_unicode_file ---
test_unicode_file
All the Unicode tests appeared to work

Index: test_coercion
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/output/test_coercion,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -C2 -r1.3 -r1.3.6.1
*** test_coercion	2001/01/04 01:36:25	1.3
--- test_coercion	2001/07/07 22:55:29	1.3.6.1
***************
*** 517,521 ****
  [1] %= None ... exceptions.TypeError
  [1] + <MethodNumber 1> ... exceptions.TypeError
! [1] += <MethodNumber 1> ... exceptions.AttributeError
  [1] - <MethodNumber 1> ... exceptions.TypeError
  [1] -= <MethodNumber 1> ... exceptions.TypeError
--- 517,521 ----
  [1] %= None ... exceptions.TypeError
  [1] + <MethodNumber 1> ... exceptions.TypeError
! [1] += <MethodNumber 1> ... exceptions.TypeError
  [1] - <MethodNumber 1> ... exceptions.TypeError
  [1] -= <MethodNumber 1> ... exceptions.TypeError
***************
*** 529,533 ****
  [1] %= <MethodNumber 1> ... exceptions.TypeError
  [1] + <CoerceNumber 2> ... exceptions.TypeError
! [1] += <CoerceNumber 2> ... exceptions.AttributeError
  [1] - <CoerceNumber 2> ... exceptions.TypeError
  [1] -= <CoerceNumber 2> ... exceptions.TypeError
--- 529,533 ----
  [1] %= <MethodNumber 1> ... exceptions.TypeError
  [1] + <CoerceNumber 2> ... exceptions.TypeError
! [1] += <CoerceNumber 2> ... exceptions.TypeError
  [1] - <CoerceNumber 2> ... exceptions.TypeError
  [1] -= <CoerceNumber 2> ... exceptions.TypeError

Index: test_cookie
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/output/test_cookie,v
retrieving revision 1.6
retrieving revision 1.6.4.1
diff -C2 -r1.6 -r1.6.4.1
*** test_cookie	2001/04/06 21:20:58	1.6
--- test_cookie	2001/07/07 22:55:29	1.6.4.1
***************
*** 1,10 ****
  test_cookie
! <SimpleCookie: vienna='finger' chips='ahoy'>
! Set-Cookie: vienna=finger;
  Set-Cookie: chips=ahoy;
-   vienna 'finger' 'finger'
  Set-Cookie: vienna=finger;
    chips 'ahoy' 'ahoy'
  Set-Cookie: chips=ahoy;
  <SimpleCookie: keebler='E=mc2; L="Loves"; fudge=\n;'>
  Set-Cookie: keebler="E=mc2; L=\"Loves\"; fudge=\012;";
--- 1,10 ----
  test_cookie
! <SimpleCookie: chips='ahoy' vienna='finger'>
  Set-Cookie: chips=ahoy;
  Set-Cookie: vienna=finger;
    chips 'ahoy' 'ahoy'
  Set-Cookie: chips=ahoy;
+   vienna 'finger' 'finger'
+ Set-Cookie: vienna=finger;
  <SimpleCookie: keebler='E=mc2; L="Loves"; fudge=\n;'>
  Set-Cookie: keebler="E=mc2; L=\"Loves\"; fudge=\012;";

Index: test_extcall
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/output/test_extcall,v
retrieving revision 1.8
retrieving revision 1.8.4.1
diff -C2 -r1.8 -r1.8.4.1
*** test_extcall	2001/04/11 13:53:35	1.8
--- test_extcall	2001/07/07 22:55:29	1.8.4.1
***************
*** 41,45 ****
  za () {'d': 'dd'} -> za() got an unexpected keyword argument 'd'
  za () {'a': 'aa', 'd': 'dd'} -> za() got an unexpected keyword argument 'd'
! za () {'a': 'aa', 'b': 'bb', 'd': 'dd', 'e': 'ee'} -> 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)
--- 41,45 ----
  za () {'d': 'dd'} -> za() got an unexpected keyword argument 'd'
  za () {'a': 'aa', 'd': 'dd'} -> za() got an unexpected keyword argument 'd'
! za () {'a': 'aa', 'b': 'bb', 'd': 'dd', 'e': 'ee'} -> za() got an unexpected keyword argument 'b'
  za (1, 2) {} -> za() takes exactly 1 argument (2 given)
  za (1, 2) {'a': 'aa'} -> za() takes exactly 1 non-keyword argument (2 given)
***************
*** 60,65 ****
  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) {'a': 'aa', 'd': 'dd'} -> zade() got multiple values for keyword argument 'd'
! zade (1, 2) {'a': 'aa', 'b': 'bb', 'd': 'dd', 'e': 'ee'} -> 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)
--- 60,65 ----
  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) {'a': 'aa', 'd': 'dd'} -> zade() got multiple values for keyword argument 'a'
! zade (1, 2) {'a': 'aa', 'b': 'bb', 'd': 'dd', 'e': 'ee'} -> zade() got multiple values for keyword argument 'a'
  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)
***************
*** 76,80 ****
  zabk (1, 2) {'d': 'dd'} -> ok zabk 1 2 D E V {'d': 'dd'}
  zabk (1, 2) {'a': 'aa', 'd': 'dd'} -> zabk() got multiple values for keyword argument 'a'
! zabk (1, 2) {'a': 'aa', 'b': 'bb', 'd': 'dd', 'e': 'ee'} -> 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)
--- 76,80 ----
  zabk (1, 2) {'d': 'dd'} -> ok zabk 1 2 D E V {'d': 'dd'}
  zabk (1, 2) {'a': 'aa', 'd': 'dd'} -> zabk() got multiple values for keyword argument 'a'
! zabk (1, 2) {'a': 'aa', 'b': 'bb', 'd': 'dd', 'e': 'ee'} -> zabk() got multiple values for keyword argument 'a'
  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)
***************
*** 91,100 ****
  zabdv (1, 2) {'d': 'dd'} -> ok zabdv 1 2 dd E () d
  zabdv (1, 2) {'a': 'aa', 'd': 'dd'} -> zabdv() got multiple values for keyword argument 'a'
! zabdv (1, 2) {'a': 'aa', 'b': 'bb', 'd': 'dd', 'e': 'ee'} -> 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) {'a': 'aa', 'd': 'dd'} -> zabdv() got multiple values for keyword argument 'd'
! zabdv (1, 2, 3, 4, 5) {'a': 'aa', 'b': 'bb', 'd': 'dd', 'e': 'ee'} -> 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)
--- 91,100 ----
  zabdv (1, 2) {'d': 'dd'} -> ok zabdv 1 2 dd E () d
  zabdv (1, 2) {'a': 'aa', 'd': 'dd'} -> zabdv() got multiple values for keyword argument 'a'
! zabdv (1, 2) {'a': 'aa', 'b': 'bb', 'd': 'dd', 'e': 'ee'} -> zabdv() got multiple values for keyword argument 'a'
  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) {'a': 'aa', 'd': 'dd'} -> zabdv() got multiple values for keyword argument 'a'
! zabdv (1, 2, 3, 4, 5) {'a': 'aa', 'b': 'bb', 'd': 'dd', 'e': 'ee'} -> zabdv() got multiple values for keyword argument 'a'
  zabdevk () {} -> zabdevk() takes at least 2 arguments (0 given)
  zabdevk () {'a': 'aa'} -> zabdevk() takes at least 2 non-keyword arguments (1 given)
***************
*** 106,113 ****
  zabdevk (1, 2) {'d': 'dd'} -> ok zabdevk 1 2 dd e () {}
  zabdevk (1, 2) {'a': 'aa', 'd': 'dd'} -> zabdevk() got multiple values for keyword argument 'a'
! zabdevk (1, 2) {'a': 'aa', 'b': 'bb', 'd': 'dd', 'e': 'ee'} -> 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) {'a': 'aa', 'd': 'dd'} -> zabdevk() got multiple values for keyword argument 'd'
! zabdevk (1, 2, 3, 4, 5) {'a': 'aa', 'b': 'bb', 'd': 'dd', 'e': 'ee'} -> zabdevk() got multiple values for keyword argument 'd'
--- 106,113 ----
  zabdevk (1, 2) {'d': 'dd'} -> ok zabdevk 1 2 dd e () {}
  zabdevk (1, 2) {'a': 'aa', 'd': 'dd'} -> zabdevk() got multiple values for keyword argument 'a'
! zabdevk (1, 2) {'a': 'aa', 'b': 'bb', 'd': 'dd', 'e': 'ee'} -> zabdevk() got multiple values for keyword argument 'a'
  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) {'a': 'aa', 'd': 'dd'} -> zabdevk() got multiple values for keyword argument 'a'
! zabdevk (1, 2, 3, 4, 5) {'a': 'aa', 'b': 'bb', 'd': 'dd', 'e': 'ee'} -> zabdevk() got multiple values for keyword argument 'a'

Index: test_minidom
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/output/test_minidom,v
retrieving revision 1.12
retrieving revision 1.12.6.1
diff -C2 -r1.12 -r1.12.6.1
*** test_minidom	2000/12/31 04:03:27	1.12
--- test_minidom	2001/07/07 22:55:29	1.12.6.1
***************
*** 111,114 ****
--- 111,115 ----
  Test Succeeded testGetElementsByTagName
  Passed assertion: len(Node.allnodes) == 0
+ Passed Test
  Test Succeeded testGetElementsByTagNameNS
  Passed assertion: len(Node.allnodes) == 0

Index: test_pyexpat
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/output/test_pyexpat,v
retrieving revision 1.6
retrieving revision 1.6.6.1
diff -C2 -r1.6 -r1.6.6.1
*** test_pyexpat	2001/01/24 21:46:18	1.6
--- test_pyexpat	2001/07/07 22:55:29	1.6.6.1
***************
*** 4,7 ****
--- 4,15 ----
  OK.
  OK.
+ OK.
+ OK.
+ OK.
+ OK.
+ OK.
+ OK.
+ OK.
+ OK.
  PI:
  	'xml-stylesheet' 'href="stylesheet.css"'
***************
*** 100,104 ****
  ParserCreate() argument 2 must be string or None, not int
  Caught expected ValueError:
! namespace_separator must be one character, omitted, or None
! Caught expected ValueError:
! namespace_separator must be one character, omitted, or None
--- 108,110 ----
  ParserCreate() argument 2 must be string or None, not int
  Caught expected ValueError:
! namespace_separator must be at most one character, omitted, or None

Index: test_scope
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/output/test_scope,v
retrieving revision 1.6
retrieving revision 1.6.4.1
diff -C2 -r1.6 -r1.6.4.1
*** test_scope	2001/03/21 16:44:39	1.6
--- test_scope	2001/07/07 22:55:29	1.6.4.1
***************
*** 18,19 ****
--- 18,21 ----
  17. class and global
  18. verify that locals() works
+ 19. var is bound and free in class
+ 20. interaction with trace function

--- test_copy_reg DELETED ---

--- test_descr DELETED ---

--- test_difflib DELETED ---

--- test_doctest DELETED ---

--- test_dospath DELETED ---

--- test_mailbox DELETED ---

--- test_parser DELETED ---

--- test_sha DELETED ---

--- test_strop DELETED ---