| commit | db949b8fae924a852fc68fea9a01fc04fd868758 | [log] [tgz] |
|---|---|---|
| author | Georg Brandl <georg@python.org> | Fri Oct 15 17:04:45 2010 +0000 |
| committer | Georg Brandl <georg@python.org> | Fri Oct 15 17:04:45 2010 +0000 |
| tree | 18dfa1c331aeca22a6850e47a6a7af7891294c99 | |
| parent | 44c3ceb8aca1bc1bbb6de97a69fedfef360e590a [diff] |
Recorded merge of revisions 85543 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r85543 | georg.brandl | 2010-10-15 19:03:02 +0200 (Fr, 15 Okt 2010) | 1 line #4785: document strict argument of JSONDecoder, plus add object_pairs_hook in the docstrings. ........