[Python-checkins] r72195 - python/branches/py3k

[benjamin.peterson]

Author: benjamin.peterson
Date: Sat May  2 17:28:37 2009
New Revision: 72195

Log:
Blocked revisions 70443,70471,70702 via svnmerge

........
  r70443 | bob.ippolito | 2009-03-17 18:19:00 -0500 (Tue, 17 Mar 2009) | 1 line
  
  merge json library with simplejson 2.0.9 (issue 4136)
........
  r70471 | raymond.hettinger | 2009-03-19 14:19:03 -0500 (Thu, 19 Mar 2009) | 3 lines
  
  Issue 5381:  Add object_pairs_hook to the json module.
........
  r70702 | bob.ippolito | 2009-03-29 17:33:58 -0500 (Sun, 29 Mar 2009) | 1 line
  
  Issue 5381: fix regression in pure python code path, Issue 5584: fix a decoder bug for unicode float literals outside of a container
........


Modified:
   python/branches/py3k/   (props changed)