| 
									
										
										
										
											2008-05-08 14:29:10 +00:00
										 |  |  | :mod:`json` --- JSON encoder and decoder
 | 
					
						
							|  |  |  | ========================================
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | .. module:: json
 | 
					
						
							|  |  |  |    :synopsis: Encode and decode the JSON format.
 | 
					
						
							|  |  |  | .. moduleauthor:: Bob Ippolito <bob@redivi.com>
 | 
					
						
							|  |  |  | .. sectionauthor:: Bob Ippolito <bob@redivi.com>
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | JSON (JavaScript Object Notation) <http://json.org> is a subset of JavaScript
 | 
					
						
							|  |  |  | syntax (ECMA-262 3rd edition) used as a lightweight data interchange format.
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | :mod:`json` exposes an API familiar to users of the standard library
 | 
					
						
							|  |  |  | :mod:`marshal` and :mod:`pickle` modules.
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | Encoding basic Python object hierarchies::
 | 
					
						
							| 
									
										
										
										
											2009-01-03 21:18:54 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-05-08 14:29:10 +00:00
										 |  |  |     >>> import json
 | 
					
						
							|  |  |  |     >>> json.dumps(['foo', {'bar': ('baz', None, 1.0, 2)}])
 | 
					
						
							|  |  |  |     '["foo", {"bar": ["baz", null, 1.0, 2]}]'
 | 
					
						
							| 
									
										
										
										
											2008-05-13 04:55:24 +00:00
										 |  |  |     >>> print(json.dumps("\"foo\bar"))
 | 
					
						
							| 
									
										
										
										
											2008-05-08 14:29:10 +00:00
										 |  |  |     "\"foo\bar"
 | 
					
						
							| 
									
										
										
										
											2008-05-15 02:17:58 +00:00
										 |  |  |     >>> print(json.dumps('\u1234'))
 | 
					
						
							| 
									
										
										
										
											2008-05-08 14:29:10 +00:00
										 |  |  |     "\u1234"
 | 
					
						
							| 
									
										
										
										
											2008-05-13 04:55:24 +00:00
										 |  |  |     >>> print(json.dumps('\\'))
 | 
					
						
							| 
									
										
										
										
											2008-05-08 14:29:10 +00:00
										 |  |  |     "\\"
 | 
					
						
							| 
									
										
										
										
											2008-05-13 04:55:24 +00:00
										 |  |  |     >>> print(json.dumps({"c": 0, "b": 0, "a": 0}, sort_keys=True))
 | 
					
						
							| 
									
										
										
										
											2008-05-08 14:29:10 +00:00
										 |  |  |     {"a": 0, "b": 0, "c": 0}
 | 
					
						
							| 
									
										
										
										
											2008-05-15 02:17:58 +00:00
										 |  |  |     >>> from io import StringIO
 | 
					
						
							| 
									
										
										
										
											2008-05-08 14:29:10 +00:00
										 |  |  |     >>> io = StringIO()
 | 
					
						
							|  |  |  |     >>> json.dump(['streaming API'], io)
 | 
					
						
							|  |  |  |     >>> io.getvalue()
 | 
					
						
							|  |  |  |     '["streaming API"]'
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | Compact encoding::
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     >>> import json
 | 
					
						
							|  |  |  |     >>> json.dumps([1,2,3,{'4': 5, '6': 7}], separators=(',',':'))
 | 
					
						
							|  |  |  |     '[1,2,3,{"4":5,"6":7}]'
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | Pretty printing::
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     >>> import json
 | 
					
						
							| 
									
										
										
										
											2008-05-13 04:55:24 +00:00
										 |  |  |     >>> print(json.dumps({'4': 5, '6': 7}, sort_keys=True, indent=4))
 | 
					
						
							| 
									
										
										
										
											2008-05-08 14:29:10 +00:00
										 |  |  |     {
 | 
					
						
							| 
									
										
										
										
											2009-01-03 21:18:54 +00:00
										 |  |  |         "4": 5,
 | 
					
						
							| 
									
										
										
										
											2008-05-08 14:29:10 +00:00
										 |  |  |         "6": 7
 | 
					
						
							|  |  |  |     }
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | Decoding JSON::
 | 
					
						
							| 
									
										
										
										
											2009-01-03 21:18:54 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-05-08 14:29:10 +00:00
										 |  |  |     >>> import json
 | 
					
						
							|  |  |  |     >>> json.loads('["foo", {"bar":["baz", null, 1.0, 2]}]')
 | 
					
						
							| 
									
										
										
										
											2008-05-15 02:17:58 +00:00
										 |  |  |     ['foo', {'bar': ['baz', None, 1.0, 2]}]
 | 
					
						
							| 
									
										
										
										
											2008-05-08 14:29:10 +00:00
										 |  |  |     >>> json.loads('"\\"foo\\bar"')
 | 
					
						
							| 
									
										
										
										
											2008-05-15 02:17:58 +00:00
										 |  |  |     '"foo\x08ar'
 | 
					
						
							|  |  |  |     >>> from io import StringIO
 | 
					
						
							| 
									
										
										
										
											2008-05-08 14:29:10 +00:00
										 |  |  |     >>> io = StringIO('["streaming API"]')
 | 
					
						
							|  |  |  |     >>> json.load(io)
 | 
					
						
							| 
									
										
										
										
											2008-05-15 02:17:58 +00:00
										 |  |  |     ['streaming API']
 | 
					
						
							| 
									
										
										
										
											2008-05-08 14:29:10 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | Specializing JSON object decoding::
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     >>> import json
 | 
					
						
							|  |  |  |     >>> def as_complex(dct):
 | 
					
						
							|  |  |  |     ...     if '__complex__' in dct:
 | 
					
						
							|  |  |  |     ...         return complex(dct['real'], dct['imag'])
 | 
					
						
							|  |  |  |     ...     return dct
 | 
					
						
							| 
									
										
										
										
											2008-05-15 02:17:58 +00:00
										 |  |  |     ...
 | 
					
						
							| 
									
										
										
										
											2008-05-08 14:29:10 +00:00
										 |  |  |     >>> json.loads('{"__complex__": true, "real": 1, "imag": 2}',
 | 
					
						
							|  |  |  |     ...     object_hook=as_complex)
 | 
					
						
							|  |  |  |     (1+2j)
 | 
					
						
							|  |  |  |     >>> import decimal
 | 
					
						
							|  |  |  |     >>> json.loads('1.1', parse_float=decimal.Decimal)
 | 
					
						
							|  |  |  |     Decimal('1.1')
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | Extending :class:`JSONEncoder`::
 | 
					
						
							| 
									
										
										
										
											2009-01-03 21:18:54 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-05-08 14:29:10 +00:00
										 |  |  |     >>> import json
 | 
					
						
							|  |  |  |     >>> class ComplexEncoder(json.JSONEncoder):
 | 
					
						
							|  |  |  |     ...     def default(self, obj):
 | 
					
						
							|  |  |  |     ...         if isinstance(obj, complex):
 | 
					
						
							|  |  |  |     ...             return [obj.real, obj.imag]
 | 
					
						
							|  |  |  |     ...         return json.JSONEncoder.default(self, obj)
 | 
					
						
							| 
									
										
										
										
											2008-05-15 02:17:58 +00:00
										 |  |  |     ...
 | 
					
						
							| 
									
										
										
										
											2008-05-08 14:29:10 +00:00
										 |  |  |     >>> dumps(2 + 1j, cls=ComplexEncoder)
 | 
					
						
							|  |  |  |     '[2.0, 1.0]'
 | 
					
						
							|  |  |  |     >>> ComplexEncoder().encode(2 + 1j)
 | 
					
						
							|  |  |  |     '[2.0, 1.0]'
 | 
					
						
							|  |  |  |     >>> list(ComplexEncoder().iterencode(2 + 1j))
 | 
					
						
							|  |  |  |     ['[', '2.0', ', ', '1.0', ']']
 | 
					
						
							| 
									
										
										
										
											2009-01-03 21:18:54 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-05-08 14:29:10 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | .. highlight:: none
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | Using json.tool from the shell to validate and pretty-print::
 | 
					
						
							| 
									
										
										
										
											2009-01-03 21:18:54 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-05-08 14:29:10 +00:00
										 |  |  |     $ echo '{"json":"obj"}' | python -mjson.tool
 | 
					
						
							|  |  |  |     {
 | 
					
						
							|  |  |  |         "json": "obj"
 | 
					
						
							|  |  |  |     }
 | 
					
						
							|  |  |  |     $ echo '{ 1.2:3.4}' | python -mjson.tool
 | 
					
						
							|  |  |  |     Expecting property name: line 1 column 2 (char 2)
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | .. highlight:: python
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2009-01-03 21:18:54 +00:00
										 |  |  | .. note::
 | 
					
						
							| 
									
										
										
										
											2008-05-08 14:29:10 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |    The JSON produced by this module's default settings is a subset of
 | 
					
						
							|  |  |  |    YAML, so it may be used as a serializer for that as well.
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | Basic Usage
 | 
					
						
							|  |  |  | -----------
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2009-06-08 09:13:45 +00:00
										 |  |  | .. function:: dump(obj, fp, skipkeys=False, ensure_ascii=True, check_circular=True, allow_nan=True, cls=None, indent=None, separators=None, default=None, **kw)
 | 
					
						
							| 
									
										
										
										
											2008-05-08 14:29:10 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |    Serialize *obj* as a JSON formatted stream to *fp* (a ``.write()``-supporting
 | 
					
						
							|  |  |  |    file-like object).
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |    If *skipkeys* is ``True`` (default: ``False``), then dict keys that are not
 | 
					
						
							| 
									
										
										
										
											2009-09-13 08:13:21 +00:00
										 |  |  |    of a basic type (:class:`bytes`, :class:`str`, :class:`int`,
 | 
					
						
							| 
									
										
										
										
											2008-05-08 14:29:10 +00:00
										 |  |  |    :class:`float`, :class:`bool`, ``None``) will be skipped instead of raising a
 | 
					
						
							|  |  |  |    :exc:`TypeError`.
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2009-05-02 12:36:44 +00:00
										 |  |  |    The :mod:`json` module always produces :class:`str` objects, not
 | 
					
						
							|  |  |  |    :class:`bytes` objects. Therefore, ``fp.write()`` must support :class:`str`
 | 
					
						
							|  |  |  |    input.
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-05-08 14:29:10 +00:00
										 |  |  |    If *check_circular* is ``False`` (default: ``True``), then the circular
 | 
					
						
							|  |  |  |    reference check for container types will be skipped and a circular reference
 | 
					
						
							|  |  |  |    will result in an :exc:`OverflowError` (or worse).
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |    If *allow_nan* is ``False`` (default: ``True``), then it will be a
 | 
					
						
							|  |  |  |    :exc:`ValueError` to serialize out of range :class:`float` values (``nan``,
 | 
					
						
							|  |  |  |    ``inf``, ``-inf``) in strict compliance of the JSON specification, instead of
 | 
					
						
							|  |  |  |    using the JavaScript equivalents (``NaN``, ``Infinity``, ``-Infinity``).
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |    If *indent* is a non-negative integer, then JSON array elements and object
 | 
					
						
							|  |  |  |    members will be pretty-printed with that indent level.  An indent level of 0
 | 
					
						
							|  |  |  |    will only insert newlines.  ``None`` (the default) selects the most compact
 | 
					
						
							|  |  |  |    representation.
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |    If *separators* is an ``(item_separator, dict_separator)`` tuple, then it
 | 
					
						
							|  |  |  |    will be used instead of the default ``(', ', ': ')`` separators.  ``(',',
 | 
					
						
							|  |  |  |    ':')`` is the most compact JSON representation.
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |    *default(obj)* is a function that should return a serializable version of
 | 
					
						
							|  |  |  |    *obj* or raise :exc:`TypeError`.  The default simply raises :exc:`TypeError`.
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 68162,68166,68171,68176,68195-68196,68210,68232 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r68162 | ronald.oussoren | 2009-01-02 16:06:00 +0100 (Fri, 02 Jan 2009) | 3 lines
  Fix for issue 4472 is incompatible with Cygwin, this patch
  should fix that.
