diff options
| author | Georg Brandl <georg@python.org> | 2010-10-15 17:04:45 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-10-15 17:04:45 (GMT) |
| commit | db949b8fae924a852fc68fea9a01fc04fd868758 (patch) | |
| tree | 18dfa1c331aeca22a6850e47a6a7af7891294c99 /Lib/test/test_socket.py | |
| parent | 44c3ceb8aca1bc1bbb6de97a69fedfef360e590a (diff) | |
| download | cpython-db949b8fae924a852fc68fea9a01fc04fd868758.zip cpython-db949b8fae924a852fc68fea9a01fc04fd868758.tar.gz cpython-db949b8fae924a852fc68fea9a01fc04fd868758.tar.bz2 | |
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.
........
Diffstat (limited to 'Lib/test/test_socket.py')
0 files changed, 0 insertions, 0 deletions