From: Christian Heimes <christian@cheimes.de>
Date: Tue, 6 May 2008 13:46:15 +0000 (+0000)
Subject: Blocked revisions 62734,62736,62748 via svnmerge
X-Git-Tag: v3.0a5~22
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b91960c687a0a2f7ad4094441c20d834efeb2daf;p=thirdparty%2FPython%2Fcpython.git

Blocked revisions 62734,62736,62748 via svnmerge

Blocking json for now. It requires a careful redesign in order to
support bytes and unicode strings.

........
  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
........
---