........
  r68166 | benjamin.peterson | 2009-01-02 19:26:23 +0100 (Fri, 02 Jan 2009) | 1 line
  document PyMemberDef
........
  r68171 | georg.brandl | 2009-01-02 21:25:14 +0100 (Fri, 02 Jan 2009) | 3 lines
  #4811: fix markup glitches (mostly remains of the conversion),
  found by Gabriel Genellina.
........
  r68176 | andrew.kuchling | 2009-01-02 22:00:35 +0100 (Fri, 02 Jan 2009) | 1 line
  Add various items
........
  r68195 | georg.brandl | 2009-01-03 14:45:15 +0100 (Sat, 03 Jan 2009) | 2 lines
  Remove useless string literal.
........
  r68196 | georg.brandl | 2009-01-03 15:29:53 +0100 (Sat, 03 Jan 2009) | 2 lines
  Fix indentation.
........
  r68210 | georg.brandl | 2009-01-03 20:10:12 +0100 (Sat, 03 Jan 2009) | 2 lines
  Set eol-style correctly for mp_distributing.py.
........
  r68232 | georg.brandl | 2009-01-03 22:52:16 +0100 (Sat, 03 Jan 2009) | 2 lines
  Grammar fix.
........
											
										 
											2009-01-03 22:47:39 +00:00
										 |  |  |    To use a custom :class:`JSONEncoder` subclass (e.g. one that overrides the
 | 
					
						
							| 
									
										
										
										
											2008-05-08 14:29:10 +00:00
										 |  |  |    :meth:`default` method to serialize additional types), specify it with the
 | 
					
						
							|  |  |  |    *cls* kwarg.
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2009-06-08 09:13:45 +00:00
										 |  |  | .. function:: dumps(obj, skipkeys=False, ensure_ascii=True, check_circular=True, allow_nan=True, cls=None, indent=None, separators=None, default=None, **kw)
 | 
					
						
							| 
									
										
										
										
											2008-05-08 14:29:10 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2009-05-02 12:36:44 +00:00
										 |  |  |    Serialize *obj* to a JSON formatted :class:`str`.  The arguments have the
 | 
					
						
							|  |  |  |    same meaning as in :func:`dump`.
 | 
					
						
							| 
									
										
										
										
											2008-05-08 14:29:10 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2009-06-08 09:13:45 +00:00
										 |  |  | .. function:: load(fp, cls=None, object_hook=None, parse_float=None, parse_int=None, parse_constant=None, object_pairs_hook=None, **kw)
 | 
					
						
							| 
									
										
										
										
											2008-05-08 14:29:10 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |    Deserialize *fp* (a ``.read()``-supporting file-like object containing a JSON
 | 
					
						
							|  |  |  |    document) to a Python object.
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |    *object_hook* is an optional function that will be called with the result of
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r70768 | andrew.kuchling | 2009-03-30 17:29:15 -0500 (Mon, 30 Mar 2009) | 1 line
  Typo fixes
