merge #14638: pydoc now treats non-str __name__ as None instead of raising

author R David Murray <rdmurray@bitdance.com>

Mon, 23 Apr 2012 17:26:44 +0000 (13:26 -0400)

committer R David Murray <rdmurray@bitdance.com>

Mon, 23 Apr 2012 17:26:44 +0000 (13:26 -0400)
author R David Murray <rdmurray@bitdance.com>
Mon, 23 Apr 2012 17:26:44 +0000 (13:26 -0400)
committer R David Murray <rdmurray@bitdance.com>
Mon, 23 Apr 2012 17:26:44 +0000 (13:26 -0400)
diff --cc Lib/pydoc.py
Simple merge
diff --cc Lib/test/test_pydoc.py
Simple merge
diff --cc Misc/NEWS
Simple merge
author	R David Murray <rdmurray@bitdance.com>
	Mon, 23 Apr 2012 17:26:44 +0000 (13:26 -0400)
committer	R David Murray <rdmurray@bitdance.com>
	Mon, 23 Apr 2012 17:26:44 +0000 (13:26 -0400)
		1	2
Lib/pydoc.py	patch \|	diff1 \|	diff2 \|	blob \| history
Lib/test/test_pydoc.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history