]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
projects / thirdparty / Python / cpython.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5a948a7 1f2a49c)
Merge #16057: Clarify why the base method default is called in custom encoders.
authorR David Murray <rdmurray@bitdance.com>
Mon, 18 Mar 2013 01:53:48 +0000 (21:53 -0400)
committerR David Murray <rdmurray@bitdance.com>
Mon, 18 Mar 2013 01:53:48 +0000 (21:53 -0400)
Original patch by Kushal Das.

1  2 
Doc/library/json.rst patch | diff1 | diff2 | blob | history
Lib/json/encoder.py patch | diff1 | diff2 | blob | history

diff --cc Doc/library/json.rst
Simple merge
diff --cc Lib/json/encoder.py
Simple merge
Mirror of https://github.com/python/cpython.git