........
  r71657 | vinay.sajip | 2009-04-16 14:07:37 -0500 (Thu, 16 Apr 2009) | 1 line
  Issue #5768: Change to Unicode output logic and test case for same.
........
  r71721 | benjamin.peterson | 2009-04-18 14:26:19 -0500 (Sat, 18 Apr 2009) | 1 line
  fix a few nits in unittest.py #5771
........
  r71729 | benjamin.peterson | 2009-04-18 16:03:10 -0500 (Sat, 18 Apr 2009) | 1 line
  move test to a more appropiate one
........
  r71794 | vinay.sajip | 2009-04-22 07:10:47 -0500 (Wed, 22 Apr 2009) | 2 lines
  Issue #5170: Fixed regression caused when fixing #5768.
........
  r71976 | mark.dickinson | 2009-04-26 14:54:55 -0500 (Sun, 26 Apr 2009) | 2 lines
  Fix typo in function name
........
  r72036 | georg.brandl | 2009-04-27 12:04:23 -0500 (Mon, 27 Apr 2009) | 1 line
  #5848: small unittest doc patch.
........
  r72037 | georg.brandl | 2009-04-27 12:09:53 -0500 (Mon, 27 Apr 2009) | 1 line
  #5840: dont claim we dont support TLS.
........
  r72079 | r.david.murray | 2009-04-28 14:02:55 -0500 (Tue, 28 Apr 2009) | 2 lines
  Remove spurious 'u'.
........
  r72085 | georg.brandl | 2009-04-28 16:48:35 -0500 (Tue, 28 Apr 2009) | 1 line
  Make the doctests in the docs pass, except for those in the turtle module.
........
  r72131 | benjamin.peterson | 2009-04-29 17:43:35 -0500 (Wed, 29 Apr 2009) | 1 line
  fix test_shutil on ZFS #5676
........
  r72132 | georg.brandl | 2009-04-29 17:44:07 -0500 (Wed, 29 Apr 2009) | 1 line
  #5878: fix repr of re object.
........
  r72133 | benjamin.peterson | 2009-04-29 17:44:15 -0500 (Wed, 29 Apr 2009) | 1 line
  make sure mode is removable while cleaning up test droppings
........
  r72134 | benjamin.peterson | 2009-04-29 19:06:33 -0500 (Wed, 29 Apr 2009) | 1 line
  make sure to close file
........
  r72191 | michael.foord | 2009-05-02 06:43:06 -0500 (Sat, 02 May 2009) | 9 lines
  Adds an exit parameter to unittest.main(). If False main no longer
  calls sys.exit.
  Closes issue 3379.
  Michael Foord
