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
........
This commit is contained in:
Christian Heimes 2008-05-08 14:29:10 +00:00
parent c848655eb0
commit 90540004d3
33 changed files with 2854 additions and 1 deletions

View file

@ -1006,6 +1006,10 @@
RelativePath="..\Modules\_heapqmodule.c"
>
</File>
<File
RelativePath="..\Modules\_json.c"
>
</File>
<File
RelativePath="..\Modules\_localemodule.c"
>