← Back to branch summary

~ubuntu-branches/ubuntu/natty/python3.1/natty-security

« back to all changes in this revision

Viewing changes to Doc/library/json.rst

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2010-07-06 16:52:42 UTC
  • mfrom: (1.2.1 upstream) (2.1.11 sid)
  • Revision ID: james.westby@ubuntu.com-20100706165242-2xv4i019r3et6c0j
Tags: 3.1.2+20100706-1ubuntu1
* Merge with Debian; remaining changes:
  - Regenerate the control file.
  - Add debian/patches/overwrite-semaphore-check for Lucid buildds.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Doc/library/json.rst
209
209
   specified.  Encodings that are not ASCII based (such as UCS-2) are not
210
210
   allowed and should be decoded to :class:`str` first.
211
211
 
212
 
   The other arguments have the same meaning as in :func:`dump`.
 
212
   The other arguments have the same meaning as in :func:`load`.
213
213
 
214
214
 
215
215
Encoders and decoders