........
  r72197 | benjamin.peterson | 2009-05-02 11:24:37 -0500 (Sat, 02 May 2009) | 1 line
  don't let sys.argv be used in the tests
........
  r72198 | andrew.kuchling | 2009-05-02 12:12:15 -0500 (Sat, 02 May 2009) | 1 line
  Add items
........
  r72219 | michael.foord | 2009-05-02 15:15:05 -0500 (Sat, 02 May 2009) | 8 lines
  Add addCleanup and doCleanups to unittest.TestCase.
  Closes issue 5679.
  Michael Foord
........
  r72221 | benjamin.peterson | 2009-05-02 15:26:53 -0500 (Sat, 02 May 2009) | 1 line
  add myself
........
  r72225 | michael.foord | 2009-05-02 17:43:34 -0500 (Sat, 02 May 2009) | 1 line
........
  r72303 | benjamin.peterson | 2009-05-04 19:55:24 -0500 (Mon, 04 May 2009) | 1 line
  using sys._getframe(x), where x > 0 doesnt' work on IronPython
........
  r72434 | r.david.murray | 2009-05-07 13:09:58 -0500 (Thu, 07 May 2009) | 2 lines
  Pre-opened test file needs to be opened in binary mode.
........
  r72467 | georg.brandl | 2009-05-08 07:17:34 -0500 (Fri, 08 May 2009) | 1 line
  Fix name.
........
  r72476 | thomas.heller | 2009-05-08 15:09:40 -0500 (Fri, 08 May 2009) | 4 lines
  Add a file that contains diffs between offical libffi files and the
  files in this repository.  Should make it easier to merge new libffi
  versions.
........
											
										 
											2009-05-08 20:42:26 +00:00
										 |  |  |    any object literal decoded (a :class:`dict`).  The return value of
 | 
					
						
							| 
									
										
										
										
											2008-05-08 14:29:10 +00:00
										 |  |  |    *object_hook* will be used instead of the :class:`dict`.  This feature can be used
 | 
					
						
							|  |  |  |    to implement custom decoders (e.g. JSON-RPC class hinting).
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2009-04-21 03:27:12 +00:00
										 |  |  |    *object_pairs_hook* is an optional function that will be called with the
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r70768 | andrew.kuchling | 2009-03-30 17:29:15 -0500 (Mon, 30 Mar 2009) | 1 line
  Typo fixes
........
  r71657 | vinay.sajip | 2009-04-16 14:07:37 -0500 (Thu, 16 Apr 2009) | 1 line
  Issue #5768: Change to Unicode output logic and test case for same.
........
  r71721 | benjamin.peterson | 2009-04-18 14:26:19 -0500 (Sat, 18 Apr 2009) | 1 line
  fix a few nits in unittest.py #5771
........
  r71729 | benjamin.peterson | 2009-04-18 16:03:10 -0500 (Sat, 18 Apr 2009) | 1 line
  move test to a more appropiate one
........
  r71794 | vinay.sajip | 2009-04-22 07:10:47 -0500 (Wed, 22 Apr 2009) | 2 lines
  Issue #5170: Fixed regression caused when fixing #5768.
........
  r71976 | mark.dickinson | 2009-04-26 14:54:55 -0500 (Sun, 26 Apr 2009) | 2 lines
  Fix typo in function name
........
  r72036 | georg.brandl | 2009-04-27 12:04:23 -0500 (Mon, 27 Apr 2009) | 1 line
  #5848: small unittest doc patch.
........
  r72037 | georg.brandl | 2009-04-27 12:09:53 -0500 (Mon, 27 Apr 2009) | 1 line
  #5840: dont claim we dont support TLS.
........
  r72079 | r.david.murray | 2009-04-28 14:02:55 -0500 (Tue, 28 Apr 2009) | 2 lines
  Remove spurious 'u'.
........
  r72085 | georg.brandl | 2009-04-28 16:48:35 -0500 (Tue, 28 Apr 2009) | 1 line
  Make the doctests in the docs pass, except for those in the turtle module.
........
  r72131 | benjamin.peterson | 2009-04-29 17:43:35 -0500 (Wed, 29 Apr 2009) | 1 line
  fix test_shutil on ZFS #5676
........
  r72132 | georg.brandl | 2009-04-29 17:44:07 -0500 (Wed, 29 Apr 2009) | 1 line
  #5878: fix repr of re object.
........
  r72133 | benjamin.peterson | 2009-04-29 17:44:15 -0500 (Wed, 29 Apr 2009) | 1 line
  make sure mode is removable while cleaning up test droppings
........
  r72134 | benjamin.peterson | 2009-04-29 19:06:33 -0500 (Wed, 29 Apr 2009) | 1 line
  make sure to close file
........
  r72191 | michael.foord | 2009-05-02 06:43:06 -0500 (Sat, 02 May 2009) | 9 lines
  Adds an exit parameter to unittest.main(). If False main no longer
  calls sys.exit.
  Closes issue 3379.
  Michael Foord
........
  r72197 | benjamin.peterson | 2009-05-02 11:24:37 -0500 (Sat, 02 May 2009) | 1 line
  don't let sys.argv be used in the tests
........
  r72198 | andrew.kuchling | 2009-05-02 12:12:15 -0500 (Sat, 02 May 2009) | 1 line
  Add items
........
  r72219 | michael.foord | 2009-05-02 15:15:05 -0500 (Sat, 02 May 2009) | 8 lines
  Add addCleanup and doCleanups to unittest.TestCase.
  Closes issue 5679.
  Michael Foord
........
  r72221 | benjamin.peterson | 2009-05-02 15:26:53 -0500 (Sat, 02 May 2009) | 1 line
  add myself
........
  r72225 | michael.foord | 2009-05-02 17:43:34 -0500 (Sat, 02 May 2009) | 1 line
........
  r72303 | benjamin.peterson | 2009-05-04 19:55:24 -0500 (Mon, 04 May 2009) | 1 line
  using sys._getframe(x), where x > 0 doesnt' work on IronPython
