5 Commits

Author	SHA1	Message	Date
Ezio Melotti	19f2aeba67	Merged revisions 86596 via svnmerge from ... svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r86596 | ezio.melotti | 2010-11-20 21:04:17 +0200 (Sat, 20 Nov 2010) | 1 line #9424: Replace deprecated assert* methods in the Python test suite. ........	2010-11-21 01:30:29 +00:00
Georg Brandl	ab91fdef1f	Merged revisions 73715 via svnmerge from ... svn+ssh://svn.python.org/python/branches/py3k ........ r73715 | benjamin.peterson | 2009-07-01 01:06:06 +0200 (Mi, 01 Jul 2009) | 1 line convert old fail* assertions to assert* ........	2009-08-13 08:51:18 +00:00
Benjamin Peterson	c6b607d4a9	port simplejson upgrade from the trunk #4136 ... json also now works only with unicode strings Patch by Antoine Pitrou; updated by me	2009-05-02 12:36:44 +00:00
Raymond Hettinger	0ad98d8509	Forward port r70471: Add object_pairs_hook. Issue 5381.	2009-04-21 03:09:17 +00:00
Christian Heimes	90540004d3	Merged revisions 62734,62736,62748,62769 via svnmerge from ... svn+ssh://pythondev@svn.python.org/python/trunk ........ r62734 | brett.cannon | 2008-05-05 22:21:38 +0200 (Mon, 05 May 2008) | 5 lines Add the 'json' package. Code taken from simplejson 1.9 and contributed by Bob Ippolito. Closes issue #2750. ........ r62736 | georg.brandl | 2008-05-05 22:53:39 +0200 (Mon, 05 May 2008) | 2 lines Fix JSON module docs. ........ r62748 | benjamin.peterson | 2008-05-06 04:51:10 +0200 (Tue, 06 May 2008) | 2 lines PEP 8 nits in json package ........ r62769 | christian.heimes | 2008-05-06 18:18:41 +0200 (Tue, 06 May 2008) | 2 lines Intern static string Use float constructors instead of magic code for float constants ........	2008-05-08 14:29:10 +00:00