Merge #16057: Clarify why the base method default is called in custom encoders.

author R David Murray <rdmurray@bitdance.com>

Mon, 18 Mar 2013 01:53:48 +0000 (21:53 -0400)

committer R David Murray <rdmurray@bitdance.com>

Mon, 18 Mar 2013 01:53:48 +0000 (21:53 -0400)
author R David Murray <rdmurray@bitdance.com>
Mon, 18 Mar 2013 01:53:48 +0000 (21:53 -0400)
committer R David Murray <rdmurray@bitdance.com>
Mon, 18 Mar 2013 01:53:48 +0000 (21:53 -0400)
diff --cc Doc/library/json.rst
Simple merge
diff --cc Lib/json/encoder.py
Simple merge
author	R David Murray <rdmurray@bitdance.com>
	Mon, 18 Mar 2013 01:53:48 +0000 (21:53 -0400)
committer	R David Murray <rdmurray@bitdance.com>
	Mon, 18 Mar 2013 01:53:48 +0000 (21:53 -0400)
		1	2
Doc/library/json.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Lib/json/encoder.py	patch \|	diff1 \|	diff2 \|	blob \| history