........
  r72434 | r.david.murray | 2009-05-07 13:09:58 -0500 (Thu, 07 May 2009) | 2 lines
  Pre-opened test file needs to be opened in binary mode.
........
  r72467 | georg.brandl | 2009-05-08 07:17:34 -0500 (Fri, 08 May 2009) | 1 line
  Fix name.
........
  r72476 | thomas.heller | 2009-05-08 15:09:40 -0500 (Fri, 08 May 2009) | 4 lines
  Add a file that contains diffs between offical libffi files and the
  files in this repository.  Should make it easier to merge new libffi
  versions.
........
											
										 
											2009-05-08 20:42:26 +00:00
										 |  |  |    result of any object literal decoded with an ordered list of pairs.  The
 | 
					
						
							| 
									
										
										
										
											2009-04-21 03:27:12 +00:00
										 |  |  |    return value of *object_pairs_hook* will be used instead of the
 | 
					
						
							|  |  |  |    :class:`dict`.  This feature can be used to implement custom decoders that
 | 
					
						
							|  |  |  |    rely on the order that the key and value pairs are decoded (for example,
 | 
					
						
							|  |  |  |    :func:`collections.OrderedDict` will remember the order of insertion). If
 | 
					
						
							|  |  |  |    *object_hook* is also defined, the *object_pairs_hook* takes priority.
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |    .. versionchanged:: 3.1
 | 
					
						
							| 
									
										
										
										
											2009-04-26 03:34:06 +00:00
										 |  |  |       Added support for *object_pairs_hook*.
 | 
					
						
							| 
									
										
										
										
											2009-04-21 03:27:12 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-05-08 14:29:10 +00:00
										 |  |  |    *parse_float*, if specified, will be called with the string of every JSON
 | 
					
						
							|  |  |  |    float to be decoded.  By default, this is equivalent to ``float(num_str)``.
 | 
					
						
							|  |  |  |    This can be used to use another datatype or parser for JSON floats
 | 
					
						
							|  |  |  |    (e.g. :class:`decimal.Decimal`).
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |    *parse_int*, if specified, will be called with the string of every JSON int
 | 
					
						
							|  |  |  |    to be decoded.  By default, this is equivalent to ``int(num_str)``.  This can
 | 
					
						
							|  |  |  |    be used to use another datatype or parser for JSON integers
 | 
					
						
							|  |  |  |    (e.g. :class:`float`).
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |    *parse_constant*, if specified, will be called with one of the following
 | 
					
						
							|  |  |  |    strings: ``'-Infinity'``, ``'Infinity'``, ``'NaN'``, ``'null'``, ``'true'``,
 | 
					
						
							|  |  |  |    ``'false'``.  This can be used to raise an exception if invalid JSON numbers
 | 
					
						
							|  |  |  |    are encountered.
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |    To use a custom :class:`JSONDecoder` subclass, specify it with the ``cls``
 | 
					
						
							|  |  |  |    kwarg.  Additional keyword arguments will be passed to the constructor of the
 | 
					
						
							|  |  |  |    class.
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2009-06-08 09:13:45 +00:00
										 |  |  | .. function:: loads(s, encoding=None, cls=None, object_hook=None, parse_float=None, parse_int=None, parse_constant=None, object_pairs_hook=None, **kw)
 | 
					
						
							| 
									
										
										
										
											2008-05-08 14:29:10 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2009-09-13 08:13:21 +00:00
										 |  |  |    Deserialize *s* (a :class:`bytes` or :class:`str` instance containing a JSON
 | 
					
						
							| 
									
										
										
										
											2008-05-08 14:29:10 +00:00
										 |  |  |    document) to a Python object.
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2009-09-13 08:13:21 +00:00
										 |  |  |    If *s* is a :class:`bytes` instance and is encoded with an ASCII based encoding
 | 
					
						
							| 
									
										
										
										
											2008-05-08 14:29:10 +00:00
										 |  |  |    other than UTF-8 (e.g. latin-1), then an appropriate *encoding* name must be
 | 
					
						
							|  |  |  |    specified.  Encodings that are not ASCII based (such as UCS-2) are not
 | 
					
						
							| 
									
										
										
										
											2009-09-13 08:13:21 +00:00
										 |  |  |    allowed and should be decoded to :class:`str` first.
 | 
					
						
							| 
									
										
										
										
											2008-05-08 14:29:10 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |    The other arguments have the same meaning as in :func:`dump`.
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | Encoders and decoders
 | 
					
						
							|  |  |  | ---------------------
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2009-06-08 09:13:45 +00:00
										 |  |  | .. class:: JSONDecoder(object_hook=None, parse_float=None, parse_int=None, parse_constant=None, strict=True, object_pairs_hook=None)
 | 
					
						
							| 
									
										
										
										
											2008-05-08 14:29:10 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |    Simple JSON decoder.
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |    Performs the following translations in decoding by default:
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |    +---------------+-------------------+
 | 
					
						
							|  |  |  |    | JSON          | Python            |
 | 
					
						
							|  |  |  |    +===============+===================+
 | 
					
						
							|  |  |  |    | object        | dict              |
 | 
					
						
							|  |  |  |    +---------------+-------------------+
 | 
					
						
							|  |  |  |    | array         | list              |
 | 
					
						
							|  |  |  |    +---------------+-------------------+
 | 
					
						
							| 
									
										
										
										
											2009-05-02 12:36:44 +00:00
										 |  |  |    | string        | str               |
 | 
					
						
							| 
									
										
										
										
											2008-05-08 14:29:10 +00:00
										 |  |  |    +---------------+-------------------+
 | 
					
						
							| 
									
										
										
										
											2009-04-11 18:18:16 +00:00
										 |  |  |    | number (int)  | int               |
 | 
					
						
							| 
									
										
										
										
											2008-05-08 14:29:10 +00:00
										 |  |  |    +---------------+-------------------+
 | 
					
						
							|  |  |  |    | number (real) | float             |
 | 
					
						
							|  |  |  |    +---------------+-------------------+
 | 
					
						
							|  |  |  |    | true          | True              |
 | 
					
						
							|  |  |  |    +---------------+-------------------+
 | 
					
						
							|  |  |  |    | false         | False             |
 | 
					
						
							|  |  |  |    +---------------+-------------------+
 | 
					
						
							|  |  |  |    | null          | None              |
 | 
					
						
							|  |  |  |    +---------------+-------------------+
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |    It also understands ``NaN``, ``Infinity``, and ``-Infinity`` as their
 | 
					
						
							|  |  |  |    corresponding ``float`` values, which is outside the JSON spec.
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |    *object_hook*, if specified, will be called with the result of every JSON
 | 
					
						
							|  |  |  |    object decoded and its return value will be used in place of the given
 | 
					
						
							|  |  |  |    :class:`dict`.  This can be used to provide custom deserializations (e.g. to
 | 
					
						
							|  |  |  |    support JSON-RPC class hinting).
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2009-04-21 03:27:12 +00:00
										 |  |  |    *object_pairs_hook*, if specified will be called with the result of every
 | 
					
						
							|  |  |  |    JSON object decoded with an ordered list of pairs.  The return value of
 | 
					
						
							|  |  |  |    *object_pairs_hook* will be used instead of the :class:`dict`.  This
 | 
					
						
							|  |  |  |    feature can be used to implement custom decoders that rely on the order
 | 
					
						
							|  |  |  |    that the key and value pairs are decoded (for example,
 | 
					
						
							|  |  |  |    :func:`collections.OrderedDict` will remember the order of insertion). If
 | 
					
						
							|  |  |  |    *object_hook* is also defined, the *object_pairs_hook* takes priority.
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |    .. versionchanged:: 3.1
 | 
					
						
							| 
									
										
										
										
											2009-04-26 03:34:06 +00:00
										 |  |  |       Added support for *object_pairs_hook*.
 | 
					
						
							| 
									
										
										
										
											2009-04-21 03:27:12 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-05-08 14:29:10 +00:00
										 |  |  |    *parse_float*, if specified, will be called with the string of every JSON
 | 
					
						
							|  |  |  |    float to be decoded.  By default, this is equivalent to ``float(num_str)``.
 | 
					
						
							|  |  |  |    This can be used to use another datatype or parser for JSON floats
 | 
					
						
							|  |  |  |    (e.g. :class:`decimal.Decimal`).
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |    *parse_int*, if specified, will be called with the string of every JSON int
 | 
					
						
							|  |  |  |    to be decoded.  By default, this is equivalent to ``int(num_str)``.  This can
 | 
					
						
							|  |  |  |    be used to use another datatype or parser for JSON integers
 | 
					
						
							|  |  |  |    (e.g. :class:`float`).
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |    *parse_constant*, if specified, will be called with one of the following
 | 
					
						
							|  |  |  |    strings: ``'-Infinity'``, ``'Infinity'``, ``'NaN'``, ``'null'``, ``'true'``,
 | 
					
						
							|  |  |  |    ``'false'``.  This can be used to raise an exception if invalid JSON numbers
 | 
					
						
							|  |  |  |    are encountered.
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |    .. method:: decode(s)
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2009-05-02 12:36:44 +00:00
										 |  |  |       Return the Python representation of *s* (a :class:`str` instance
 | 
					
						
							|  |  |  |       containing a JSON document)
 | 
					
						
							| 
									
										
										
										
											2008-05-08 14:29:10 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |    .. method:: raw_decode(s)
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2009-05-02 12:36:44 +00:00
										 |  |  |       Decode a JSON document from *s* (a :class:`str` beginning with a
 | 
					
						
							|  |  |  |       JSON document) and return a 2-tuple of the Python representation
 | 
					
						
							|  |  |  |       and the index in *s* where the document ended.
 | 
					
						
							| 
									
										
										
										
											2008-05-08 14:29:10 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |       This can be used to decode a JSON document from a string that may have
 | 
					
						
							|  |  |  |       extraneous data at the end.
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2009-06-08 09:13:45 +00:00
										 |  |  | .. class:: JSONEncoder(skipkeys=False, ensure_ascii=True, check_circular=True, allow_nan=True, sort_keys=False, indent=None, separators=None, default=None)
 | 
					
						
							| 
									
										
										
										
											2008-05-08 14:29:10 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |    Extensible JSON encoder for Python data structures.
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |    Supports the following objects and types by default:
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |    +-------------------+---------------+
 | 
					
						
							|  |  |  |    | Python            | JSON          |
 | 
					
						
							|  |  |  |    +===================+===============+
 | 
					
						
							|  |  |  |    | dict              | object        |
 | 
					
						
							|  |  |  |    +-------------------+---------------+
 | 
					
						
							|  |  |  |    | list, tuple       | array         |
 | 
					
						
							|  |  |  |    +-------------------+---------------+
 | 
					
						
							| 
									
										
										
										
											2009-05-02 12:36:44 +00:00
										 |  |  |    | str               | string        |
 | 
					
						
							| 
									
										
										
										
											2008-05-08 14:29:10 +00:00
										 |  |  |    +-------------------+---------------+
 | 
					
						
							| 
									
										
										
										
											2009-04-11 18:18:16 +00:00
										 |  |  |    | int, float        | number        |
 | 
					
						
							| 
									
										
										
										
											2008-05-08 14:29:10 +00:00
										 |  |  |    +-------------------+---------------+
 | 
					
						
							|  |  |  |    | True              | true          |
 | 
					
						
							|  |  |  |    +-------------------+---------------+
 | 
					
						
							|  |  |  |    | False             | false         |
 | 
					
						
							|  |  |  |    +-------------------+---------------+
 | 
					
						
							|  |  |  |    | None              | null          |
 | 
					
						
							|  |  |  |    +-------------------+---------------+
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |    To extend this to recognize other objects, subclass and implement a
 | 
					
						
							|  |  |  |    :meth:`default` method with another method that returns a serializable object
 | 
					
						
							|  |  |  |    for ``o`` if possible, otherwise it should call the superclass implementation
 | 
					
						
							|  |  |  |    (to raise :exc:`TypeError`).
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |    If *skipkeys* is ``False`` (the default), then it is a :exc:`TypeError` to
 | 
					
						
							| 
									
										
										
										
											2009-04-11 18:18:16 +00:00
										 |  |  |    attempt encoding of keys that are not str, int, float or None.  If
 | 
					
						
							| 
									
										
										
										
											2008-05-08 14:29:10 +00:00
										 |  |  |    *skipkeys* is ``True``, such items are simply skipped.
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2009-05-02 12:36:44 +00:00
										 |  |  |    If *ensure_ascii* is ``True`` (the default), the output is guaranteed to
 | 
					
						
							|  |  |  |    have all incoming non-ASCII characters escaped.  If *ensure_ascii* is
 | 
					
						
							|  |  |  |    ``False``, these characters will be output as-is.
 | 
					
						
							| 
									
										
										
										
											2008-05-08 14:29:10 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |    If *check_circular* is ``True`` (the default), then lists, dicts, and custom
 | 
					
						
							|  |  |  |    encoded objects will be checked for circular references during encoding to
 | 
					
						
							|  |  |  |    prevent an infinite recursion (which would cause an :exc:`OverflowError`).
 | 
					
						
							|  |  |  |    Otherwise, no such check takes place.
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |    If *allow_nan* is ``True`` (the default), then ``NaN``, ``Infinity``, and
 | 
					
						
							|  |  |  |    ``-Infinity`` will be encoded as such.  This behavior is not JSON
 | 
					
						
							|  |  |  |    specification compliant, but is consistent with most JavaScript based
 | 
					
						
							|  |  |  |    encoders and decoders.  Otherwise, it will be a :exc:`ValueError` to encode
 | 
					
						
							|  |  |  |    such floats.
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |    If *sort_keys* is ``True`` (the default), then the output of dictionaries
 | 
					
						
							|  |  |  |    will be sorted by key; this is useful for regression tests to ensure that
 | 
					
						
							|  |  |  |    JSON serializations can be compared on a day-to-day basis.
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |    If *indent* is a non-negative integer (it is ``None`` by default), then JSON
 | 
					
						
							|  |  |  |    array elements and object members will be pretty-printed with that indent
 | 
					
						
							|  |  |  |    level.  An indent level of 0 will only insert newlines.  ``None`` is the most
 | 
					
						
							|  |  |  |    compact representation.
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |    If specified, *separators* should be an ``(item_separator, key_separator)``
 | 
					
						
							|  |  |  |    tuple.  The default is ``(', ', ': ')``.  To get the most compact JSON
 | 
					
						
							|  |  |  |    representation, you should specify ``(',', ':')`` to eliminate whitespace.
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |    If specified, *default* is a function that gets called for objects that can't
 | 
					
						
							|  |  |  |    otherwise be serialized.  It should return a JSON encodable version of the
 | 
					
						
							|  |  |  |    object or raise a :exc:`TypeError`.
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |    .. method:: default(o)
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |       Implement this method in a subclass such that it returns a serializable
 | 
					
						
							|  |  |  |       object for *o*, or calls the base implementation (to raise a
 | 
					
						
							|  |  |  |       :exc:`TypeError`).
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |       For example, to support arbitrary iterators, you could implement default
 | 
					
						
							|  |  |  |       like this::
 | 
					
						
							| 
									
										
										
										
											2009-01-03 21:18:54 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-05-08 14:29:10 +00:00
										 |  |  |          def default(self, o):
 | 
					
						
							|  |  |  |             try:
 | 
					
						
							| 
									
										
											  
											
												Devil merge!
