The change of type(None).__name__ from 'None' to 'NoneType' broke this

test in a trivial way.  Fixed.

diff --git a/Lib/test/output/test_extcall b/Lib/test/output/test_extcall
index 24e8c8c72b43222f5a82e766a3281150880a7842..86da35281590ef6582c5578e736e56a091a93e1b 100644 (file)
--- a/Lib/test/output/test_extcall
+++ b/Lib/test/output/test_extcall
@@ -26,10 +26,10 @@ f() keywords must be strings
 h() got an unexpected keyword argument 'e'
 h() argument after * must be a sequence
 dir() argument after * must be a sequence
-None object argument after * must be a sequence
+NoneType object argument after * must be a sequence
 h() argument after ** must be a dictionary
 dir() argument after ** must be a dictionary
-None object argument after ** must be a dictionary
+NoneType object argument after ** must be a dictionary
 dir() got multiple values for keyword argument 'b'
 3 512 1
 3

diff --git a/Lib/test/test_generators.py b/Lib/test/test_generators.py
index 41629d352741dfa9baadf29f0e79b6356c395d8e..947e26f4b6d8e8ea7686ca03a13e5d8ebf706932 100644 (file)
--- a/Lib/test/test_generators.py
+++ b/Lib/test/test_generators.py
@@ -780,7 +780,7 @@ SyntaxError: invalid syntax
 ...             yield 1
 ...
 >>> type(f())
-<type 'None'>
+<type 'NoneType'>
 
 >>> def f():
 ...     if 0:
@@ -790,7 +790,7 @@ SyntaxError: invalid syntax
 ...             def f(self):
 ...                 yield 2
 >>> type(f())
-<type 'None'>
+<type 'NoneType'>
 
 >>> def f():
 ...     if 0: