]> git.ipfire.org Git - thirdparty/Python/cpython.git/commit
projects / thirdparty / Python / cpython.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c848655) | patch
Merged revisions 62734,62736,62748,62769 via svnmerge from
authorChristian Heimes <christian@cheimes.de>
Thu, 8 May 2008 14:29:10 +0000 (14:29 +0000)
committerChristian Heimes <christian@cheimes.de>
Thu, 8 May 2008 14:29:10 +0000 (14:29 +0000)
commit90540004d3e1cbc0bd5595838bca3d1970198120
tree9006c98a1c71cf39761d3eb35d4c227540b24947tree | snapshot
parentc848655eb05c38f9c31bca0df87f2013670a1efacommit | diff
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
........
33 files changed:
Doc/library/json.rst [new file with mode: 0644] blob
Doc/library/netdata.rst diff | blob | blame | history
Doc/whatsnew/2.6.rst diff | blob | blame | history
Lib/json/__init__.py [new file with mode: 0644] blob
Lib/json/decoder.py [new file with mode: 0644] blob
Lib/json/encoder.py [new file with mode: 0644] blob
Lib/json/scanner.py [new file with mode: 0644] blob
Lib/json/tests/__init__.py [new file with mode: 0644] blob
Lib/json/tests/test_decode.py [new file with mode: 0644] blob
Lib/json/tests/test_default.py [new file with mode: 0644] blob
Lib/json/tests/test_dump.py [new file with mode: 0644] blob
Lib/json/tests/test_encode_basestring_ascii.py [new file with mode: 0644] blob
Lib/json/tests/test_fail.py [new file with mode: 0644] blob
Lib/json/tests/test_float.py [new file with mode: 0644] blob
Lib/json/tests/test_indent.py [new file with mode: 0644] blob
Lib/json/tests/test_pass1.py [new file with mode: 0644] blob
Lib/json/tests/test_pass2.py [new file with mode: 0644] blob
Lib/json/tests/test_pass3.py [new file with mode: 0644] blob
Lib/json/tests/test_recursion.py [new file with mode: 0644] blob
Lib/json/tests/test_scanstring.py [new file with mode: 0644] blob
Lib/json/tests/test_separators.py [new file with mode: 0644] blob
Lib/json/tests/test_speedups.py [new file with mode: 0644] blob
Lib/json/tests/test_unicode.py [new file with mode: 0644] blob
Lib/json/tool.py [new file with mode: 0644] blob
Lib/test/test_json.py [new file with mode: 0644] blob
Modules/_json.c [new file with mode: 0644] blob
PC/VC6/pythoncore.dsp diff | blob | blame | history
PC/VS7.1/pythoncore.vcproj diff | blob | blame | history
PC/VS8.0/pythoncore.vcproj diff | blob | blame | history
PC/config.c diff | blob | blame | history
PCbuild/pcbuild.sln diff | blob | blame | history
PCbuild/pythoncore.vcproj diff | blob | blame | history
setup.py diff | blob | blame | history
Mirror of https://github.com/python/cpython.git