Merged revisions 66561,66564,66580,66610,66614,66618,66624-66625,66628-66629,66643,66645,66660-66665 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r66561 | benjamin.peterson | 2008-09-22 17:13:29 -0500 (Mon, 22 Sep 2008) | 1 line
  clean up docs for platform's linux_distribution and dist functions
........
  r66564 | benjamin.peterson | 2008-09-23 08:32:46 -0500 (Tue, 23 Sep 2008) | 1 line
  mention how to override boolean evaluation
........
  r66580 | georg.brandl | 2008-09-24 04:47:55 -0500 (Wed, 24 Sep 2008) | 2 lines
  Indentation normalization.
........
  r66610 | andrew.kuchling | 2008-09-24 12:27:55 -0500 (Wed, 24 Sep 2008) | 1 line
  Improve wording
........
  r66614 | benjamin.peterson | 2008-09-24 17:11:59 -0500 (Wed, 24 Sep 2008) | 4 lines
  #3950 fix missing scale factors in turtle.py
  reviewers: Georg, Benjamin
........
  r66618 | benjamin.peterson | 2008-09-25 15:35:45 -0500 (Thu, 25 Sep 2008) | 1 line
  add a NEWs entry for r66614
........
  r66624 | raymond.hettinger | 2008-09-25 18:31:52 -0500 (Thu, 25 Sep 2008) | 1 line
  Fix namedtuple bug reported by Glenn Linderman.  Template did not form correctly if the field names were input in Unicode.
