5 commits

Author	SHA1	Message	Date
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
Benjamin Peterson	a13d475901	merge r66932 and add a few py3k only checks	2008-10-16 21:17:24 +00:00
Antoine Pitrou	fd036451bf	#2834: Change re module semantics, so that str and bytes mixing is forbidden, ... and str (unicode) patterns get full unicode matching by default. The re.ASCII flag is also introduced to ask for ASCII matching instead.	2008-08-19 17:56:33 +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