........
  r66625 | benjamin.peterson | 2008-09-25 21:58:36 -0500 (Thu, 25 Sep 2008) | 1 line
  add the beginnings of a C-API 2 -> 3 porting guide
........
  r66628 | benjamin.peterson | 2008-09-26 15:52:06 -0500 (Fri, 26 Sep 2008) | 1 line
  add an 'other options' section
........
  r66629 | georg.brandl | 2008-09-26 16:15:21 -0500 (Fri, 26 Sep 2008) | 2 lines
  typos.
........
  r66643 | andrew.kuchling | 2008-09-27 09:12:33 -0500 (Sat, 27 Sep 2008) | 1 line
  Add a last bunch of items
........
  r66645 | benjamin.peterson | 2008-09-27 11:23:55 -0500 (Sat, 27 Sep 2008) | 1 line
  2to3's api should be considered unstable
........
  r66660 | andrew.kuchling | 2008-09-27 17:54:08 -0500 (Sat, 27 Sep 2008) | 1 line
  #3510: future-proof text
........
  r66661 | benjamin.peterson | 2008-09-27 18:28:43 -0500 (Sat, 27 Sep 2008) | 1 line
  clarify a few things
........
  r66662 | andrew.kuchling | 2008-09-27 19:15:27 -0500 (Sat, 27 Sep 2008) | 1 line
  #1579477: mention necessity to flush output before exec'ing
........
  r66663 | andrew.kuchling | 2008-09-27 20:08:47 -0500 (Sat, 27 Sep 2008) | 1 line
  #1415508: Document two functions
........
  r66664 | benjamin.peterson | 2008-09-27 20:51:36 -0500 (Sat, 27 Sep 2008) | 1 line
  better grammar
........
  r66665 | benjamin.peterson | 2008-09-27 20:53:29 -0500 (Sat, 27 Sep 2008) | 1 line
  note the 2to3 -d could be useful for other refactoring
........
											
										 
											2008-09-28 02:06:32 +00:00
										 |  |  |                 iterable = iter(o)
 | 
					
						
							| 
									
										
										
										
											2008-05-08 14:29:10 +00:00
										 |  |  |             except TypeError:
 | 
					
						
							| 
									
										
											  
											
												Devil merge!
Merged revisions 66561,66564,66580,66610,66614,66618,66624-66625,66628-66629,66643,66645,66660-66665 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r66561 | benjamin.peterson | 2008-09-22 17:13:29 -0500 (Mon, 22 Sep 2008) | 1 line
  clean up docs for platform's linux_distribution and dist functions
........
  r66564 | benjamin.peterson | 2008-09-23 08:32:46 -0500 (Tue, 23 Sep 2008) | 1 line
  mention how to override boolean evaluation
........
  r66580 | georg.brandl | 2008-09-24 04:47:55 -0500 (Wed, 24 Sep 2008) | 2 lines
  Indentation normalization.
........
  r66610 | andrew.kuchling | 2008-09-24 12:27:55 -0500 (Wed, 24 Sep 2008) | 1 line
  Improve wording
........
  r66614 | benjamin.peterson | 2008-09-24 17:11:59 -0500 (Wed, 24 Sep 2008) | 4 lines
  #3950 fix missing scale factors in turtle.py
  reviewers: Georg, Benjamin
........
  r66618 | benjamin.peterson | 2008-09-25 15:35:45 -0500 (Thu, 25 Sep 2008) | 1 line
  add a NEWs entry for r66614
........
  r66624 | raymond.hettinger | 2008-09-25 18:31:52 -0500 (Thu, 25 Sep 2008) | 1 line
  Fix namedtuple bug reported by Glenn Linderman.  Template did not form correctly if the field names were input in Unicode.
........
  r66625 | benjamin.peterson | 2008-09-25 21:58:36 -0500 (Thu, 25 Sep 2008) | 1 line
  add the beginnings of a C-API 2 -> 3 porting guide
........
  r66628 | benjamin.peterson | 2008-09-26 15:52:06 -0500 (Fri, 26 Sep 2008) | 1 line
  add an 'other options' section
........
  r66629 | georg.brandl | 2008-09-26 16:15:21 -0500 (Fri, 26 Sep 2008) | 2 lines
  typos.
........
  r66643 | andrew.kuchling | 2008-09-27 09:12:33 -0500 (Sat, 27 Sep 2008) | 1 line
  Add a last bunch of items
........
  r66645 | benjamin.peterson | 2008-09-27 11:23:55 -0500 (Sat, 27 Sep 2008) | 1 line
  2to3's api should be considered unstable
........
  r66660 | andrew.kuchling | 2008-09-27 17:54:08 -0500 (Sat, 27 Sep 2008) | 1 line
  #3510: future-proof text
........
  r66661 | benjamin.peterson | 2008-09-27 18:28:43 -0500 (Sat, 27 Sep 2008) | 1 line
  clarify a few things
........
  r66662 | andrew.kuchling | 2008-09-27 19:15:27 -0500 (Sat, 27 Sep 2008) | 1 line
  #1579477: mention necessity to flush output before exec'ing
........
  r66663 | andrew.kuchling | 2008-09-27 20:08:47 -0500 (Sat, 27 Sep 2008) | 1 line
  #1415508: Document two functions
........
  r66664 | benjamin.peterson | 2008-09-27 20:51:36 -0500 (Sat, 27 Sep 2008) | 1 line
  better grammar
........
  r66665 | benjamin.peterson | 2008-09-27 20:53:29 -0500 (Sat, 27 Sep 2008) | 1 line
  note the 2to3 -d could be useful for other refactoring
........
											
										 
											2008-09-28 02:06:32 +00:00
										 |  |  |                 pass
 | 
					
						
							| 
									
										
										
										
											2008-05-08 14:29:10 +00:00
										 |  |  |             else:
 | 
					
						
							|  |  |  |                 return list(iterable)
 | 
					
						
							|  |  |  |             return JSONEncoder.default(self, o)
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |    .. method:: encode(o)
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |       Return a JSON string representation of a Python data structure, *o*.  For
 | 
					
						
							|  |  |  |       example::
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         >>> JSONEncoder().encode({"foo": ["bar", "baz"]})
 | 
					
						
							|  |  |  |         '{"foo": ["bar", "baz"]}'
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |    .. method:: iterencode(o)
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |       Encode the given object, *o*, and yield each string representation as
 | 
					
						
							|  |  |  |       available.  For example::
 | 
					
						
							| 
									
										
										
										
											2009-01-03 21:18:54 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-05-08 14:29:10 +00:00
										 |  |  |             for chunk in JSONEncoder().iterencode(bigobject):
 | 
					
						
							|  |  |  |                 mysocket.write(chunk)
 |