diff --git a/docs/class-simplejson.JSONDecoder.html b/docs/class-simplejson.JSONDecoder.html
index a4c3f06e5ebca2cc3cabcc6de316a0b4f7419666_ZG9jcy9jbGFzcy1zaW1wbGVqc29uLkpTT05EZWNvZGVyLmh0bWw=..c6fa01dc9a352915efb9a5b7985bd27614357d8c_ZG9jcy9jbGFzcy1zaW1wbGVqc29uLkpTT05EZWNvZGVyLmh0bWw= 100644
--- a/docs/class-simplejson.JSONDecoder.html
+++ b/docs/class-simplejson.JSONDecoder.html
@@ -9,7 +9,7 @@
<DIV ID="page">
<DIV ID="top-nav">
- <H1 ID="doc-title"><A HREF="index.html" REL="index">simplejson 1.5dev-r982</A></H1>
+ <H1 ID="doc-title"><A HREF="index.html" REL="index">simplejson 1.5</A></H1>
<DIV CLASS="online-navigation">
<A HREF="index.html" REL="index">index</A>
<SPAN ID="nav-docs">
@@ -148,7 +148,7 @@
</DIV><DIV CLASS="pudge-member routine alias">
<A NAME="decode"></A>
<H4 CLASS="pudge-member-name"><SPAN CLASS="prefix">f</SPAN>
- <TT><A HREF="class-simplejson.JSONDecoder.html#decode" CLASS="pudge-obj-link">decode</A>(self, s, _w=<built-in method match of _sre.SRE_Pattern object at 0x1288140>)</TT>
+ <TT><A HREF="class-simplejson.JSONDecoder.html#decode" CLASS="pudge-obj-link">decode</A>(self, s, _w=<built-in method match of _sre.SRE_Pattern object at 0x12cd650>)</TT>
<A HREF="simplejson/decoder.py.html?f=246&l=256#246" TITLE="View Source">...</A>
</H4>
<DIV CLASS="pudge-section rst">
diff --git a/docs/class-simplejson.JSONEncoder.html b/docs/class-simplejson.JSONEncoder.html
index a4c3f06e5ebca2cc3cabcc6de316a0b4f7419666_ZG9jcy9jbGFzcy1zaW1wbGVqc29uLkpTT05FbmNvZGVyLmh0bWw=..c6fa01dc9a352915efb9a5b7985bd27614357d8c_ZG9jcy9jbGFzcy1zaW1wbGVqc29uLkpTT05FbmNvZGVyLmh0bWw= 100644
--- a/docs/class-simplejson.JSONEncoder.html
+++ b/docs/class-simplejson.JSONEncoder.html
@@ -9,7 +9,7 @@
<DIV ID="page">
<DIV ID="top-nav">
- <H1 ID="doc-title"><A HREF="index.html" REL="index">simplejson 1.5dev-r982</A></H1>
+ <H1 ID="doc-title"><A HREF="index.html" REL="index">simplejson 1.5</A></H1>
<DIV CLASS="online-navigation">
<A HREF="index.html" REL="index">index</A>
<SPAN ID="nav-docs">
@@ -67,7 +67,7 @@
</LI>
<LI>
- <A HREF="simplejson/encoder.py.html?f=63&l=330#63" CLASS="pudge-section-link">
+ <A HREF="simplejson/encoder.py.html?f=63&l=339#63" CLASS="pudge-section-link">
Source
</A>
</LI>
@@ -125,8 +125,8 @@
<DIV CLASS="pudge-member routine alias">
<A NAME="__init__"></A>
<H4 CLASS="pudge-member-name"><SPAN CLASS="prefix">f</SPAN>
- <TT><A HREF="class-simplejson.JSONEncoder.html#__init__" CLASS="pudge-obj-link">__init__</A>(self, skipkeys=False, ensure_ascii=True, check_circular=True, allow_nan=True, sort_keys=False, indent=None, separators=None)</TT>
- <A HREF="simplejson/encoder.py.html?f=95&l=142#95" TITLE="View Source">...</A>
+ <TT><A HREF="class-simplejson.JSONEncoder.html#__init__" CLASS="pudge-obj-link">__init__</A>(self, skipkeys=False, ensure_ascii=True, check_circular=True, allow_nan=True, sort_keys=False, indent=None, separators=None, encoding='utf-8')</TT>
+ <A HREF="simplejson/encoder.py.html?f=95&l=147#95" TITLE="View Source">...</A>
</H4>
<DIV CLASS="pudge-section rst">
@@ -157,6 +157,9 @@
<P>If specified, separators should be a (item_separator, key_separator)
tuple. The default is (', ', ': '). To get the most compact JSON
representation you should specify (',', ':') to eliminate whitespace.</P>
+<P>If encoding is not None, then all input strings will be
+transformed into unicode using that encoding prior to JSON-encoding.
+The default is UTF-8.</P>
</DIV>
@@ -164,7 +167,7 @@
<A NAME="default"></A>
<H4 CLASS="pudge-member-name"><SPAN CLASS="prefix">f</SPAN>
<TT><A HREF="class-simplejson.JSONEncoder.html#default" CLASS="pudge-obj-link">default</A>(self, o)</TT>
- <A HREF="simplejson/encoder.py.html?f=282&l=301#282" TITLE="View Source">...</A>
+ <A HREF="simplejson/encoder.py.html?f=291&l=310#291" TITLE="View Source">...</A>
</H4>
<DIV CLASS="pudge-section rst">
@@ -192,7 +195,7 @@
<A NAME="encode"></A>
<H4 CLASS="pudge-member-name"><SPAN CLASS="prefix">f</SPAN>
<TT><A HREF="class-simplejson.JSONEncoder.html#encode" CLASS="pudge-obj-link">encode</A>(self, o)</TT>
- <A HREF="simplejson/encoder.py.html?f=302&l=314#302" TITLE="View Source">...</A>
+ <A HREF="simplejson/encoder.py.html?f=311&l=323#311" TITLE="View Source">...</A>
</H4>
<DIV CLASS="pudge-section rst">
@@ -210,7 +213,7 @@
<A NAME="iterencode"></A>
<H4 CLASS="pudge-member-name"><SPAN CLASS="prefix">f</SPAN>
<TT><A HREF="class-simplejson.JSONEncoder.html#iterencode" CLASS="pudge-obj-link">iterencode</A>(self, o)</TT>
- <A HREF="simplejson/encoder.py.html?f=315&l=330#315" TITLE="View Source">...</A>
+ <A HREF="simplejson/encoder.py.html?f=324&l=339#324" TITLE="View Source">...</A>
</H4>
<DIV CLASS="pudge-section rst">
@@ -235,7 +238,7 @@
See
- <A HREF="simplejson/encoder.py.html?f=63&l=330#63" TITLE="simplejson/encoder.py:63">the source</A>
+ <A HREF="simplejson/encoder.py.html?f=63&l=339#63" TITLE="simplejson/encoder.py:63">the source</A>
for more information.
</SMALL>
</P>
diff --git a/docs/index.html b/docs/index.html
index a4c3f06e5ebca2cc3cabcc6de316a0b4f7419666_ZG9jcy9pbmRleC5odG1s..c6fa01dc9a352915efb9a5b7985bd27614357d8c_ZG9jcy9pbmRleC5odG1s 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -9,7 +9,7 @@
<DIV ID="page">
<DIV ID="top-nav">
- <H1 ID="doc-title"><A HREF="index.html" REL="index">simplejson 1.5dev-r982</A></H1>
+ <H1 ID="doc-title"><A HREF="index.html" REL="index">simplejson 1.5</A></H1>
<DIV CLASS="online-navigation">
<A HREF="index.html" REL="index">index</A>
<SPAN ID="nav-docs">
@@ -174,8 +174,8 @@
<DIV CLASS="pudge-member routine ">
<A NAME="dump"></A>
<H4 CLASS="pudge-member-name"><SPAN CLASS="prefix">f</SPAN>
- <TT><A HREF="module-simplejson.html#dump" CLASS="pudge-obj-link">dump</A>(obj, fp, skipkeys=False, ensure_ascii=True, check_circular=True, allow_nan=True, cls=None, indent=None, **kw)</TT>
- <A HREF="simplejson/__init__.py.html?f=98&l=140#98" TITLE="View Source">...</A>
+ <TT><A HREF="module-simplejson.html#dump" CLASS="pudge-obj-link">dump</A>(obj, fp, skipkeys=False, ensure_ascii=True, check_circular=True, allow_nan=True, cls=None, indent=None, encoding='utf-8', **kw)</TT>
+ <A HREF="simplejson/__init__.py.html?f=98&l=142#98" TITLE="View Source">...</A>
</H4>
<DIV CLASS="pudge-section rst">
@@ -188,7 +188,7 @@
will be skipped instead of raising a <TT CLASS="docutils literal"><SPAN CLASS="pre">TypeError</SPAN></TT>.</P>
<P>If <TT CLASS="docutils literal"><SPAN CLASS="pre">ensure_ascii</SPAN></TT> is <TT CLASS="docutils literal"><SPAN CLASS="pre">False</SPAN></TT>, then the some chunks written to <TT CLASS="docutils literal"><SPAN CLASS="pre">fp</SPAN></TT>
may be <TT CLASS="docutils literal"><SPAN CLASS="pre">unicode</SPAN></TT> instances, subject to normal Python <TT CLASS="docutils literal"><SPAN CLASS="pre">str</SPAN></TT> to
-<TT CLASS="docutils literal"><SPAN CLASS="pre">unicode</SPAN></TT> coercion rules. Unless <TT CLASS="docutils literal"><SPAN CLASS="pre">fp.write()</SPAN></TT> explicitly
+<TT CLASS="docutils literal"><SPAN CLASS="pre">unicode</SPAN></TT> coercion rules. Unless <TT CLASS="docutils literal"><SPAN CLASS="pre">fp.write()</SPAN></TT> explicitly
understands <TT CLASS="docutils literal"><SPAN CLASS="pre">unicode</SPAN></TT> (as in <TT CLASS="docutils literal"><SPAN CLASS="pre">codecs.getwriter()</SPAN></TT>) this is likely
to cause an error.</P>
<P>If <TT CLASS="docutils literal"><SPAN CLASS="pre">check_circular</SPAN></TT> is <TT CLASS="docutils literal"><SPAN CLASS="pre">False</SPAN></TT>, then the circular reference check
@@ -199,8 +199,9 @@
in strict compliance of the JSON specification, instead of using the
JavaScript equivalents (<TT CLASS="docutils literal"><SPAN CLASS="pre">NaN</SPAN></TT>, <TT CLASS="docutils literal"><SPAN CLASS="pre">Infinity</SPAN></TT>, <TT CLASS="docutils literal"><SPAN CLASS="pre">-Infinity</SPAN></TT>).</P>
<P>If <TT CLASS="docutils literal"><SPAN CLASS="pre">indent</SPAN></TT> 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. <TT CLASS="docutils literal"><SPAN CLASS="pre">None</SPAN></TT> is the most compact representation.</P>
+members will be pretty-printed with that indent level. An indent level
+of 0 will only insert newlines. <TT CLASS="docutils literal"><SPAN CLASS="pre">None</SPAN></TT> is the most compact representation.</P>
+<P><TT CLASS="docutils literal"><SPAN CLASS="pre">encoding</SPAN></TT> is the character encoding for str instances, default is UTF-8.</P>
<P>To use a custom <TT CLASS="docutils literal"><SPAN CLASS="pre">JSONEncoder</SPAN></TT> subclass (e.g. one that overrides the
<TT CLASS="docutils literal"><SPAN CLASS="pre">.default()</SPAN></TT> method to serialize additional types), specify it with
the <TT CLASS="docutils literal"><SPAN CLASS="pre">cls</SPAN></TT> kwarg.</P>
@@ -210,8 +211,8 @@
</DIV><DIV CLASS="pudge-member routine ">
<A NAME="dumps"></A>
<H4 CLASS="pudge-member-name"><SPAN CLASS="prefix">f</SPAN>
- <TT><A HREF="module-simplejson.html#dumps" CLASS="pudge-obj-link">dumps</A>(obj, skipkeys=False, ensure_ascii=True, check_circular=True, allow_nan=True, cls=None, indent=None, separators=None, **kw)</TT>
- <A HREF="simplejson/__init__.py.html?f=141&l=183#141" TITLE="View Source">...</A>
+ <TT><A HREF="module-simplejson.html#dumps" CLASS="pudge-obj-link">dumps</A>(obj, skipkeys=False, ensure_ascii=True, check_circular=True, allow_nan=True, cls=None, indent=None, separators=None, encoding='utf-8', **kw)</TT>
+ <A HREF="simplejson/__init__.py.html?f=143&l=188#143" TITLE="View Source">...</A>
</H4>
<DIV CLASS="pudge-section rst">
@@ -232,9 +233,9 @@
strict compliance of the JSON specification, instead of using the
JavaScript equivalents (<TT CLASS="docutils literal"><SPAN CLASS="pre">NaN</SPAN></TT>, <TT CLASS="docutils literal"><SPAN CLASS="pre">Infinity</SPAN></TT>, <TT CLASS="docutils literal"><SPAN CLASS="pre">-Infinity</SPAN></TT>).</P>
<P>If <TT CLASS="docutils literal"><SPAN CLASS="pre">indent</SPAN></TT> 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. <TT CLASS="docutils literal"><SPAN CLASS="pre">None</SPAN></TT> is the most compact
+object members will be pretty-printed with that indent level. An indent
+level of 0 will only insert newlines. <TT CLASS="docutils literal"><SPAN CLASS="pre">None</SPAN></TT> is the most compact
representation.</P>
<P>If <TT CLASS="docutils literal"><SPAN CLASS="pre">separators</SPAN></TT> is an <TT CLASS="docutils literal"><SPAN CLASS="pre">(item_separator,</SPAN> <SPAN CLASS="pre">dict_separator)</SPAN></TT> tuple
then it will be used instead of the default <TT CLASS="docutils literal"><SPAN CLASS="pre">(',</SPAN> <SPAN CLASS="pre">',</SPAN> <SPAN CLASS="pre">':</SPAN> <SPAN CLASS="pre">')</SPAN></TT> separators.
<TT CLASS="docutils literal"><SPAN CLASS="pre">(',',</SPAN> <SPAN CLASS="pre">':')</SPAN></TT> is the most compact JSON representation.</P>
@@ -237,7 +238,8 @@
representation.</P>
<P>If <TT CLASS="docutils literal"><SPAN CLASS="pre">separators</SPAN></TT> is an <TT CLASS="docutils literal"><SPAN CLASS="pre">(item_separator,</SPAN> <SPAN CLASS="pre">dict_separator)</SPAN></TT> tuple
then it will be used instead of the default <TT CLASS="docutils literal"><SPAN CLASS="pre">(',</SPAN> <SPAN CLASS="pre">',</SPAN> <SPAN CLASS="pre">':</SPAN> <SPAN CLASS="pre">')</SPAN></TT> separators.
<TT CLASS="docutils literal"><SPAN CLASS="pre">(',',</SPAN> <SPAN CLASS="pre">':')</SPAN></TT> is the most compact JSON representation.</P>
+<P><TT CLASS="docutils literal"><SPAN CLASS="pre">encoding</SPAN></TT> is the character encoding for str instances, default is UTF-8.</P>
<P>To use a custom <TT CLASS="docutils literal"><SPAN CLASS="pre">JSONEncoder</SPAN></TT> subclass (e.g. one that overrides the
<TT CLASS="docutils literal"><SPAN CLASS="pre">.default()</SPAN></TT> method to serialize additional types), specify it with
the <TT CLASS="docutils literal"><SPAN CLASS="pre">cls</SPAN></TT> kwarg.</P>
@@ -248,7 +250,7 @@
<A NAME="load"></A>
<H4 CLASS="pudge-member-name"><SPAN CLASS="prefix">f</SPAN>
<TT><A HREF="module-simplejson.html#load" CLASS="pudge-obj-link">load</A>(fp, encoding=None, cls=None, object_hook=None, **kw)</TT>
- <A HREF="simplejson/__init__.py.html?f=184&l=209#184" TITLE="View Source">...</A>
+ <A HREF="simplejson/__init__.py.html?f=189&l=214#189" TITLE="View Source">...</A>
</H4>
<DIV CLASS="pudge-section rst">
@@ -258,8 +260,8 @@
</P>
<P>If the contents of <TT CLASS="docutils literal"><SPAN CLASS="pre">fp</SPAN></TT> is encoded with an ASCII based encoding other
than utf-8 (e.g. latin-1), then an appropriate <TT CLASS="docutils literal"><SPAN CLASS="pre">encoding</SPAN></TT> name must
-be specified. Encodings that are not ASCII based (such as UCS-2) are
+be specified. Encodings that are not ASCII based (such as UCS-2) are
not allowed, and should be wrapped with
<TT CLASS="docutils literal"><SPAN CLASS="pre">codecs.getreader(fp)(encoding)</SPAN></TT>, or simply decoded to a <TT CLASS="docutils literal"><SPAN CLASS="pre">unicode</SPAN></TT>
object and passed to <TT CLASS="docutils literal"><SPAN CLASS="pre">loads()</SPAN></TT></P>
<P><TT CLASS="docutils literal"><SPAN CLASS="pre">object_hook</SPAN></TT> is an optional function that will be called with the
@@ -262,9 +264,9 @@
not allowed, and should be wrapped with
<TT CLASS="docutils literal"><SPAN CLASS="pre">codecs.getreader(fp)(encoding)</SPAN></TT>, or simply decoded to a <TT CLASS="docutils literal"><SPAN CLASS="pre">unicode</SPAN></TT>
object and passed to <TT CLASS="docutils literal"><SPAN CLASS="pre">loads()</SPAN></TT></P>
<P><TT CLASS="docutils literal"><SPAN CLASS="pre">object_hook</SPAN></TT> is an optional function that will be called with the
-result of any object literal decode (a <TT CLASS="docutils literal"><SPAN CLASS="pre">dict</SPAN></TT>). The return value of
-<TT CLASS="docutils literal"><SPAN CLASS="pre">object_hook</SPAN></TT> will be used instead of the <TT CLASS="docutils literal"><SPAN CLASS="pre">dict</SPAN></TT>. This feature
+result of any object literal decode (a <TT CLASS="docutils literal"><SPAN CLASS="pre">dict</SPAN></TT>). The return value of
+<TT CLASS="docutils literal"><SPAN CLASS="pre">object_hook</SPAN></TT> will be used instead of the <TT CLASS="docutils literal"><SPAN CLASS="pre">dict</SPAN></TT>. This feature
can be used to implement custom decoders (e.g. JSON-RPC class hinting).</P>
<P>To use a custom <TT CLASS="docutils literal"><SPAN CLASS="pre">JSONDecoder</SPAN></TT> subclass, specify it with the <TT CLASS="docutils literal"><SPAN CLASS="pre">cls</SPAN></TT>
kwarg.</P>
@@ -275,7 +277,7 @@
<A NAME="loads"></A>
<H4 CLASS="pudge-member-name"><SPAN CLASS="prefix">f</SPAN>
<TT><A HREF="module-simplejson.html#loads" CLASS="pudge-obj-link">loads</A>(s, encoding=None, cls=None, object_hook=None, **kw)</TT>
- <A HREF="simplejson/__init__.py.html?f=210&l=233#210" TITLE="View Source">...</A>
+ <A HREF="simplejson/__init__.py.html?f=215&l=238#215" TITLE="View Source">...</A>
</H4>
<DIV CLASS="pudge-section rst">
@@ -285,6 +287,6 @@
</P>
<P>If <TT CLASS="docutils literal"><SPAN CLASS="pre">s</SPAN></TT> is a <TT CLASS="docutils literal"><SPAN CLASS="pre">str</SPAN></TT> instance and is encoded with an ASCII based encoding
other than utf-8 (e.g. latin-1) then an appropriate <TT CLASS="docutils literal"><SPAN CLASS="pre">encoding</SPAN></TT> name
-must be specified. Encodings that are not ASCII based (such as UCS-2)
+must be specified. Encodings that are not ASCII based (such as UCS-2)
are not allowed and should be decoded to <TT CLASS="docutils literal"><SPAN CLASS="pre">unicode</SPAN></TT> first.</P>
<P><TT CLASS="docutils literal"><SPAN CLASS="pre">object_hook</SPAN></TT> is an optional function that will be called with the
@@ -289,7 +291,7 @@
are not allowed and should be decoded to <TT CLASS="docutils literal"><SPAN CLASS="pre">unicode</SPAN></TT> first.</P>
<P><TT CLASS="docutils literal"><SPAN CLASS="pre">object_hook</SPAN></TT> is an optional function that will be called with the
-result of any object literal decode (a <TT CLASS="docutils literal"><SPAN CLASS="pre">dict</SPAN></TT>). The return value of
-<TT CLASS="docutils literal"><SPAN CLASS="pre">object_hook</SPAN></TT> will be used instead of the <TT CLASS="docutils literal"><SPAN CLASS="pre">dict</SPAN></TT>. This feature
+result of any object literal decode (a <TT CLASS="docutils literal"><SPAN CLASS="pre">dict</SPAN></TT>). The return value of
+<TT CLASS="docutils literal"><SPAN CLASS="pre">object_hook</SPAN></TT> will be used instead of the <TT CLASS="docutils literal"><SPAN CLASS="pre">dict</SPAN></TT>. This feature
can be used to implement custom decoders (e.g. JSON-RPC class hinting).</P>
<P>To use a custom <TT CLASS="docutils literal"><SPAN CLASS="pre">JSONDecoder</SPAN></TT> subclass, specify it with the <TT CLASS="docutils literal"><SPAN CLASS="pre">cls</SPAN></TT>
kwarg.</P>
@@ -305,7 +307,7 @@
<H4 CLASS="pudge-member-name"><SPAN CLASS="prefix">C</SPAN>
<TT>
<A HREF="class-simplejson.JSONEncoder.html" CLASS="pudge-obj-link">JSONEncoder</A>(...)</TT>
- <A HREF="simplejson/encoder.py.html?f=63&l=330#63" CLASS="pudge-member-view-source" TITLE="View Source">...</A>
+ <A HREF="simplejson/encoder.py.html?f=63&l=339#63" CLASS="pudge-member-view-source" TITLE="View Source">...</A>
</H4>
<DIV CLASS="pudge-section rst">
diff --git a/docs/module-index.html b/docs/module-index.html
index a4c3f06e5ebca2cc3cabcc6de316a0b4f7419666_ZG9jcy9tb2R1bGUtaW5kZXguaHRtbA==..c6fa01dc9a352915efb9a5b7985bd27614357d8c_ZG9jcy9tb2R1bGUtaW5kZXguaHRtbA== 100644
--- a/docs/module-index.html
+++ b/docs/module-index.html
@@ -2,10 +2,10 @@
<HTML>
<HEAD><META CONTENT="text/html; charset=utf-8" HTTP-EQUIV="Content-Type">
- <TITLE>simplejson 1.5dev-r982 -- Module Reference</TITLE>
+ <TITLE>simplejson 1.5 -- Module Reference</TITLE>
<LINK HREF="layout.css" TYPE="text/css" REL="stylesheet">
</HEAD>
<BODY>
<DIV ID="page">
<DIV ID="top-nav">
@@ -6,10 +6,10 @@
<LINK HREF="layout.css" TYPE="text/css" REL="stylesheet">
</HEAD>
<BODY>
<DIV ID="page">
<DIV ID="top-nav">
- <H1 ID="doc-title"><A HREF="index.html" REL="index">simplejson 1.5dev-r982</A></H1>
+ <H1 ID="doc-title"><A HREF="index.html" REL="index">simplejson 1.5</A></H1>
<DIV CLASS="online-navigation">
<A HREF="index.html" REL="index">index</A>
<SPAN ID="nav-docs">
@@ -31,7 +31,7 @@
<DIV ID="main-content">
<H1 CLASS="pudge-member-page-heading">
- simplejson 1.5dev-r982
+ simplejson 1.5
</H1>
<H4 CLASS="pudge-member-page-subheading">
Module Reference
diff --git a/docs/module-simplejson-index.html b/docs/module-simplejson-index.html
index a4c3f06e5ebca2cc3cabcc6de316a0b4f7419666_ZG9jcy9tb2R1bGUtc2ltcGxlanNvbi1pbmRleC5odG1s..c6fa01dc9a352915efb9a5b7985bd27614357d8c_ZG9jcy9tb2R1bGUtc2ltcGxlanNvbi1pbmRleC5odG1s 100644
--- a/docs/module-simplejson-index.html
+++ b/docs/module-simplejson-index.html
@@ -9,7 +9,7 @@
<DIV ID="page">
<DIV ID="top-nav">
- <H1 ID="doc-title"><A HREF="index.html" REL="index">simplejson 1.5dev-r982</A></H1>
+ <H1 ID="doc-title"><A HREF="index.html" REL="index">simplejson 1.5</A></H1>
<DIV CLASS="online-navigation">
<A HREF="index.html" REL="index">index</A>
<SPAN ID="nav-docs">
@@ -61,7 +61,7 @@
<A HREF="module-simplejson.html#load">
<TT>load</TT>
</A>
- <A HREF="simplejson/__init__.py.html?f=184&l=209#184">...</A>
+ <A HREF="simplejson/__init__.py.html?f=189&l=214#189">...</A>
<SMALL>
- <SPAN CLASS="rst">Deserialize <TT CLASS="docutils literal"><SPAN CLASS="pre">fp</SPAN></TT> (a <TT CLASS="docutils literal"><SPAN CLASS="pre">.read()</SPAN></TT>-supporting file-like object containing
a JSON document) to a Python object.</SPAN>
@@ -72,7 +72,7 @@
<A HREF="module-simplejson.html#dump">
<TT>dump</TT>
</A>
- <A HREF="simplejson/__init__.py.html?f=98&l=140#98">...</A>
+ <A HREF="simplejson/__init__.py.html?f=98&l=142#98">...</A>
<SMALL>
- <SPAN CLASS="rst">Serialize <TT CLASS="docutils literal"><SPAN CLASS="pre">obj</SPAN></TT> as a JSON formatted stream to <TT CLASS="docutils literal"><SPAN CLASS="pre">fp</SPAN></TT> (a
<TT CLASS="docutils literal"><SPAN CLASS="pre">.write()</SPAN></TT>-supporting file-like object).</SPAN>
@@ -83,7 +83,7 @@
<A HREF="module-simplejson.html#dumps">
<TT>dumps</TT>
</A>
- <A HREF="simplejson/__init__.py.html?f=141&l=183#141">...</A>
+ <A HREF="simplejson/__init__.py.html?f=143&l=188#143">...</A>
<SMALL>
- <SPAN CLASS="rst">Serialize <TT CLASS="docutils literal"><SPAN CLASS="pre">obj</SPAN></TT> to a JSON formatted <TT CLASS="docutils literal"><SPAN CLASS="pre">str</SPAN></TT>.</SPAN>
</SMALL>
@@ -93,7 +93,7 @@
<A HREF="module-simplejson.html#loads">
<TT>loads</TT>
</A>
- <A HREF="simplejson/__init__.py.html?f=210&l=233#210">...</A>
+ <A HREF="simplejson/__init__.py.html?f=215&l=238#215">...</A>
<SMALL>
- <SPAN CLASS="rst">Deserialize <TT CLASS="docutils literal"><SPAN CLASS="pre">s</SPAN></TT> (a <TT CLASS="docutils literal"><SPAN CLASS="pre">str</SPAN></TT> or <TT CLASS="docutils literal"><SPAN CLASS="pre">unicode</SPAN></TT> instance containing a JSON
document) to a Python object.</SPAN>
diff --git a/docs/module-simplejson.html b/docs/module-simplejson.html
index a4c3f06e5ebca2cc3cabcc6de316a0b4f7419666_ZG9jcy9tb2R1bGUtc2ltcGxlanNvbi5odG1s..c6fa01dc9a352915efb9a5b7985bd27614357d8c_ZG9jcy9tb2R1bGUtc2ltcGxlanNvbi5odG1s 100644
--- a/docs/module-simplejson.html
+++ b/docs/module-simplejson.html
@@ -9,7 +9,7 @@
<DIV ID="page">
<DIV ID="top-nav">
- <H1 ID="doc-title"><A HREF="index.html" REL="index">simplejson 1.5dev-r982</A></H1>
+ <H1 ID="doc-title"><A HREF="index.html" REL="index">simplejson 1.5</A></H1>
<DIV CLASS="online-navigation">
<A HREF="index.html" REL="index">index</A>
<SPAN ID="nav-docs">
@@ -174,8 +174,8 @@
<DIV CLASS="pudge-member routine ">
<A NAME="dump"></A>
<H4 CLASS="pudge-member-name"><SPAN CLASS="prefix">f</SPAN>
- <TT><A HREF="module-simplejson.html#dump" CLASS="pudge-obj-link">dump</A>(obj, fp, skipkeys=False, ensure_ascii=True, check_circular=True, allow_nan=True, cls=None, indent=None, **kw)</TT>
- <A HREF="simplejson/__init__.py.html?f=98&l=140#98" TITLE="View Source">...</A>
+ <TT><A HREF="module-simplejson.html#dump" CLASS="pudge-obj-link">dump</A>(obj, fp, skipkeys=False, ensure_ascii=True, check_circular=True, allow_nan=True, cls=None, indent=None, encoding='utf-8', **kw)</TT>
+ <A HREF="simplejson/__init__.py.html?f=98&l=142#98" TITLE="View Source">...</A>
</H4>
<DIV CLASS="pudge-section rst">
@@ -188,7 +188,7 @@
will be skipped instead of raising a <TT CLASS="docutils literal"><SPAN CLASS="pre">TypeError</SPAN></TT>.</P>
<P>If <TT CLASS="docutils literal"><SPAN CLASS="pre">ensure_ascii</SPAN></TT> is <TT CLASS="docutils literal"><SPAN CLASS="pre">False</SPAN></TT>, then the some chunks written to <TT CLASS="docutils literal"><SPAN CLASS="pre">fp</SPAN></TT>
may be <TT CLASS="docutils literal"><SPAN CLASS="pre">unicode</SPAN></TT> instances, subject to normal Python <TT CLASS="docutils literal"><SPAN CLASS="pre">str</SPAN></TT> to
-<TT CLASS="docutils literal"><SPAN CLASS="pre">unicode</SPAN></TT> coercion rules. Unless <TT CLASS="docutils literal"><SPAN CLASS="pre">fp.write()</SPAN></TT> explicitly
+<TT CLASS="docutils literal"><SPAN CLASS="pre">unicode</SPAN></TT> coercion rules. Unless <TT CLASS="docutils literal"><SPAN CLASS="pre">fp.write()</SPAN></TT> explicitly
understands <TT CLASS="docutils literal"><SPAN CLASS="pre">unicode</SPAN></TT> (as in <TT CLASS="docutils literal"><SPAN CLASS="pre">codecs.getwriter()</SPAN></TT>) this is likely
to cause an error.</P>
<P>If <TT CLASS="docutils literal"><SPAN CLASS="pre">check_circular</SPAN></TT> is <TT CLASS="docutils literal"><SPAN CLASS="pre">False</SPAN></TT>, then the circular reference check
@@ -199,8 +199,9 @@
in strict compliance of the JSON specification, instead of using the
JavaScript equivalents (<TT CLASS="docutils literal"><SPAN CLASS="pre">NaN</SPAN></TT>, <TT CLASS="docutils literal"><SPAN CLASS="pre">Infinity</SPAN></TT>, <TT CLASS="docutils literal"><SPAN CLASS="pre">-Infinity</SPAN></TT>).</P>
<P>If <TT CLASS="docutils literal"><SPAN CLASS="pre">indent</SPAN></TT> 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. <TT CLASS="docutils literal"><SPAN CLASS="pre">None</SPAN></TT> is the most compact representation.</P>
+members will be pretty-printed with that indent level. An indent level
+of 0 will only insert newlines. <TT CLASS="docutils literal"><SPAN CLASS="pre">None</SPAN></TT> is the most compact representation.</P>
+<P><TT CLASS="docutils literal"><SPAN CLASS="pre">encoding</SPAN></TT> is the character encoding for str instances, default is UTF-8.</P>
<P>To use a custom <TT CLASS="docutils literal"><SPAN CLASS="pre">JSONEncoder</SPAN></TT> subclass (e.g. one that overrides the
<TT CLASS="docutils literal"><SPAN CLASS="pre">.default()</SPAN></TT> method to serialize additional types), specify it with
the <TT CLASS="docutils literal"><SPAN CLASS="pre">cls</SPAN></TT> kwarg.</P>
@@ -210,8 +211,8 @@
</DIV><DIV CLASS="pudge-member routine ">
<A NAME="dumps"></A>
<H4 CLASS="pudge-member-name"><SPAN CLASS="prefix">f</SPAN>
- <TT><A HREF="module-simplejson.html#dumps" CLASS="pudge-obj-link">dumps</A>(obj, skipkeys=False, ensure_ascii=True, check_circular=True, allow_nan=True, cls=None, indent=None, separators=None, **kw)</TT>
- <A HREF="simplejson/__init__.py.html?f=141&l=183#141" TITLE="View Source">...</A>
+ <TT><A HREF="module-simplejson.html#dumps" CLASS="pudge-obj-link">dumps</A>(obj, skipkeys=False, ensure_ascii=True, check_circular=True, allow_nan=True, cls=None, indent=None, separators=None, encoding='utf-8', **kw)</TT>
+ <A HREF="simplejson/__init__.py.html?f=143&l=188#143" TITLE="View Source">...</A>
</H4>
<DIV CLASS="pudge-section rst">
@@ -232,9 +233,9 @@
strict compliance of the JSON specification, instead of using the
JavaScript equivalents (<TT CLASS="docutils literal"><SPAN CLASS="pre">NaN</SPAN></TT>, <TT CLASS="docutils literal"><SPAN CLASS="pre">Infinity</SPAN></TT>, <TT CLASS="docutils literal"><SPAN CLASS="pre">-Infinity</SPAN></TT>).</P>
<P>If <TT CLASS="docutils literal"><SPAN CLASS="pre">indent</SPAN></TT> 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. <TT CLASS="docutils literal"><SPAN CLASS="pre">None</SPAN></TT> is the most compact
+object members will be pretty-printed with that indent level. An indent
+level of 0 will only insert newlines. <TT CLASS="docutils literal"><SPAN CLASS="pre">None</SPAN></TT> is the most compact
representation.</P>
<P>If <TT CLASS="docutils literal"><SPAN CLASS="pre">separators</SPAN></TT> is an <TT CLASS="docutils literal"><SPAN CLASS="pre">(item_separator,</SPAN> <SPAN CLASS="pre">dict_separator)</SPAN></TT> tuple
then it will be used instead of the default <TT CLASS="docutils literal"><SPAN CLASS="pre">(',</SPAN> <SPAN CLASS="pre">',</SPAN> <SPAN CLASS="pre">':</SPAN> <SPAN CLASS="pre">')</SPAN></TT> separators.
<TT CLASS="docutils literal"><SPAN CLASS="pre">(',',</SPAN> <SPAN CLASS="pre">':')</SPAN></TT> is the most compact JSON representation.</P>
@@ -237,7 +238,8 @@
representation.</P>
<P>If <TT CLASS="docutils literal"><SPAN CLASS="pre">separators</SPAN></TT> is an <TT CLASS="docutils literal"><SPAN CLASS="pre">(item_separator,</SPAN> <SPAN CLASS="pre">dict_separator)</SPAN></TT> tuple
then it will be used instead of the default <TT CLASS="docutils literal"><SPAN CLASS="pre">(',</SPAN> <SPAN CLASS="pre">',</SPAN> <SPAN CLASS="pre">':</SPAN> <SPAN CLASS="pre">')</SPAN></TT> separators.
<TT CLASS="docutils literal"><SPAN CLASS="pre">(',',</SPAN> <SPAN CLASS="pre">':')</SPAN></TT> is the most compact JSON representation.</P>
+<P><TT CLASS="docutils literal"><SPAN CLASS="pre">encoding</SPAN></TT> is the character encoding for str instances, default is UTF-8.</P>
<P>To use a custom <TT CLASS="docutils literal"><SPAN CLASS="pre">JSONEncoder</SPAN></TT> subclass (e.g. one that overrides the
<TT CLASS="docutils literal"><SPAN CLASS="pre">.default()</SPAN></TT> method to serialize additional types), specify it with
the <TT CLASS="docutils literal"><SPAN CLASS="pre">cls</SPAN></TT> kwarg.</P>
@@ -248,7 +250,7 @@
<A NAME="load"></A>
<H4 CLASS="pudge-member-name"><SPAN CLASS="prefix">f</SPAN>
<TT><A HREF="module-simplejson.html#load" CLASS="pudge-obj-link">load</A>(fp, encoding=None, cls=None, object_hook=None, **kw)</TT>
- <A HREF="simplejson/__init__.py.html?f=184&l=209#184" TITLE="View Source">...</A>
+ <A HREF="simplejson/__init__.py.html?f=189&l=214#189" TITLE="View Source">...</A>
</H4>
<DIV CLASS="pudge-section rst">
@@ -258,8 +260,8 @@
</P>
<P>If the contents of <TT CLASS="docutils literal"><SPAN CLASS="pre">fp</SPAN></TT> is encoded with an ASCII based encoding other
than utf-8 (e.g. latin-1), then an appropriate <TT CLASS="docutils literal"><SPAN CLASS="pre">encoding</SPAN></TT> name must
-be specified. Encodings that are not ASCII based (such as UCS-2) are
+be specified. Encodings that are not ASCII based (such as UCS-2) are
not allowed, and should be wrapped with
<TT CLASS="docutils literal"><SPAN CLASS="pre">codecs.getreader(fp)(encoding)</SPAN></TT>, or simply decoded to a <TT CLASS="docutils literal"><SPAN CLASS="pre">unicode</SPAN></TT>
object and passed to <TT CLASS="docutils literal"><SPAN CLASS="pre">loads()</SPAN></TT></P>
<P><TT CLASS="docutils literal"><SPAN CLASS="pre">object_hook</SPAN></TT> is an optional function that will be called with the
@@ -262,9 +264,9 @@
not allowed, and should be wrapped with
<TT CLASS="docutils literal"><SPAN CLASS="pre">codecs.getreader(fp)(encoding)</SPAN></TT>, or simply decoded to a <TT CLASS="docutils literal"><SPAN CLASS="pre">unicode</SPAN></TT>
object and passed to <TT CLASS="docutils literal"><SPAN CLASS="pre">loads()</SPAN></TT></P>
<P><TT CLASS="docutils literal"><SPAN CLASS="pre">object_hook</SPAN></TT> is an optional function that will be called with the
-result of any object literal decode (a <TT CLASS="docutils literal"><SPAN CLASS="pre">dict</SPAN></TT>). The return value of
-<TT CLASS="docutils literal"><SPAN CLASS="pre">object_hook</SPAN></TT> will be used instead of the <TT CLASS="docutils literal"><SPAN CLASS="pre">dict</SPAN></TT>. This feature
+result of any object literal decode (a <TT CLASS="docutils literal"><SPAN CLASS="pre">dict</SPAN></TT>). The return value of
+<TT CLASS="docutils literal"><SPAN CLASS="pre">object_hook</SPAN></TT> will be used instead of the <TT CLASS="docutils literal"><SPAN CLASS="pre">dict</SPAN></TT>. This feature
can be used to implement custom decoders (e.g. JSON-RPC class hinting).</P>
<P>To use a custom <TT CLASS="docutils literal"><SPAN CLASS="pre">JSONDecoder</SPAN></TT> subclass, specify it with the <TT CLASS="docutils literal"><SPAN CLASS="pre">cls</SPAN></TT>
kwarg.</P>
@@ -275,7 +277,7 @@
<A NAME="loads"></A>
<H4 CLASS="pudge-member-name"><SPAN CLASS="prefix">f</SPAN>
<TT><A HREF="module-simplejson.html#loads" CLASS="pudge-obj-link">loads</A>(s, encoding=None, cls=None, object_hook=None, **kw)</TT>
- <A HREF="simplejson/__init__.py.html?f=210&l=233#210" TITLE="View Source">...</A>
+ <A HREF="simplejson/__init__.py.html?f=215&l=238#215" TITLE="View Source">...</A>
</H4>
<DIV CLASS="pudge-section rst">
@@ -285,6 +287,6 @@
</P>
<P>If <TT CLASS="docutils literal"><SPAN CLASS="pre">s</SPAN></TT> is a <TT CLASS="docutils literal"><SPAN CLASS="pre">str</SPAN></TT> instance and is encoded with an ASCII based encoding
other than utf-8 (e.g. latin-1) then an appropriate <TT CLASS="docutils literal"><SPAN CLASS="pre">encoding</SPAN></TT> name
-must be specified. Encodings that are not ASCII based (such as UCS-2)
+must be specified. Encodings that are not ASCII based (such as UCS-2)
are not allowed and should be decoded to <TT CLASS="docutils literal"><SPAN CLASS="pre">unicode</SPAN></TT> first.</P>
<P><TT CLASS="docutils literal"><SPAN CLASS="pre">object_hook</SPAN></TT> is an optional function that will be called with the
@@ -289,7 +291,7 @@
are not allowed and should be decoded to <TT CLASS="docutils literal"><SPAN CLASS="pre">unicode</SPAN></TT> first.</P>
<P><TT CLASS="docutils literal"><SPAN CLASS="pre">object_hook</SPAN></TT> is an optional function that will be called with the
-result of any object literal decode (a <TT CLASS="docutils literal"><SPAN CLASS="pre">dict</SPAN></TT>). The return value of
-<TT CLASS="docutils literal"><SPAN CLASS="pre">object_hook</SPAN></TT> will be used instead of the <TT CLASS="docutils literal"><SPAN CLASS="pre">dict</SPAN></TT>. This feature
+result of any object literal decode (a <TT CLASS="docutils literal"><SPAN CLASS="pre">dict</SPAN></TT>). The return value of
+<TT CLASS="docutils literal"><SPAN CLASS="pre">object_hook</SPAN></TT> will be used instead of the <TT CLASS="docutils literal"><SPAN CLASS="pre">dict</SPAN></TT>. This feature
can be used to implement custom decoders (e.g. JSON-RPC class hinting).</P>
<P>To use a custom <TT CLASS="docutils literal"><SPAN CLASS="pre">JSONDecoder</SPAN></TT> subclass, specify it with the <TT CLASS="docutils literal"><SPAN CLASS="pre">cls</SPAN></TT>
kwarg.</P>
@@ -305,7 +307,7 @@
<H4 CLASS="pudge-member-name"><SPAN CLASS="prefix">C</SPAN>
<TT>
<A HREF="class-simplejson.JSONEncoder.html" CLASS="pudge-obj-link">JSONEncoder</A>(...)</TT>
- <A HREF="simplejson/encoder.py.html?f=63&l=330#63" CLASS="pudge-member-view-source" TITLE="View Source">...</A>
+ <A HREF="simplejson/encoder.py.html?f=63&l=339#63" CLASS="pudge-member-view-source" TITLE="View Source">...</A>
</H4>
<DIV CLASS="pudge-section rst">
diff --git a/docs/simplejson/__init__.py.html b/docs/simplejson/__init__.py.html
index a4c3f06e5ebca2cc3cabcc6de316a0b4f7419666_ZG9jcy9zaW1wbGVqc29uL19faW5pdF9fLnB5Lmh0bWw=..c6fa01dc9a352915efb9a5b7985bd27614357d8c_ZG9jcy9zaW1wbGVqc29uL19faW5pdF9fLnB5Lmh0bWw= 100644
--- a/docs/simplejson/__init__.py.html
+++ b/docs/simplejson/__init__.py.html
@@ -168,7 +168,7 @@
<a class="lnum" href="#96" name="96">0096</a><span class="keyword">from</span> <span class="name">encoder</span> <span class="keyword">import</span> <span class="name">JSONEncoder</span><br />
<a class="lnum" href="#97" name="97">0097</a><br />
<a class="lnum" href="#98" name="98">0098</a><span class="keyword">def</span> <span class="name">dump</span><span class="op">(</span><span class="name">obj</span><span class="op">,</span> <span class="name">fp</span><span class="op">,</span> <span class="name">skipkeys</span><span class="op">=</span><span class="name">False</span><span class="op">,</span> <span class="name">ensure_ascii</span><span class="op">=</span><span class="name">True</span><span class="op">,</span> <span class="name">check_circular</span><span class="op">=</span><span class="name">True</span><span class="op">,</span><br />
-<a class="lnum" href="#99" name="99">0099</a>        <span class="name">allow_nan</span><span class="op">=</span><span class="name">True</span><span class="op">,</span> <span class="name">cls</span><span class="op">=</span><span class="name">None</span><span class="op">,</span> <span class="name">indent</span><span class="op">=</span><span class="name">None</span><span class="op">,</span> <span class="op">**</span><span class="name">kw</span><span class="op">)</span><span class="op">:</span><br />
+<a class="lnum" href="#99" name="99">0099</a>        <span class="name">allow_nan</span><span class="op">=</span><span class="name">True</span><span class="op">,</span> <span class="name">cls</span><span class="op">=</span><span class="name">None</span><span class="op">,</span> <span class="name">indent</span><span class="op">=</span><span class="name">None</span><span class="op">,</span> <span class="name">encoding</span><span class="op">=</span><span class="string">'utf-8'</span><span class="op">,</span> <span class="op">**</span><span class="name">kw</span><span class="op">)</span><span class="op">:</span><br />
<a class="lnum" href="#100" name="100">0100</a>    <span class="string">"""</span><br />
<a class="lnum" href="#101" name="101">0101</a><span class="string">    Serialize ``obj`` as a JSON formatted stream to ``fp`` (a</span><br />
<a class="lnum" href="#102" name="102">0102</a><span class="string">    ``.write()``-supporting file-like object).</span><br />
@@ -179,7 +179,7 @@
<a class="lnum" href="#107" name="107">0107</a><span class="string"></span><br />
<a class="lnum" href="#108" name="108">0108</a><span class="string">    If ``ensure_ascii`` is ``False``, then the some chunks written to ``fp``</span><br />
<a class="lnum" href="#109" name="109">0109</a><span class="string">    may be ``unicode`` instances, subject to normal Python ``str`` to</span><br />
-<a class="lnum" href="#110" name="110">0110</a><span class="string">    ``unicode`` coercion rules.  Unless ``fp.write()`` explicitly</span><br />
+<a class="lnum" href="#110" name="110">0110</a><span class="string">    ``unicode`` coercion rules. Unless ``fp.write()`` explicitly</span><br />
<a class="lnum" href="#111" name="111">0111</a><span class="string">    understands ``unicode`` (as in ``codecs.getwriter()``) this is likely</span><br />
<a class="lnum" href="#112" name="112">0112</a><span class="string">    to cause an error.</span><br />
<a class="lnum" href="#113" name="113">0113</a><span class="string"></span><br />
@@ -193,6 +193,6 @@
<a class="lnum" href="#121" name="121">0121</a><span class="string">    JavaScript equivalents (``NaN``, ``Infinity``, ``-Infinity``).</span><br />
<a class="lnum" href="#122" name="122">0122</a><span class="string"></span><br />
<a class="lnum" href="#123" name="123">0123</a><span class="string">    If ``indent`` is a non-negative integer, then JSON array elements and object</span><br />
-<a class="lnum" href="#124" name="124">0124</a><span class="string">    members will be pretty-printed with that indent level.  An indent level</span><br />
-<a class="lnum" href="#125" name="125">0125</a><span class="string">    of 0 will only insert newlines.  ``None`` is the most compact representation.</span><br />
+<a class="lnum" href="#124" name="124">0124</a><span class="string">    members will be pretty-printed with that indent level. An indent level</span><br />
+<a class="lnum" href="#125" name="125">0125</a><span class="string">    of 0 will only insert newlines. ``None`` is the most compact representation.</span><br />
<a class="lnum" href="#126" name="126">0126</a><span class="string"></span><br />
@@ -198,94 +198,94 @@
<a class="lnum" href="#126" name="126">0126</a><span class="string"></span><br />
-<a class="lnum" href="#127" name="127">0127</a><span class="string">    To use a custom ``JSONEncoder`` subclass (e.g. one that overrides the</span><br />
-<a class="lnum" href="#128" name="128">0128</a><span class="string">    ``.default()`` method to serialize additional types), specify it with</span><br />
-<a class="lnum" href="#129" name="129">0129</a><span class="string">    the ``cls`` kwarg.</span><br />
-<a class="lnum" href="#130" name="130">0130</a><span class="string">    """</span><br />
-<a class="lnum" href="#131" name="131">0131</a>    <span class="keyword">if</span> <span class="name">cls</span> <span class="keyword">is</span> <span class="name">None</span><span class="op">:</span><br />
-<a class="lnum" href="#132" name="132">0132</a>        <span class="name">cls</span> <span class="op">=</span> <span class="name">JSONEncoder</span><br />
-<a class="lnum" href="#133" name="133">0133</a>    <span class="name">iterable</span> <span class="op">=</span> <span class="name">cls</span><span class="op">(</span><span class="name">skipkeys</span><span class="op">=</span><span class="name">skipkeys</span><span class="op">,</span> <span class="name">ensure_ascii</span><span class="op">=</span><span class="name">ensure_ascii</span><span class="op">,</span><br />
-<a class="lnum" href="#134" name="134">0134</a>        <span class="name">check_circular</span><span class="op">=</span><span class="name">check_circular</span><span class="op">,</span> <span class="name">allow_nan</span><span class="op">=</span><span class="name">allow_nan</span><span class="op">,</span> <span class="name">indent</span><span class="op">=</span><span class="name">indent</span><span class="op">,</span><br />
-<a class="lnum" href="#135" name="135">0135</a>        <span class="op">**</span><span class="name">kw</span><span class="op">)</span><span class="op">.</span><span class="name">iterencode</span><span class="op">(</span><span class="name">obj</span><span class="op">)</span><br />
-<a class="lnum" href="#136" name="136">0136</a>    <span class="comment"># could accelerate with writelines in some versions of Python, at</span><br />
-<a class="lnum" href="#137" name="137">0137</a><span class="comment"></span>    <span class="comment"># a debuggability cost</span><br />
-<a class="lnum" href="#138" name="138">0138</a><span class="comment"></span>    <span class="keyword">for</span> <span class="name">chunk</span> <span class="keyword">in</span> <span class="name">iterable</span><span class="op">:</span><br />
-<a class="lnum" href="#139" name="139">0139</a>        <span class="name">fp</span><span class="op">.</span><span class="name">write</span><span class="op">(</span><span class="name">chunk</span><span class="op">)</span><br />
-<a class="lnum" href="#140" name="140">0140</a><br />
-<a class="lnum" href="#141" name="141">0141</a><span class="keyword">def</span> <span class="name">dumps</span><span class="op">(</span><span class="name">obj</span><span class="op">,</span> <span class="name">skipkeys</span><span class="op">=</span><span class="name">False</span><span class="op">,</span> <span class="name">ensure_ascii</span><span class="op">=</span><span class="name">True</span><span class="op">,</span> <span class="name">check_circular</span><span class="op">=</span><span class="name">True</span><span class="op">,</span><br />
-<a class="lnum" href="#142" name="142">0142</a>        <span class="name">allow_nan</span><span class="op">=</span><span class="name">True</span><span class="op">,</span> <span class="name">cls</span><span class="op">=</span><span class="name">None</span><span class="op">,</span> <span class="name">indent</span><span class="op">=</span><span class="name">None</span><span class="op">,</span> <span class="name">separators</span><span class="op">=</span><span class="name">None</span><span class="op">,</span> <span class="op">**</span><span class="name">kw</span><span class="op">)</span><span class="op">:</span><br />
-<a class="lnum" href="#143" name="143">0143</a>    <span class="string">"""</span><br />
-<a class="lnum" href="#144" name="144">0144</a><span class="string">    Serialize ``obj`` to a JSON formatted ``str``.</span><br />
-<a class="lnum" href="#145" name="145">0145</a><span class="string"></span><br />
-<a class="lnum" href="#146" name="146">0146</a><span class="string">    If ``skipkeys`` is ``True`` then ``dict`` keys that are not basic types</span><br />
-<a class="lnum" href="#147" name="147">0147</a><span class="string">    (``str``, ``unicode``, ``int``, ``long``, ``float``, ``bool``, ``None``) </span><br />
-<a class="lnum" href="#148" name="148">0148</a><span class="string">    will be skipped instead of raising a ``TypeError``.</span><br />
-<a class="lnum" href="#149" name="149">0149</a><span class="string"></span><br />
-<a class="lnum" href="#150" name="150">0150</a><span class="string">    If ``ensure_ascii`` is ``False``, then the return value will be a</span><br />
-<a class="lnum" href="#151" name="151">0151</a><span class="string">    ``unicode`` instance subject to normal Python ``str`` to ``unicode``</span><br />
-<a class="lnum" href="#152" name="152">0152</a><span class="string">    coercion rules instead of being escaped to an ASCII ``str``.</span><br />
-<a class="lnum" href="#153" name="153">0153</a><span class="string"></span><br />
-<a class="lnum" href="#154" name="154">0154</a><span class="string">    If ``check_circular`` is ``False``, then the circular reference check</span><br />
-<a class="lnum" href="#155" name="155">0155</a><span class="string">    for container types will be skipped and a circular reference will</span><br />
-<a class="lnum" href="#156" name="156">0156</a><span class="string">    result in an ``OverflowError`` (or worse).</span><br />
-<a class="lnum" href="#157" name="157">0157</a><span class="string"></span><br />
-<a class="lnum" href="#158" name="158">0158</a><span class="string">    If ``allow_nan`` is ``False``, then it will be a ``ValueError`` to</span><br />
-<a class="lnum" href="#159" name="159">0159</a><span class="string">    serialize out of range ``float`` values (``nan``, ``inf``, ``-inf``) in</span><br />
-<a class="lnum" href="#160" name="160">0160</a><span class="string">    strict compliance of the JSON specification, instead of using the</span><br />
-<a class="lnum" href="#161" name="161">0161</a><span class="string">    JavaScript equivalents (``NaN``, ``Infinity``, ``-Infinity``).</span><br />
-<a class="lnum" href="#162" name="162">0162</a><span class="string"></span><br />
-<a class="lnum" href="#163" name="163">0163</a><span class="string">    If ``indent`` is a non-negative integer, then JSON array elements and</span><br />
-<a class="lnum" href="#164" name="164">0164</a><span class="string">    object members will be pretty-printed with that indent level.  An indent</span><br />
-<a class="lnum" href="#165" name="165">0165</a><span class="string">    level of 0 will only insert newlines.  ``None`` is the most compact</span><br />
-<a class="lnum" href="#166" name="166">0166</a><span class="string">    representation.</span><br />
-<a class="lnum" href="#167" name="167">0167</a><span class="string"></span><br />
-<a class="lnum" href="#168" name="168">0168</a><span class="string">    If ``separators`` is an ``(item_separator, dict_separator)`` tuple</span><br />
-<a class="lnum" href="#169" name="169">0169</a><span class="string">    then it will be used instead of the default ``(', ', ': ')`` separators.</span><br />
-<a class="lnum" href="#170" name="170">0170</a><span class="string">    ``(',', ':')`` is the most compact JSON representation.</span><br />
-<a class="lnum" href="#171" name="171">0171</a><span class="string"></span><br />
-<a class="lnum" href="#172" name="172">0172</a><span class="string">    To use a custom ``JSONEncoder`` subclass (e.g. one that overrides the</span><br />
-<a class="lnum" href="#173" name="173">0173</a><span class="string">    ``.default()`` method to serialize additional types), specify it with</span><br />
-<a class="lnum" href="#174" name="174">0174</a><span class="string">    the ``cls`` kwarg.</span><br />
-<a class="lnum" href="#175" name="175">0175</a><span class="string">    """</span><br />
-<a class="lnum" href="#176" name="176">0176</a>    <span class="keyword">if</span> <span class="name">cls</span> <span class="keyword">is</span> <span class="name">None</span><span class="op">:</span><br />
-<a class="lnum" href="#177" name="177">0177</a>        <span class="name">cls</span> <span class="op">=</span> <span class="name">JSONEncoder</span><br />
-<a class="lnum" href="#178" name="178">0178</a>    <span class="keyword">return</span> <span class="name">cls</span><span class="op">(</span><br />
-<a class="lnum" href="#179" name="179">0179</a>        <span class="name">skipkeys</span><span class="op">=</span><span class="name">skipkeys</span><span class="op">,</span> <span class="name">ensure_ascii</span><span class="op">=</span><span class="name">ensure_ascii</span><span class="op">,</span><br />
-<a class="lnum" href="#180" name="180">0180</a>        <span class="name">check_circular</span><span class="op">=</span><span class="name">check_circular</span><span class="op">,</span> <span class="name">allow_nan</span><span class="op">=</span><span class="name">allow_nan</span><span class="op">,</span> <span class="name">indent</span><span class="op">=</span><span class="name">indent</span><span class="op">,</span><br />
-<a class="lnum" href="#181" name="181">0181</a>        <span class="name">separators</span><span class="op">=</span><span class="name">separators</span><span class="op">,</span><br />
-<a class="lnum" href="#182" name="182">0182</a>        <span class="op">**</span><span class="name">kw</span><span class="op">)</span><span class="op">.</span><span class="name">encode</span><span class="op">(</span><span class="name">obj</span><span class="op">)</span><br />
-<a class="lnum" href="#183" name="183">0183</a><br />
-<a class="lnum" href="#184" name="184">0184</a><span class="keyword">def</span> <span class="name">load</span><span class="op">(</span><span class="name">fp</span><span class="op">,</span> <span class="name">encoding</span><span class="op">=</span><span class="name">None</span><span class="op">,</span> <span class="name">cls</span><span class="op">=</span><span class="name">None</span><span class="op">,</span> <span class="name">object_hook</span><span class="op">=</span><span class="name">None</span><span class="op">,</span> <span class="op">**</span><span class="name">kw</span><span class="op">)</span><span class="op">:</span><br />
-<a class="lnum" href="#185" name="185">0185</a>    <span class="string">"""</span><br />
-<a class="lnum" href="#186" name="186">0186</a><span class="string">    Deserialize ``fp`` (a ``.read()``-supporting file-like object containing</span><br />
-<a class="lnum" href="#187" name="187">0187</a><span class="string">    a JSON document) to a Python object.</span><br />
-<a class="lnum" href="#188" name="188">0188</a><span class="string"></span><br />
-<a class="lnum" href="#189" name="189">0189</a><span class="string">    If the contents of ``fp`` is encoded with an ASCII based encoding other</span><br />
-<a class="lnum" href="#190" name="190">0190</a><span class="string">    than utf-8 (e.g. latin-1), then an appropriate ``encoding`` name must</span><br />
-<a class="lnum" href="#191" name="191">0191</a><span class="string">    be specified.  Encodings that are not ASCII based (such as UCS-2) are</span><br />
-<a class="lnum" href="#192" name="192">0192</a><span class="string">    not allowed, and should be wrapped with</span><br />
-<a class="lnum" href="#193" name="193">0193</a><span class="string">    ``codecs.getreader(fp)(encoding)``, or simply decoded to a ``unicode``</span><br />
-<a class="lnum" href="#194" name="194">0194</a><span class="string">    object and passed to ``loads()``</span><br />
-<a class="lnum" href="#195" name="195">0195</a><span class="string"></span><br />
-<a class="lnum" href="#196" name="196">0196</a><span class="string">    ``object_hook`` is an optional function that will be called with the</span><br />
-<a class="lnum" href="#197" name="197">0197</a><span class="string">    result of any object literal decode (a ``dict``).  The return value of</span><br />
-<a class="lnum" href="#198" name="198">0198</a><span class="string">    ``object_hook`` will be used instead of the ``dict``.  This feature</span><br />
-<a class="lnum" href="#199" name="199">0199</a><span class="string">    can be used to implement custom decoders (e.g. JSON-RPC class hinting).</span><br />
-<a class="lnum" href="#200" name="200">0200</a><span class="string">    </span><br />
-<a class="lnum" href="#201" name="201">0201</a><span class="string">    To use a custom ``JSONDecoder`` subclass, specify it with the ``cls``</span><br />
-<a class="lnum" href="#202" name="202">0202</a><span class="string">    kwarg.</span><br />
-<a class="lnum" href="#203" name="203">0203</a><span class="string">    """</span><br />
-<a class="lnum" href="#204" name="204">0204</a>    <span class="keyword">if</span> <span class="name">cls</span> <span class="keyword">is</span> <span class="name">None</span><span class="op">:</span><br />
-<a class="lnum" href="#205" name="205">0205</a>        <span class="name">cls</span> <span class="op">=</span> <span class="name">JSONDecoder</span><br />
-<a class="lnum" href="#206" name="206">0206</a>    <span class="keyword">if</span> <span class="name">object_hook</span> <span class="keyword">is</span> <span class="keyword">not</span> <span class="name">None</span><span class="op">:</span><br />
-<a class="lnum" href="#207" name="207">0207</a>        <span class="name">kw</span><span class="op">[</span><span class="string">'object_hook'</span><span class="op">]</span> <span class="op">=</span> <span class="name">object_hook</span><br />
-<a class="lnum" href="#208" name="208">0208</a>    <span class="keyword">return</span> <span class="name">cls</span><span class="op">(</span><span class="name">encoding</span><span class="op">=</span><span class="name">encoding</span><span class="op">,</span> <span class="op">**</span><span class="name">kw</span><span class="op">)</span><span class="op">.</span><span class="name">decode</span><span class="op">(</span><span class="name">fp</span><span class="op">.</span><span class="name">read</span><span class="op">(</span><span class="op">)</span><span class="op">)</span><br />
-<a class="lnum" href="#209" name="209">0209</a><br />
-<a class="lnum" href="#210" name="210">0210</a><span class="keyword">def</span> <span class="name">loads</span><span class="op">(</span><span class="name">s</span><span class="op">,</span> <span class="name">encoding</span><span class="op">=</span><span class="name">None</span><span class="op">,</span> <span class="name">cls</span><span class="op">=</span><span class="name">None</span><span class="op">,</span> <span class="name">object_hook</span><span class="op">=</span><span class="name">None</span><span class="op">,</span> <span class="op">**</span><span class="name">kw</span><span class="op">)</span><span class="op">:</span><br />
-<a class="lnum" href="#211" name="211">0211</a>    <span class="string">"""</span><br />
-<a class="lnum" href="#212" name="212">0212</a><span class="string">    Deserialize ``s`` (a ``str`` or ``unicode`` instance containing a JSON</span><br />
-<a class="lnum" href="#213" name="213">0213</a><span class="string">    document) to a Python object.</span><br />
-<a class="lnum" href="#214" name="214">0214</a><span class="string"></span><br />
-<a class="lnum" href="#215" name="215">0215</a><span class="string">    If ``s`` is a ``str`` instance and is encoded with an ASCII based encoding</span><br />
-<a class="lnum" href="#216" name="216">0216</a><span class="string">    other than utf-8 (e.g. latin-1) then an appropriate ``encoding`` name</span><br />
-<a class="lnum" href="#217" name="217">0217</a><span class="string">    must be specified.  Encodings that are not ASCII based (such as UCS-2)</span><br />
-<a class="lnum" href="#218" name="218">0218</a><span class="string">    are not allowed and should be decoded to ``unicode`` first.</span><br />
+<a class="lnum" href="#127" name="127">0127</a><span class="string">    ``encoding`` is the character encoding for str instances, default is UTF-8.</span><br />
+<a class="lnum" href="#128" name="128">0128</a><span class="string"></span><br />
+<a class="lnum" href="#129" name="129">0129</a><span class="string">    To use a custom ``JSONEncoder`` subclass (e.g. one that overrides the</span><br />
+<a class="lnum" href="#130" name="130">0130</a><span class="string">    ``.default()`` method to serialize additional types), specify it with</span><br />
+<a class="lnum" href="#131" name="131">0131</a><span class="string">    the ``cls`` kwarg.</span><br />
+<a class="lnum" href="#132" name="132">0132</a><span class="string">    """</span><br />
+<a class="lnum" href="#133" name="133">0133</a>    <span class="keyword">if</span> <span class="name">cls</span> <span class="keyword">is</span> <span class="name">None</span><span class="op">:</span><br />
+<a class="lnum" href="#134" name="134">0134</a>        <span class="name">cls</span> <span class="op">=</span> <span class="name">JSONEncoder</span><br />
+<a class="lnum" href="#135" name="135">0135</a>    <span class="name">iterable</span> <span class="op">=</span> <span class="name">cls</span><span class="op">(</span><span class="name">skipkeys</span><span class="op">=</span><span class="name">skipkeys</span><span class="op">,</span> <span class="name">ensure_ascii</span><span class="op">=</span><span class="name">ensure_ascii</span><span class="op">,</span><br />
+<a class="lnum" href="#136" name="136">0136</a>        <span class="name">check_circular</span><span class="op">=</span><span class="name">check_circular</span><span class="op">,</span> <span class="name">allow_nan</span><span class="op">=</span><span class="name">allow_nan</span><span class="op">,</span> <span class="name">indent</span><span class="op">=</span><span class="name">indent</span><span class="op">,</span><br />
+<a class="lnum" href="#137" name="137">0137</a>        <span class="name">encoding</span><span class="op">=</span><span class="name">encoding</span><span class="op">,</span> <span class="op">**</span><span class="name">kw</span><span class="op">)</span><span class="op">.</span><span class="name">iterencode</span><span class="op">(</span><span class="name">obj</span><span class="op">)</span><br />
+<a class="lnum" href="#138" name="138">0138</a>    <span class="comment"># could accelerate with writelines in some versions of Python, at</span><br />
+<a class="lnum" href="#139" name="139">0139</a><span class="comment"></span>    <span class="comment"># a debuggability cost</span><br />
+<a class="lnum" href="#140" name="140">0140</a><span class="comment"></span>    <span class="keyword">for</span> <span class="name">chunk</span> <span class="keyword">in</span> <span class="name">iterable</span><span class="op">:</span><br />
+<a class="lnum" href="#141" name="141">0141</a>        <span class="name">fp</span><span class="op">.</span><span class="name">write</span><span class="op">(</span><span class="name">chunk</span><span class="op">)</span><br />
+<a class="lnum" href="#142" name="142">0142</a><br />
+<a class="lnum" href="#143" name="143">0143</a><span class="keyword">def</span> <span class="name">dumps</span><span class="op">(</span><span class="name">obj</span><span class="op">,</span> <span class="name">skipkeys</span><span class="op">=</span><span class="name">False</span><span class="op">,</span> <span class="name">ensure_ascii</span><span class="op">=</span><span class="name">True</span><span class="op">,</span> <span class="name">check_circular</span><span class="op">=</span><span class="name">True</span><span class="op">,</span><br />
+<a class="lnum" href="#144" name="144">0144</a>        <span class="name">allow_nan</span><span class="op">=</span><span class="name">True</span><span class="op">,</span> <span class="name">cls</span><span class="op">=</span><span class="name">None</span><span class="op">,</span> <span class="name">indent</span><span class="op">=</span><span class="name">None</span><span class="op">,</span> <span class="name">separators</span><span class="op">=</span><span class="name">None</span><span class="op">,</span><br />
+<a class="lnum" href="#145" name="145">0145</a>        <span class="name">encoding</span><span class="op">=</span><span class="string">'utf-8'</span><span class="op">,</span> <span class="op">**</span><span class="name">kw</span><span class="op">)</span><span class="op">:</span><br />
+<a class="lnum" href="#146" name="146">0146</a>    <span class="string">"""</span><br />
+<a class="lnum" href="#147" name="147">0147</a><span class="string">    Serialize ``obj`` to a JSON formatted ``str``.</span><br />
+<a class="lnum" href="#148" name="148">0148</a><span class="string"></span><br />
+<a class="lnum" href="#149" name="149">0149</a><span class="string">    If ``skipkeys`` is ``True`` then ``dict`` keys that are not basic types</span><br />
+<a class="lnum" href="#150" name="150">0150</a><span class="string">    (``str``, ``unicode``, ``int``, ``long``, ``float``, ``bool``, ``None``) </span><br />
+<a class="lnum" href="#151" name="151">0151</a><span class="string">    will be skipped instead of raising a ``TypeError``.</span><br />
+<a class="lnum" href="#152" name="152">0152</a><span class="string"></span><br />
+<a class="lnum" href="#153" name="153">0153</a><span class="string">    If ``ensure_ascii`` is ``False``, then the return value will be a</span><br />
+<a class="lnum" href="#154" name="154">0154</a><span class="string">    ``unicode`` instance subject to normal Python ``str`` to ``unicode``</span><br />
+<a class="lnum" href="#155" name="155">0155</a><span class="string">    coercion rules instead of being escaped to an ASCII ``str``.</span><br />
+<a class="lnum" href="#156" name="156">0156</a><span class="string"></span><br />
+<a class="lnum" href="#157" name="157">0157</a><span class="string">    If ``check_circular`` is ``False``, then the circular reference check</span><br />
+<a class="lnum" href="#158" name="158">0158</a><span class="string">    for container types will be skipped and a circular reference will</span><br />
+<a class="lnum" href="#159" name="159">0159</a><span class="string">    result in an ``OverflowError`` (or worse).</span><br />
+<a class="lnum" href="#160" name="160">0160</a><span class="string"></span><br />
+<a class="lnum" href="#161" name="161">0161</a><span class="string">    If ``allow_nan`` is ``False``, then it will be a ``ValueError`` to</span><br />
+<a class="lnum" href="#162" name="162">0162</a><span class="string">    serialize out of range ``float`` values (``nan``, ``inf``, ``-inf``) in</span><br />
+<a class="lnum" href="#163" name="163">0163</a><span class="string">    strict compliance of the JSON specification, instead of using the</span><br />
+<a class="lnum" href="#164" name="164">0164</a><span class="string">    JavaScript equivalents (``NaN``, ``Infinity``, ``-Infinity``).</span><br />
+<a class="lnum" href="#165" name="165">0165</a><span class="string"></span><br />
+<a class="lnum" href="#166" name="166">0166</a><span class="string">    If ``indent`` is a non-negative integer, then JSON array elements and</span><br />
+<a class="lnum" href="#167" name="167">0167</a><span class="string">    object members will be pretty-printed with that indent level. An indent</span><br />
+<a class="lnum" href="#168" name="168">0168</a><span class="string">    level of 0 will only insert newlines. ``None`` is the most compact</span><br />
+<a class="lnum" href="#169" name="169">0169</a><span class="string">    representation.</span><br />
+<a class="lnum" href="#170" name="170">0170</a><span class="string"></span><br />
+<a class="lnum" href="#171" name="171">0171</a><span class="string">    If ``separators`` is an ``(item_separator, dict_separator)`` tuple</span><br />
+<a class="lnum" href="#172" name="172">0172</a><span class="string">    then it will be used instead of the default ``(', ', ': ')`` separators.</span><br />
+<a class="lnum" href="#173" name="173">0173</a><span class="string">    ``(',', ':')`` is the most compact JSON representation.</span><br />
+<a class="lnum" href="#174" name="174">0174</a><span class="string"></span><br />
+<a class="lnum" href="#175" name="175">0175</a><span class="string">    ``encoding`` is the character encoding for str instances, default is UTF-8.</span><br />
+<a class="lnum" href="#176" name="176">0176</a><span class="string"></span><br />
+<a class="lnum" href="#177" name="177">0177</a><span class="string">    To use a custom ``JSONEncoder`` subclass (e.g. one that overrides the</span><br />
+<a class="lnum" href="#178" name="178">0178</a><span class="string">    ``.default()`` method to serialize additional types), specify it with</span><br />
+<a class="lnum" href="#179" name="179">0179</a><span class="string">    the ``cls`` kwarg.</span><br />
+<a class="lnum" href="#180" name="180">0180</a><span class="string">    """</span><br />
+<a class="lnum" href="#181" name="181">0181</a>    <span class="keyword">if</span> <span class="name">cls</span> <span class="keyword">is</span> <span class="name">None</span><span class="op">:</span><br />
+<a class="lnum" href="#182" name="182">0182</a>        <span class="name">cls</span> <span class="op">=</span> <span class="name">JSONEncoder</span><br />
+<a class="lnum" href="#183" name="183">0183</a>    <span class="keyword">return</span> <span class="name">cls</span><span class="op">(</span><br />
+<a class="lnum" href="#184" name="184">0184</a>        <span class="name">skipkeys</span><span class="op">=</span><span class="name">skipkeys</span><span class="op">,</span> <span class="name">ensure_ascii</span><span class="op">=</span><span class="name">ensure_ascii</span><span class="op">,</span><br />
+<a class="lnum" href="#185" name="185">0185</a>        <span class="name">check_circular</span><span class="op">=</span><span class="name">check_circular</span><span class="op">,</span> <span class="name">allow_nan</span><span class="op">=</span><span class="name">allow_nan</span><span class="op">,</span> <span class="name">indent</span><span class="op">=</span><span class="name">indent</span><span class="op">,</span><br />
+<a class="lnum" href="#186" name="186">0186</a>        <span class="name">separators</span><span class="op">=</span><span class="name">separators</span><span class="op">,</span> <span class="name">encoding</span><span class="op">=</span><span class="name">encoding</span><span class="op">,</span><br />
+<a class="lnum" href="#187" name="187">0187</a>        <span class="op">**</span><span class="name">kw</span><span class="op">)</span><span class="op">.</span><span class="name">encode</span><span class="op">(</span><span class="name">obj</span><span class="op">)</span><br />
+<a class="lnum" href="#188" name="188">0188</a><br />
+<a class="lnum" href="#189" name="189">0189</a><span class="keyword">def</span> <span class="name">load</span><span class="op">(</span><span class="name">fp</span><span class="op">,</span> <span class="name">encoding</span><span class="op">=</span><span class="name">None</span><span class="op">,</span> <span class="name">cls</span><span class="op">=</span><span class="name">None</span><span class="op">,</span> <span class="name">object_hook</span><span class="op">=</span><span class="name">None</span><span class="op">,</span> <span class="op">**</span><span class="name">kw</span><span class="op">)</span><span class="op">:</span><br />
+<a class="lnum" href="#190" name="190">0190</a>    <span class="string">"""</span><br />
+<a class="lnum" href="#191" name="191">0191</a><span class="string">    Deserialize ``fp`` (a ``.read()``-supporting file-like object containing</span><br />
+<a class="lnum" href="#192" name="192">0192</a><span class="string">    a JSON document) to a Python object.</span><br />
+<a class="lnum" href="#193" name="193">0193</a><span class="string"></span><br />
+<a class="lnum" href="#194" name="194">0194</a><span class="string">    If the contents of ``fp`` is encoded with an ASCII based encoding other</span><br />
+<a class="lnum" href="#195" name="195">0195</a><span class="string">    than utf-8 (e.g. latin-1), then an appropriate ``encoding`` name must</span><br />
+<a class="lnum" href="#196" name="196">0196</a><span class="string">    be specified. Encodings that are not ASCII based (such as UCS-2) are</span><br />
+<a class="lnum" href="#197" name="197">0197</a><span class="string">    not allowed, and should be wrapped with</span><br />
+<a class="lnum" href="#198" name="198">0198</a><span class="string">    ``codecs.getreader(fp)(encoding)``, or simply decoded to a ``unicode``</span><br />
+<a class="lnum" href="#199" name="199">0199</a><span class="string">    object and passed to ``loads()``</span><br />
+<a class="lnum" href="#200" name="200">0200</a><span class="string"></span><br />
+<a class="lnum" href="#201" name="201">0201</a><span class="string">    ``object_hook`` is an optional function that will be called with the</span><br />
+<a class="lnum" href="#202" name="202">0202</a><span class="string">    result of any object literal decode (a ``dict``). The return value of</span><br />
+<a class="lnum" href="#203" name="203">0203</a><span class="string">    ``object_hook`` will be used instead of the ``dict``. This feature</span><br />
+<a class="lnum" href="#204" name="204">0204</a><span class="string">    can be used to implement custom decoders (e.g. JSON-RPC class hinting).</span><br />
+<a class="lnum" href="#205" name="205">0205</a><span class="string">    </span><br />
+<a class="lnum" href="#206" name="206">0206</a><span class="string">    To use a custom ``JSONDecoder`` subclass, specify it with the ``cls``</span><br />
+<a class="lnum" href="#207" name="207">0207</a><span class="string">    kwarg.</span><br />
+<a class="lnum" href="#208" name="208">0208</a><span class="string">    """</span><br />
+<a class="lnum" href="#209" name="209">0209</a>    <span class="keyword">if</span> <span class="name">cls</span> <span class="keyword">is</span> <span class="name">None</span><span class="op">:</span><br />
+<a class="lnum" href="#210" name="210">0210</a>        <span class="name">cls</span> <span class="op">=</span> <span class="name">JSONDecoder</span><br />
+<a class="lnum" href="#211" name="211">0211</a>    <span class="keyword">if</span> <span class="name">object_hook</span> <span class="keyword">is</span> <span class="keyword">not</span> <span class="name">None</span><span class="op">:</span><br />
+<a class="lnum" href="#212" name="212">0212</a>        <span class="name">kw</span><span class="op">[</span><span class="string">'object_hook'</span><span class="op">]</span> <span class="op">=</span> <span class="name">object_hook</span><br />
+<a class="lnum" href="#213" name="213">0213</a>    <span class="keyword">return</span> <span class="name">cls</span><span class="op">(</span><span class="name">encoding</span><span class="op">=</span><span class="name">encoding</span><span class="op">,</span> <span class="op">**</span><span class="name">kw</span><span class="op">)</span><span class="op">.</span><span class="name">decode</span><span class="op">(</span><span class="name">fp</span><span class="op">.</span><span class="name">read</span><span class="op">(</span><span class="op">)</span><span class="op">)</span><br />
+<a class="lnum" href="#214" name="214">0214</a><br />
+<a class="lnum" href="#215" name="215">0215</a><span class="keyword">def</span> <span class="name">loads</span><span class="op">(</span><span class="name">s</span><span class="op">,</span> <span class="name">encoding</span><span class="op">=</span><span class="name">None</span><span class="op">,</span> <span class="name">cls</span><span class="op">=</span><span class="name">None</span><span class="op">,</span> <span class="name">object_hook</span><span class="op">=</span><span class="name">None</span><span class="op">,</span> <span class="op">**</span><span class="name">kw</span><span class="op">)</span><span class="op">:</span><br />
+<a class="lnum" href="#216" name="216">0216</a>    <span class="string">"""</span><br />
+<a class="lnum" href="#217" name="217">0217</a><span class="string">    Deserialize ``s`` (a ``str`` or ``unicode`` instance containing a JSON</span><br />
+<a class="lnum" href="#218" name="218">0218</a><span class="string">    document) to a Python object.</span><br />
<a class="lnum" href="#219" name="219">0219</a><span class="string"></span><br />
@@ -291,6 +291,6 @@
<a class="lnum" href="#219" name="219">0219</a><span class="string"></span><br />
-<a class="lnum" href="#220" name="220">0220</a><span class="string">    ``object_hook`` is an optional function that will be called with the</span><br />
-<a class="lnum" href="#221" name="221">0221</a><span class="string">    result of any object literal decode (a ``dict``).  The return value of</span><br />
-<a class="lnum" href="#222" name="222">0222</a><span class="string">    ``object_hook`` will be used instead of the ``dict``.  This feature</span><br />
-<a class="lnum" href="#223" name="223">0223</a><span class="string">    can be used to implement custom decoders (e.g. JSON-RPC class hinting).</span><br />
+<a class="lnum" href="#220" name="220">0220</a><span class="string">    If ``s`` is a ``str`` instance and is encoded with an ASCII based encoding</span><br />
+<a class="lnum" href="#221" name="221">0221</a><span class="string">    other than utf-8 (e.g. latin-1) then an appropriate ``encoding`` name</span><br />
+<a class="lnum" href="#222" name="222">0222</a><span class="string">    must be specified. Encodings that are not ASCII based (such as UCS-2)</span><br />
+<a class="lnum" href="#223" name="223">0223</a><span class="string">    are not allowed and should be decoded to ``unicode`` first.</span><br />
<a class="lnum" href="#224" name="224">0224</a><span class="string"></span><br />
@@ -296,27 +296,32 @@
<a class="lnum" href="#224" name="224">0224</a><span class="string"></span><br />
-<a class="lnum" href="#225" name="225">0225</a><span class="string">    To use a custom ``JSONDecoder`` subclass, specify it with the ``cls``</span><br />
-<a class="lnum" href="#226" name="226">0226</a><span class="string">    kwarg.</span><br />
-<a class="lnum" href="#227" name="227">0227</a><span class="string">    """</span><br />
-<a class="lnum" href="#228" name="228">0228</a>    <span class="keyword">if</span> <span class="name">cls</span> <span class="keyword">is</span> <span class="name">None</span><span class="op">:</span><br />
-<a class="lnum" href="#229" name="229">0229</a>        <span class="name">cls</span> <span class="op">=</span> <span class="name">JSONDecoder</span><br />
-<a class="lnum" href="#230" name="230">0230</a>    <span class="keyword">if</span> <span class="name">object_hook</span> <span class="keyword">is</span> <span class="keyword">not</span> <span class="name">None</span><span class="op">:</span><br />
-<a class="lnum" href="#231" name="231">0231</a>        <span class="name">kw</span><span class="op">[</span><span class="string">'object_hook'</span><span class="op">]</span> <span class="op">=</span> <span class="name">object_hook</span><br />
-<a class="lnum" href="#232" name="232">0232</a>    <span class="keyword">return</span> <span class="name">cls</span><span class="op">(</span><span class="name">encoding</span><span class="op">=</span><span class="name">encoding</span><span class="op">,</span> <span class="op">**</span><span class="name">kw</span><span class="op">)</span><span class="op">.</span><span class="name">decode</span><span class="op">(</span><span class="name">s</span><span class="op">)</span><br />
-<a class="lnum" href="#233" name="233">0233</a><br />
-<a class="lnum" href="#234" name="234">0234</a><span class="keyword">def</span> <span class="name">read</span><span class="op">(</span><span class="name">s</span><span class="op">)</span><span class="op">:</span><br />
-<a class="lnum" href="#235" name="235">0235</a>    <span class="string">"""</span><br />
-<a class="lnum" href="#236" name="236">0236</a><span class="string">    json-py API compatibility hook.  Use loads(s) instead.</span><br />
-<a class="lnum" href="#237" name="237">0237</a><span class="string">    """</span><br />
-<a class="lnum" href="#238" name="238">0238</a>    <span class="keyword">import</span> <span class="name">warnings</span><br />
-<a class="lnum" href="#239" name="239">0239</a>    <span class="name">warnings</span><span class="op">.</span><span class="name">warn</span><span class="op">(</span><span class="string">"simplejson.loads(s) should be used instead of read(s)"</span><span class="op">,</span><br />
-<a class="lnum" href="#240" name="240">0240</a>        <span class="name">DeprecationWarning</span><span class="op">)</span><br />
-<a class="lnum" href="#241" name="241">0241</a>    <span class="keyword">return</span> <span class="name">loads</span><span class="op">(</span><span class="name">s</span><span class="op">)</span><br />
-<a class="lnum" href="#242" name="242">0242</a><br />
-<a class="lnum" href="#243" name="243">0243</a><span class="keyword">def</span> <span class="name">write</span><span class="op">(</span><span class="name">obj</span><span class="op">)</span><span class="op">:</span><br />
-<a class="lnum" href="#244" name="244">0244</a>    <span class="string">"""</span><br />
-<a class="lnum" href="#245" name="245">0245</a><span class="string">    json-py API compatibility hook.  Use dumps(s) instead.</span><br />
-<a class="lnum" href="#246" name="246">0246</a><span class="string">    """</span><br />
-<a class="lnum" href="#247" name="247">0247</a>    <span class="keyword">import</span> <span class="name">warnings</span><br />
-<a class="lnum" href="#248" name="248">0248</a>    <span class="name">warnings</span><span class="op">.</span><span class="name">warn</span><span class="op">(</span><span class="string">"simplejson.dumps(s) should be used instead of write(s)"</span><span class="op">,</span><br />
-<a class="lnum" href="#249" name="249">0249</a>        <span class="name">DeprecationWarning</span><span class="op">)</span><br />
-<a class="lnum" href="#250" name="250">0250</a>    <span class="keyword">return</span> <span class="name">dumps</span><span class="op">(</span><span class="name">obj</span><span class="op">)</span></code></div></body></html>
\ No newline at end of file
+<a class="lnum" href="#225" name="225">0225</a><span class="string">    ``object_hook`` is an optional function that will be called with the</span><br />
+<a class="lnum" href="#226" name="226">0226</a><span class="string">    result of any object literal decode (a ``dict``). The return value of</span><br />
+<a class="lnum" href="#227" name="227">0227</a><span class="string">    ``object_hook`` will be used instead of the ``dict``. This feature</span><br />
+<a class="lnum" href="#228" name="228">0228</a><span class="string">    can be used to implement custom decoders (e.g. JSON-RPC class hinting).</span><br />
+<a class="lnum" href="#229" name="229">0229</a><span class="string"></span><br />
+<a class="lnum" href="#230" name="230">0230</a><span class="string">    To use a custom ``JSONDecoder`` subclass, specify it with the ``cls``</span><br />
+<a class="lnum" href="#231" name="231">0231</a><span class="string">    kwarg.</span><br />
+<a class="lnum" href="#232" name="232">0232</a><span class="string">    """</span><br />
+<a class="lnum" href="#233" name="233">0233</a>    <span class="keyword">if</span> <span class="name">cls</span> <span class="keyword">is</span> <span class="name">None</span><span class="op">:</span><br />
+<a class="lnum" href="#234" name="234">0234</a>        <span class="name">cls</span> <span class="op">=</span> <span class="name">JSONDecoder</span><br />
+<a class="lnum" href="#235" name="235">0235</a>    <span class="keyword">if</span> <span class="name">object_hook</span> <span class="keyword">is</span> <span class="keyword">not</span> <span class="name">None</span><span class="op">:</span><br />
+<a class="lnum" href="#236" name="236">0236</a>        <span class="name">kw</span><span class="op">[</span><span class="string">'object_hook'</span><span class="op">]</span> <span class="op">=</span> <span class="name">object_hook</span><br />
+<a class="lnum" href="#237" name="237">0237</a>    <span class="keyword">return</span> <span class="name">cls</span><span class="op">(</span><span class="name">encoding</span><span class="op">=</span><span class="name">encoding</span><span class="op">,</span> <span class="op">**</span><span class="name">kw</span><span class="op">)</span><span class="op">.</span><span class="name">decode</span><span class="op">(</span><span class="name">s</span><span class="op">)</span><br />
+<a class="lnum" href="#238" name="238">0238</a><br />
+<a class="lnum" href="#239" name="239">0239</a><span class="keyword">def</span> <span class="name">read</span><span class="op">(</span><span class="name">s</span><span class="op">)</span><span class="op">:</span><br />
+<a class="lnum" href="#240" name="240">0240</a>    <span class="string">"""</span><br />
+<a class="lnum" href="#241" name="241">0241</a><span class="string">    json-py API compatibility hook. Use loads(s) instead.</span><br />
+<a class="lnum" href="#242" name="242">0242</a><span class="string">    """</span><br />
+<a class="lnum" href="#243" name="243">0243</a>    <span class="keyword">import</span> <span class="name">warnings</span><br />
+<a class="lnum" href="#244" name="244">0244</a>    <span class="name">warnings</span><span class="op">.</span><span class="name">warn</span><span class="op">(</span><span class="string">"simplejson.loads(s) should be used instead of read(s)"</span><span class="op">,</span><br />
+<a class="lnum" href="#245" name="245">0245</a>        <span class="name">DeprecationWarning</span><span class="op">)</span><br />
+<a class="lnum" href="#246" name="246">0246</a>    <span class="keyword">return</span> <span class="name">loads</span><span class="op">(</span><span class="name">s</span><span class="op">)</span><br />
+<a class="lnum" href="#247" name="247">0247</a><br />
+<a class="lnum" href="#248" name="248">0248</a><span class="keyword">def</span> <span class="name">write</span><span class="op">(</span><span class="name">obj</span><span class="op">)</span><span class="op">:</span><br />
+<a class="lnum" href="#249" name="249">0249</a>    <span class="string">"""</span><br />
+<a class="lnum" href="#250" name="250">0250</a><span class="string">    json-py API compatibility hook. Use dumps(s) instead.</span><br />
+<a class="lnum" href="#251" name="251">0251</a><span class="string">    """</span><br />
+<a class="lnum" href="#252" name="252">0252</a>    <span class="keyword">import</span> <span class="name">warnings</span><br />
+<a class="lnum" href="#253" name="253">0253</a>    <span class="name">warnings</span><span class="op">.</span><span class="name">warn</span><span class="op">(</span><span class="string">"simplejson.dumps(s) should be used instead of write(s)"</span><span class="op">,</span><br />
+<a class="lnum" href="#254" name="254">0254</a>        <span class="name">DeprecationWarning</span><span class="op">)</span><br />
+<a class="lnum" href="#255" name="255">0255</a>    <span class="keyword">return</span> <span class="name">dumps</span><span class="op">(</span><span class="name">obj</span><span class="op">)</span></code></div></body></html>
\ No newline at end of file
diff --git a/docs/simplejson/encoder.py.html b/docs/simplejson/encoder.py.html
index a4c3f06e5ebca2cc3cabcc6de316a0b4f7419666_ZG9jcy9zaW1wbGVqc29uL2VuY29kZXIucHkuaHRtbA==..c6fa01dc9a352915efb9a5b7985bd27614357d8c_ZG9jcy9zaW1wbGVqc29uL2VuY29kZXIucHkuaHRtbA== 100644
--- a/docs/simplejson/encoder.py.html
+++ b/docs/simplejson/encoder.py.html
@@ -166,7 +166,7 @@
<a class="lnum" href="#94" name="94">0094</a>    <span class="name">key_separator</span> <span class="op">=</span> <span class="string">': '</span><br />
<a class="lnum" href="#95" name="95">0095</a>    <span class="keyword">def</span> <span class="name">__init__</span><span class="op">(</span><span class="name">self</span><span class="op">,</span> <span class="name">skipkeys</span><span class="op">=</span><span class="name">False</span><span class="op">,</span> <span class="name">ensure_ascii</span><span class="op">=</span><span class="name">True</span><span class="op">,</span><br />
<a class="lnum" href="#96" name="96">0096</a>            <span class="name">check_circular</span><span class="op">=</span><span class="name">True</span><span class="op">,</span> <span class="name">allow_nan</span><span class="op">=</span><span class="name">True</span><span class="op">,</span> <span class="name">sort_keys</span><span class="op">=</span><span class="name">False</span><span class="op">,</span><br />
-<a class="lnum" href="#97" name="97">0097</a>            <span class="name">indent</span><span class="op">=</span><span class="name">None</span><span class="op">,</span> <span class="name">separators</span><span class="op">=</span><span class="name">None</span><span class="op">)</span><span class="op">:</span><br />
+<a class="lnum" href="#97" name="97">0097</a>            <span class="name">indent</span><span class="op">=</span><span class="name">None</span><span class="op">,</span> <span class="name">separators</span><span class="op">=</span><span class="name">None</span><span class="op">,</span> <span class="name">encoding</span><span class="op">=</span><span class="string">'utf-8'</span><span class="op">)</span><span class="op">:</span><br />
<a class="lnum" href="#98" name="98">0098</a>        <span class="string">"""</span><br />
<a class="lnum" href="#99" name="99">0099</a><span class="string">        Constructor for JSONEncoder, with sensible defaults.</span><br />
<a class="lnum" href="#100" name="100">0100</a><span class="string"></span><br />
@@ -200,181 +200,181 @@
<a class="lnum" href="#128" name="128">0128</a><span class="string">        If specified, separators should be a (item_separator, key_separator)</span><br />
<a class="lnum" href="#129" name="129">0129</a><span class="string">        tuple. The default is (', ', ': '). To get the most compact JSON</span><br />
<a class="lnum" href="#130" name="130">0130</a><span class="string">        representation you should specify (',', ':') to eliminate whitespace.</span><br />
-<a class="lnum" href="#131" name="131">0131</a><span class="string">        """</span><br />
-<a class="lnum" href="#132" name="132">0132</a><br />
-<a class="lnum" href="#133" name="133">0133</a>        <span class="name">self</span><span class="op">.</span><span class="name">skipkeys</span> <span class="op">=</span> <span class="name">skipkeys</span><br />
-<a class="lnum" href="#134" name="134">0134</a>        <span class="name">self</span><span class="op">.</span><span class="name">ensure_ascii</span> <span class="op">=</span> <span class="name">ensure_ascii</span><br />
-<a class="lnum" href="#135" name="135">0135</a>        <span class="name">self</span><span class="op">.</span><span class="name">check_circular</span> <span class="op">=</span> <span class="name">check_circular</span><br />
-<a class="lnum" href="#136" name="136">0136</a>        <span class="name">self</span><span class="op">.</span><span class="name">allow_nan</span> <span class="op">=</span> <span class="name">allow_nan</span><br />
-<a class="lnum" href="#137" name="137">0137</a>        <span class="name">self</span><span class="op">.</span><span class="name">sort_keys</span> <span class="op">=</span> <span class="name">sort_keys</span><br />
-<a class="lnum" href="#138" name="138">0138</a>        <span class="name">self</span><span class="op">.</span><span class="name">indent</span> <span class="op">=</span> <span class="name">indent</span><br />
-<a class="lnum" href="#139" name="139">0139</a>        <span class="name">self</span><span class="op">.</span><span class="name">current_indent_level</span> <span class="op">=</span> <span class="number">0</span><br />
-<a class="lnum" href="#140" name="140">0140</a>        <span class="keyword">if</span> <span class="name">separators</span> <span class="keyword">is</span> <span class="keyword">not</span> <span class="name">None</span><span class="op">:</span><br />
-<a class="lnum" href="#141" name="141">0141</a>            <span class="name">self</span><span class="op">.</span><span class="name">item_separator</span><span class="op">,</span> <span class="name">self</span><span class="op">.</span><span class="name">key_separator</span> <span class="op">=</span> <span class="name">separators</span><br />
-<a class="lnum" href="#142" name="142">0142</a><br />
-<a class="lnum" href="#143" name="143">0143</a>    <span class="keyword">def</span> <span class="name">_newline_indent</span><span class="op">(</span><span class="name">self</span><span class="op">)</span><span class="op">:</span><br />
-<a class="lnum" href="#144" name="144">0144</a>        <span class="keyword">return</span> <span class="string">'\n'</span> <span class="op">+</span> <span class="op">(</span><span class="string">' '</span> <span class="op">*</span> <span class="op">(</span><span class="name">self</span><span class="op">.</span><span class="name">indent</span> <span class="op">*</span> <span class="name">self</span><span class="op">.</span><span class="name">current_indent_level</span><span class="op">)</span><span class="op">)</span><br />
-<a class="lnum" href="#145" name="145">0145</a><br />
-<a class="lnum" href="#146" name="146">0146</a>    <span class="keyword">def</span> <span class="name">_iterencode_list</span><span class="op">(</span><span class="name">self</span><span class="op">,</span> <span class="name">lst</span><span class="op">,</span> <span class="name">markers</span><span class="op">=</span><span class="name">None</span><span class="op">)</span><span class="op">:</span><br />
-<a class="lnum" href="#147" name="147">0147</a>        <span class="keyword">if</span> <span class="keyword">not</span> <span class="name">lst</span><span class="op">:</span><br />
-<a class="lnum" href="#148" name="148">0148</a>            <span class="keyword">yield</span> <span class="string">'[]'</span><br />
-<a class="lnum" href="#149" name="149">0149</a>            <span class="keyword">return</span><br />
-<a class="lnum" href="#150" name="150">0150</a>        <span class="keyword">if</span> <span class="name">markers</span> <span class="keyword">is</span> <span class="keyword">not</span> <span class="name">None</span><span class="op">:</span><br />
-<a class="lnum" href="#151" name="151">0151</a>            <span class="name">markerid</span> <span class="op">=</span> <span class="name">id</span><span class="op">(</span><span class="name">lst</span><span class="op">)</span><br />
-<a class="lnum" href="#152" name="152">0152</a>            <span class="keyword">if</span> <span class="name">markerid</span> <span class="keyword">in</span> <span class="name">markers</span><span class="op">:</span><br />
-<a class="lnum" href="#153" name="153">0153</a>                <span class="keyword">raise</span> <span class="name">ValueError</span><span class="op">(</span><span class="string">"Circular reference detected"</span><span class="op">)</span><br />
-<a class="lnum" href="#154" name="154">0154</a>            <span class="name">markers</span><span class="op">[</span><span class="name">markerid</span><span class="op">]</span> <span class="op">=</span> <span class="name">lst</span><br />
-<a class="lnum" href="#155" name="155">0155</a>        <span class="keyword">yield</span> <span class="string">'['</span><br />
-<a class="lnum" href="#156" name="156">0156</a>        <span class="keyword">if</span> <span class="name">self</span><span class="op">.</span><span class="name">indent</span> <span class="keyword">is</span> <span class="keyword">not</span> <span class="name">None</span><span class="op">:</span><br />
-<a class="lnum" href="#157" name="157">0157</a>            <span class="name">self</span><span class="op">.</span><span class="name">current_indent_level</span> <span class="op">+=</span> <span class="number">1</span><br />
-<a class="lnum" href="#158" name="158">0158</a>            <span class="name">newline_indent</span> <span class="op">=</span> <span class="name">self</span><span class="op">.</span><span class="name">_newline_indent</span><span class="op">(</span><span class="op">)</span><br />
-<a class="lnum" href="#159" name="159">0159</a>            <span class="name">separator</span> <span class="op">=</span> <span class="name">self</span><span class="op">.</span><span class="name">item_separator</span> <span class="op">+</span> <span class="name">newline_indent</span><br />
-<a class="lnum" href="#160" name="160">0160</a>            <span class="keyword">yield</span> <span class="name">newline_indent</span><br />
-<a class="lnum" href="#161" name="161">0161</a>        <span class="keyword">else</span><span class="op">:</span><br />
-<a class="lnum" href="#162" name="162">0162</a>            <span class="name">newline_indent</span> <span class="op">=</span> <span class="name">None</span><br />
-<a class="lnum" href="#163" name="163">0163</a>            <span class="name">separator</span> <span class="op">=</span> <span class="name">self</span><span class="op">.</span><span class="name">item_separator</span><br />
-<a class="lnum" href="#164" name="164">0164</a>        <span class="name">first</span> <span class="op">=</span> <span class="name">True</span><br />
-<a class="lnum" href="#165" name="165">0165</a>        <span class="keyword">for</span> <span class="name">value</span> <span class="keyword">in</span> <span class="name">lst</span><span class="op">:</span><br />
-<a class="lnum" href="#166" name="166">0166</a>            <span class="keyword">if</span> <span class="name">first</span><span class="op">:</span><br />
-<a class="lnum" href="#167" name="167">0167</a>                <span class="name">first</span> <span class="op">=</span> <span class="name">False</span><br />
-<a class="lnum" href="#168" name="168">0168</a>            <span class="keyword">else</span><span class="op">:</span><br />
-<a class="lnum" href="#169" name="169">0169</a>                <span class="keyword">yield</span> <span class="name">separator</span><br />
-<a class="lnum" href="#170" name="170">0170</a>            <span class="keyword">for</span> <span class="name">chunk</span> <span class="keyword">in</span> <span class="name">self</span><span class="op">.</span><span class="name">_iterencode</span><span class="op">(</span><span class="name">value</span><span class="op">,</span> <span class="name">markers</span><span class="op">)</span><span class="op">:</span><br />
-<a class="lnum" href="#171" name="171">0171</a>                <span class="keyword">yield</span> <span class="name">chunk</span><br />
-<a class="lnum" href="#172" name="172">0172</a>        <span class="keyword">if</span> <span class="name">newline_indent</span> <span class="keyword">is</span> <span class="keyword">not</span> <span class="name">None</span><span class="op">:</span><br />
-<a class="lnum" href="#173" name="173">0173</a>            <span class="name">self</span><span class="op">.</span><span class="name">current_indent_level</span> <span class="op">-=</span> <span class="number">1</span><br />
-<a class="lnum" href="#174" name="174">0174</a>            <span class="keyword">yield</span> <span class="name">self</span><span class="op">.</span><span class="name">_newline_indent</span><span class="op">(</span><span class="op">)</span><br />
-<a class="lnum" href="#175" name="175">0175</a>        <span class="keyword">yield</span> <span class="string">']'</span><br />
-<a class="lnum" href="#176" name="176">0176</a>        <span class="keyword">if</span> <span class="name">markers</span> <span class="keyword">is</span> <span class="keyword">not</span> <span class="name">None</span><span class="op">:</span><br />
-<a class="lnum" href="#177" name="177">0177</a>            <span class="keyword">del</span> <span class="name">markers</span><span class="op">[</span><span class="name">markerid</span><span class="op">]</span><br />
-<a class="lnum" href="#178" name="178">0178</a><br />
-<a class="lnum" href="#179" name="179">0179</a>    <span class="keyword">def</span> <span class="name">_iterencode_dict</span><span class="op">(</span><span class="name">self</span><span class="op">,</span> <span class="name">dct</span><span class="op">,</span> <span class="name">markers</span><span class="op">=</span><span class="name">None</span><span class="op">)</span><span class="op">:</span><br />
-<a class="lnum" href="#180" name="180">0180</a>        <span class="keyword">if</span> <span class="keyword">not</span> <span class="name">dct</span><span class="op">:</span><br />
-<a class="lnum" href="#181" name="181">0181</a>            <span class="keyword">yield</span> <span class="string">'{}'</span><br />
-<a class="lnum" href="#182" name="182">0182</a>            <span class="keyword">return</span><br />
-<a class="lnum" href="#183" name="183">0183</a>        <span class="keyword">if</span> <span class="name">markers</span> <span class="keyword">is</span> <span class="keyword">not</span> <span class="name">None</span><span class="op">:</span><br />
-<a class="lnum" href="#184" name="184">0184</a>            <span class="name">markerid</span> <span class="op">=</span> <span class="name">id</span><span class="op">(</span><span class="name">dct</span><span class="op">)</span><br />
-<a class="lnum" href="#185" name="185">0185</a>            <span class="keyword">if</span> <span class="name">markerid</span> <span class="keyword">in</span> <span class="name">markers</span><span class="op">:</span><br />
-<a class="lnum" href="#186" name="186">0186</a>                <span class="keyword">raise</span> <span class="name">ValueError</span><span class="op">(</span><span class="string">"Circular reference detected"</span><span class="op">)</span><br />
-<a class="lnum" href="#187" name="187">0187</a>            <span class="name">markers</span><span class="op">[</span><span class="name">markerid</span><span class="op">]</span> <span class="op">=</span> <span class="name">dct</span><br />
-<a class="lnum" href="#188" name="188">0188</a>        <span class="keyword">yield</span> <span class="string">'{'</span><br />
-<a class="lnum" href="#189" name="189">0189</a>        <span class="name">key_separator</span> <span class="op">=</span> <span class="name">self</span><span class="op">.</span><span class="name">key_separator</span><br />
-<a class="lnum" href="#190" name="190">0190</a>        <span class="keyword">if</span> <span class="name">self</span><span class="op">.</span><span class="name">indent</span> <span class="keyword">is</span> <span class="keyword">not</span> <span class="name">None</span><span class="op">:</span><br />
-<a class="lnum" href="#191" name="191">0191</a>            <span class="name">self</span><span class="op">.</span><span class="name">current_indent_level</span> <span class="op">+=</span> <span class="number">1</span><br />
-<a class="lnum" href="#192" name="192">0192</a>            <span class="name">newline_indent</span> <span class="op">=</span> <span class="name">self</span><span class="op">.</span><span class="name">_newline_indent</span><span class="op">(</span><span class="op">)</span><br />
-<a class="lnum" href="#193" name="193">0193</a>            <span class="name">item_separator</span> <span class="op">=</span> <span class="name">self</span><span class="op">.</span><span class="name">item_separator</span> <span class="op">+</span> <span class="name">newline_indent</span><br />
-<a class="lnum" href="#194" name="194">0194</a>            <span class="keyword">yield</span> <span class="name">newline_indent</span><br />
-<a class="lnum" href="#195" name="195">0195</a>        <span class="keyword">else</span><span class="op">:</span><br />
-<a class="lnum" href="#196" name="196">0196</a>            <span class="name">newline_indent</span> <span class="op">=</span> <span class="name">None</span><br />
-<a class="lnum" href="#197" name="197">0197</a>            <span class="name">item_separator</span> <span class="op">=</span> <span class="name">self</span><span class="op">.</span><span class="name">item_separator</span><br />
-<a class="lnum" href="#198" name="198">0198</a>        <span class="name">first</span> <span class="op">=</span> <span class="name">True</span><br />
-<a class="lnum" href="#199" name="199">0199</a>        <span class="keyword">if</span> <span class="name">self</span><span class="op">.</span><span class="name">ensure_ascii</span><span class="op">:</span><br />
-<a class="lnum" href="#200" name="200">0200</a>            <span class="name">encoder</span> <span class="op">=</span> <span class="name">encode_basestring_ascii</span><br />
-<a class="lnum" href="#201" name="201">0201</a>        <span class="keyword">else</span><span class="op">:</span><br />
-<a class="lnum" href="#202" name="202">0202</a>            <span class="name">encoder</span> <span class="op">=</span> <span class="name">encode_basestring</span><br />
-<a class="lnum" href="#203" name="203">0203</a>        <span class="name">allow_nan</span> <span class="op">=</span> <span class="name">self</span><span class="op">.</span><span class="name">allow_nan</span><br />
-<a class="lnum" href="#204" name="204">0204</a>        <span class="keyword">if</span> <span class="name">self</span><span class="op">.</span><span class="name">sort_keys</span><span class="op">:</span><br />
-<a class="lnum" href="#205" name="205">0205</a>            <span class="name">keys</span> <span class="op">=</span> <span class="name">dct</span><span class="op">.</span><span class="name">keys</span><span class="op">(</span><span class="op">)</span><br />
-<a class="lnum" href="#206" name="206">0206</a>            <span class="name">keys</span><span class="op">.</span><span class="name">sort</span><span class="op">(</span><span class="op">)</span><br />
-<a class="lnum" href="#207" name="207">0207</a>            <span class="name">items</span> <span class="op">=</span> <span class="op">[</span><span class="op">(</span><span class="name">k</span><span class="op">,</span> <span class="name">dct</span><span class="op">[</span><span class="name">k</span><span class="op">]</span><span class="op">)</span> <span class="keyword">for</span> <span class="name">k</span> <span class="keyword">in</span> <span class="name">keys</span><span class="op">]</span><br />
-<a class="lnum" href="#208" name="208">0208</a>        <span class="keyword">else</span><span class="op">:</span><br />
-<a class="lnum" href="#209" name="209">0209</a>            <span class="name">items</span> <span class="op">=</span> <span class="name">dct</span><span class="op">.</span><span class="name">iteritems</span><span class="op">(</span><span class="op">)</span><br />
-<a class="lnum" href="#210" name="210">0210</a>        <span class="keyword">for</span> <span class="name">key</span><span class="op">,</span> <span class="name">value</span> <span class="keyword">in</span> <span class="name">items</span><span class="op">:</span><br />
-<a class="lnum" href="#211" name="211">0211</a>            <span class="keyword">if</span> <span class="name">isinstance</span><span class="op">(</span><span class="name">key</span><span class="op">,</span> <span class="name">basestring</span><span class="op">)</span><span class="op">:</span><br />
-<a class="lnum" href="#212" name="212">0212</a>                <span class="keyword">pass</span><br />
-<a class="lnum" href="#213" name="213">0213</a>            <span class="comment"># JavaScript is weakly typed for these, so it makes sense to</span><br />
-<a class="lnum" href="#214" name="214">0214</a><span class="comment"></span>            <span class="comment"># also allow them.  Many encoders seem to do something like this.</span><br />
-<a class="lnum" href="#215" name="215">0215</a><span class="comment"></span>            <span class="keyword">elif</span> <span class="name">isinstance</span><span class="op">(</span><span class="name">key</span><span class="op">,</span> <span class="name">float</span><span class="op">)</span><span class="op">:</span><br />
-<a class="lnum" href="#216" name="216">0216</a>                <span class="name">key</span> <span class="op">=</span> <span class="name">floatstr</span><span class="op">(</span><span class="name">key</span><span class="op">,</span> <span class="name">allow_nan</span><span class="op">)</span><br />
-<a class="lnum" href="#217" name="217">0217</a>            <span class="keyword">elif</span> <span class="name">isinstance</span><span class="op">(</span><span class="name">key</span><span class="op">,</span> <span class="op">(</span><span class="name">int</span><span class="op">,</span> <span class="name">long</span><span class="op">)</span><span class="op">)</span><span class="op">:</span><br />
-<a class="lnum" href="#218" name="218">0218</a>                <span class="name">key</span> <span class="op">=</span> <span class="name">str</span><span class="op">(</span><span class="name">key</span><span class="op">)</span><br />
-<a class="lnum" href="#219" name="219">0219</a>            <span class="keyword">elif</span> <span class="name">key</span> <span class="keyword">is</span> <span class="name">True</span><span class="op">:</span><br />
-<a class="lnum" href="#220" name="220">0220</a>                <span class="name">key</span> <span class="op">=</span> <span class="string">'true'</span><br />
-<a class="lnum" href="#221" name="221">0221</a>            <span class="keyword">elif</span> <span class="name">key</span> <span class="keyword">is</span> <span class="name">False</span><span class="op">:</span><br />
-<a class="lnum" href="#222" name="222">0222</a>                <span class="name">key</span> <span class="op">=</span> <span class="string">'false'</span><br />
-<a class="lnum" href="#223" name="223">0223</a>            <span class="keyword">elif</span> <span class="name">key</span> <span class="keyword">is</span> <span class="name">None</span><span class="op">:</span><br />
-<a class="lnum" href="#224" name="224">0224</a>                <span class="name">key</span> <span class="op">=</span> <span class="string">'null'</span><br />
-<a class="lnum" href="#225" name="225">0225</a>            <span class="keyword">elif</span> <span class="name">self</span><span class="op">.</span><span class="name">skipkeys</span><span class="op">:</span><br />
-<a class="lnum" href="#226" name="226">0226</a>                <span class="keyword">continue</span><br />
-<a class="lnum" href="#227" name="227">0227</a>            <span class="keyword">else</span><span class="op">:</span><br />
-<a class="lnum" href="#228" name="228">0228</a>                <span class="keyword">raise</span> <span class="name">TypeError</span><span class="op">(</span><span class="string">"key %r is not a string"</span> <span class="op">%</span> <span class="op">(</span><span class="name">key</span><span class="op">,</span><span class="op">)</span><span class="op">)</span><br />
-<a class="lnum" href="#229" name="229">0229</a>            <span class="keyword">if</span> <span class="name">first</span><span class="op">:</span><br />
-<a class="lnum" href="#230" name="230">0230</a>                <span class="name">first</span> <span class="op">=</span> <span class="name">False</span><br />
-<a class="lnum" href="#231" name="231">0231</a>            <span class="keyword">else</span><span class="op">:</span><br />
-<a class="lnum" href="#232" name="232">0232</a>                <span class="keyword">yield</span> <span class="name">item_separator</span><br />
-<a class="lnum" href="#233" name="233">0233</a>            <span class="keyword">yield</span> <span class="name">encoder</span><span class="op">(</span><span class="name">key</span><span class="op">)</span><br />
-<a class="lnum" href="#234" name="234">0234</a>            <span class="keyword">yield</span> <span class="name">key_separator</span><br />
-<a class="lnum" href="#235" name="235">0235</a>            <span class="keyword">for</span> <span class="name">chunk</span> <span class="keyword">in</span> <span class="name">self</span><span class="op">.</span><span class="name">_iterencode</span><span class="op">(</span><span class="name">value</span><span class="op">,</span> <span class="name">markers</span><span class="op">)</span><span class="op">:</span><br />
-<a class="lnum" href="#236" name="236">0236</a>                <span class="keyword">yield</span> <span class="name">chunk</span><br />
-<a class="lnum" href="#237" name="237">0237</a>        <span class="keyword">if</span> <span class="name">newline_indent</span> <span class="keyword">is</span> <span class="keyword">not</span> <span class="name">None</span><span class="op">:</span><br />
-<a class="lnum" href="#238" name="238">0238</a>            <span class="name">self</span><span class="op">.</span><span class="name">current_indent_level</span> <span class="op">-=</span> <span class="number">1</span><br />
-<a class="lnum" href="#239" name="239">0239</a>            <span class="keyword">yield</span> <span class="name">self</span><span class="op">.</span><span class="name">_newline_indent</span><span class="op">(</span><span class="op">)</span><br />
-<a class="lnum" href="#240" name="240">0240</a>        <span class="keyword">yield</span> <span class="string">'}'</span><br />
-<a class="lnum" href="#241" name="241">0241</a>        <span class="keyword">if</span> <span class="name">markers</span> <span class="keyword">is</span> <span class="keyword">not</span> <span class="name">None</span><span class="op">:</span><br />
-<a class="lnum" href="#242" name="242">0242</a>            <span class="keyword">del</span> <span class="name">markers</span><span class="op">[</span><span class="name">markerid</span><span class="op">]</span><br />
-<a class="lnum" href="#243" name="243">0243</a><br />
-<a class="lnum" href="#244" name="244">0244</a>    <span class="keyword">def</span> <span class="name">_iterencode</span><span class="op">(</span><span class="name">self</span><span class="op">,</span> <span class="name">o</span><span class="op">,</span> <span class="name">markers</span><span class="op">=</span><span class="name">None</span><span class="op">)</span><span class="op">:</span><br />
-<a class="lnum" href="#245" name="245">0245</a>        <span class="keyword">if</span> <span class="name">isinstance</span><span class="op">(</span><span class="name">o</span><span class="op">,</span> <span class="name">basestring</span><span class="op">)</span><span class="op">:</span><br />
-<a class="lnum" href="#246" name="246">0246</a>            <span class="keyword">if</span> <span class="name">self</span><span class="op">.</span><span class="name">ensure_ascii</span><span class="op">:</span><br />
-<a class="lnum" href="#247" name="247">0247</a>                <span class="name">encoder</span> <span class="op">=</span> <span class="name">encode_basestring_ascii</span><br />
-<a class="lnum" href="#248" name="248">0248</a>            <span class="keyword">else</span><span class="op">:</span><br />
-<a class="lnum" href="#249" name="249">0249</a>                <span class="name">encoder</span> <span class="op">=</span> <span class="name">encode_basestring</span><br />
-<a class="lnum" href="#250" name="250">0250</a>            <span class="keyword">yield</span> <span class="name">encoder</span><span class="op">(</span><span class="name">o</span><span class="op">)</span><br />
-<a class="lnum" href="#251" name="251">0251</a>        <span class="keyword">elif</span> <span class="name">o</span> <span class="keyword">is</span> <span class="name">None</span><span class="op">:</span><br />
-<a class="lnum" href="#252" name="252">0252</a>            <span class="keyword">yield</span> <span class="string">'null'</span><br />
-<a class="lnum" href="#253" name="253">0253</a>        <span class="keyword">elif</span> <span class="name">o</span> <span class="keyword">is</span> <span class="name">True</span><span class="op">:</span><br />
-<a class="lnum" href="#254" name="254">0254</a>            <span class="keyword">yield</span> <span class="string">'true'</span><br />
-<a class="lnum" href="#255" name="255">0255</a>        <span class="keyword">elif</span> <span class="name">o</span> <span class="keyword">is</span> <span class="name">False</span><span class="op">:</span><br />
-<a class="lnum" href="#256" name="256">0256</a>            <span class="keyword">yield</span> <span class="string">'false'</span><br />
-<a class="lnum" href="#257" name="257">0257</a>        <span class="keyword">elif</span> <span class="name">isinstance</span><span class="op">(</span><span class="name">o</span><span class="op">,</span> <span class="op">(</span><span class="name">int</span><span class="op">,</span> <span class="name">long</span><span class="op">)</span><span class="op">)</span><span class="op">:</span><br />
-<a class="lnum" href="#258" name="258">0258</a>            <span class="keyword">yield</span> <span class="name">str</span><span class="op">(</span><span class="name">o</span><span class="op">)</span><br />
-<a class="lnum" href="#259" name="259">0259</a>        <span class="keyword">elif</span> <span class="name">isinstance</span><span class="op">(</span><span class="name">o</span><span class="op">,</span> <span class="name">float</span><span class="op">)</span><span class="op">:</span><br />
-<a class="lnum" href="#260" name="260">0260</a>            <span class="keyword">yield</span> <span class="name">floatstr</span><span class="op">(</span><span class="name">o</span><span class="op">,</span> <span class="name">self</span><span class="op">.</span><span class="name">allow_nan</span><span class="op">)</span><br />
-<a class="lnum" href="#261" name="261">0261</a>        <span class="keyword">elif</span> <span class="name">isinstance</span><span class="op">(</span><span class="name">o</span><span class="op">,</span> <span class="op">(</span><span class="name">list</span><span class="op">,</span> <span class="name">tuple</span><span class="op">)</span><span class="op">)</span><span class="op">:</span><br />
-<a class="lnum" href="#262" name="262">0262</a>            <span class="keyword">for</span> <span class="name">chunk</span> <span class="keyword">in</span> <span class="name">self</span><span class="op">.</span><span class="name">_iterencode_list</span><span class="op">(</span><span class="name">o</span><span class="op">,</span> <span class="name">markers</span><span class="op">)</span><span class="op">:</span><br />
-<a class="lnum" href="#263" name="263">0263</a>                <span class="keyword">yield</span> <span class="name">chunk</span><br />
-<a class="lnum" href="#264" name="264">0264</a>        <span class="keyword">elif</span> <span class="name">isinstance</span><span class="op">(</span><span class="name">o</span><span class="op">,</span> <span class="name">dict</span><span class="op">)</span><span class="op">:</span><br />
-<a class="lnum" href="#265" name="265">0265</a>            <span class="keyword">for</span> <span class="name">chunk</span> <span class="keyword">in</span> <span class="name">self</span><span class="op">.</span><span class="name">_iterencode_dict</span><span class="op">(</span><span class="name">o</span><span class="op">,</span> <span class="name">markers</span><span class="op">)</span><span class="op">:</span><br />
-<a class="lnum" href="#266" name="266">0266</a>                <span class="keyword">yield</span> <span class="name">chunk</span><br />
-<a class="lnum" href="#267" name="267">0267</a>        <span class="keyword">else</span><span class="op">:</span><br />
-<a class="lnum" href="#268" name="268">0268</a>            <span class="keyword">if</span> <span class="name">markers</span> <span class="keyword">is</span> <span class="keyword">not</span> <span class="name">None</span><span class="op">:</span><br />
-<a class="lnum" href="#269" name="269">0269</a>                <span class="name">markerid</span> <span class="op">=</span> <span class="name">id</span><span class="op">(</span><span class="name">o</span><span class="op">)</span><br />
-<a class="lnum" href="#270" name="270">0270</a>                <span class="keyword">if</span> <span class="name">markerid</span> <span class="keyword">in</span> <span class="name">markers</span><span class="op">:</span><br />
-<a class="lnum" href="#271" name="271">0271</a>                    <span class="keyword">raise</span> <span class="name">ValueError</span><span class="op">(</span><span class="string">"Circular reference detected"</span><span class="op">)</span><br />
-<a class="lnum" href="#272" name="272">0272</a>                <span class="name">markers</span><span class="op">[</span><span class="name">markerid</span><span class="op">]</span> <span class="op">=</span> <span class="name">o</span><br />
-<a class="lnum" href="#273" name="273">0273</a>            <span class="keyword">for</span> <span class="name">chunk</span> <span class="keyword">in</span> <span class="name">self</span><span class="op">.</span><span class="name">_iterencode_default</span><span class="op">(</span><span class="name">o</span><span class="op">,</span> <span class="name">markers</span><span class="op">)</span><span class="op">:</span><br />
-<a class="lnum" href="#274" name="274">0274</a>                <span class="keyword">yield</span> <span class="name">chunk</span><br />
-<a class="lnum" href="#275" name="275">0275</a>            <span class="keyword">if</span> <span class="name">markers</span> <span class="keyword">is</span> <span class="keyword">not</span> <span class="name">None</span><span class="op">:</span><br />
-<a class="lnum" href="#276" name="276">0276</a>                <span class="keyword">del</span> <span class="name">markers</span><span class="op">[</span><span class="name">markerid</span><span class="op">]</span><br />
-<a class="lnum" href="#277" name="277">0277</a><br />
-<a class="lnum" href="#278" name="278">0278</a>    <span class="keyword">def</span> <span class="name">_iterencode_default</span><span class="op">(</span><span class="name">self</span><span class="op">,</span> <span class="name">o</span><span class="op">,</span> <span class="name">markers</span><span class="op">=</span><span class="name">None</span><span class="op">)</span><span class="op">:</span><br />
-<a class="lnum" href="#279" name="279">0279</a>        <span class="name">newobj</span> <span class="op">=</span> <span class="name">self</span><span class="op">.</span><span class="name">default</span><span class="op">(</span><span class="name">o</span><span class="op">)</span><br />
-<a class="lnum" href="#280" name="280">0280</a>        <span class="keyword">return</span> <span class="name">self</span><span class="op">.</span><span class="name">_iterencode</span><span class="op">(</span><span class="name">newobj</span><span class="op">,</span> <span class="name">markers</span><span class="op">)</span><br />
-<a class="lnum" href="#281" name="281">0281</a><br />
-<a class="lnum" href="#282" name="282">0282</a>    <span class="keyword">def</span> <span class="name">default</span><span class="op">(</span><span class="name">self</span><span class="op">,</span> <span class="name">o</span><span class="op">)</span><span class="op">:</span><br />
-<a class="lnum" href="#283" name="283">0283</a>        <span class="string">"""</span><br />
-<a class="lnum" href="#284" name="284">0284</a><span class="string">        Implement this method in a subclass such that it returns</span><br />
-<a class="lnum" href="#285" name="285">0285</a><span class="string">        a serializable object for ``o``, or calls the base implementation</span><br />
-<a class="lnum" href="#286" name="286">0286</a><span class="string">        (to raise a ``TypeError``).</span><br />
-<a class="lnum" href="#287" name="287">0287</a><span class="string"></span><br />
-<a class="lnum" href="#288" name="288">0288</a><span class="string">        For example, to support arbitrary iterators, you could</span><br />
-<a class="lnum" href="#289" name="289">0289</a><span class="string">        implement default like this::</span><br />
-<a class="lnum" href="#290" name="290">0290</a><span class="string">            </span><br />
-<a class="lnum" href="#291" name="291">0291</a><span class="string">            def default(self, o):</span><br />
-<a class="lnum" href="#292" name="292">0292</a><span class="string">                try:</span><br />
-<a class="lnum" href="#293" name="293">0293</a><span class="string">                    iterable = iter(o)</span><br />
-<a class="lnum" href="#294" name="294">0294</a><span class="string">                except TypeError:</span><br />
-<a class="lnum" href="#295" name="295">0295</a><span class="string">                    pass</span><br />
-<a class="lnum" href="#296" name="296">0296</a><span class="string">                else:</span><br />
-<a class="lnum" href="#297" name="297">0297</a><span class="string">                    return list(iterable)</span><br />
-<a class="lnum" href="#298" name="298">0298</a><span class="string">                return JSONEncoder.default(self, o)</span><br />
-<a class="lnum" href="#299" name="299">0299</a><span class="string">        """</span><br />
-<a class="lnum" href="#300" name="300">0300</a>        <span class="keyword">raise</span> <span class="name">TypeError</span><span class="op">(</span><span class="string">"%r is not JSON serializable"</span> <span class="op">%</span> <span class="op">(</span><span class="name">o</span><span class="op">,</span><span class="op">)</span><span class="op">)</span><br />
-<a class="lnum" href="#301" name="301">0301</a><br />
-<a class="lnum" href="#302" name="302">0302</a>    <span class="keyword">def</span> <span class="name">encode</span><span class="op">(</span><span class="name">self</span><span class="op">,</span> <span class="name">o</span><span class="op">)</span><span class="op">:</span><br />
-<a class="lnum" href="#303" name="303">0303</a>        <span class="string">"""</span><br />
-<a class="lnum" href="#304" name="304">0304</a><span class="string">        Return a JSON string representation of a Python data structure.</span><br />
-<a class="lnum" href="#305" name="305">0305</a><span class="string"></span><br />
-<a class="lnum" href="#306" name="306">0306</a><span class="string">        >>> JSONEncoder().encode({"foo": ["bar", "baz"]})</span><br />
-<a class="lnum" href="#307" name="307">0307</a><span class="string">        '{"foo":["bar", "baz"]}'</span><br />
+<a class="lnum" href="#131" name="131">0131</a><span class="string"></span><br />
+<a class="lnum" href="#132" name="132">0132</a><span class="string">        If encoding is not None, then all input strings will be</span><br />
+<a class="lnum" href="#133" name="133">0133</a><span class="string">        transformed into unicode using that encoding prior to JSON-encoding. </span><br />
+<a class="lnum" href="#134" name="134">0134</a><span class="string">        The default is UTF-8.</span><br />
+<a class="lnum" href="#135" name="135">0135</a><span class="string">        """</span><br />
+<a class="lnum" href="#136" name="136">0136</a><br />
+<a class="lnum" href="#137" name="137">0137</a>        <span class="name">self</span><span class="op">.</span><span class="name">skipkeys</span> <span class="op">=</span> <span class="name">skipkeys</span><br />
+<a class="lnum" href="#138" name="138">0138</a>        <span class="name">self</span><span class="op">.</span><span class="name">ensure_ascii</span> <span class="op">=</span> <span class="name">ensure_ascii</span><br />
+<a class="lnum" href="#139" name="139">0139</a>        <span class="name">self</span><span class="op">.</span><span class="name">check_circular</span> <span class="op">=</span> <span class="name">check_circular</span><br />
+<a class="lnum" href="#140" name="140">0140</a>        <span class="name">self</span><span class="op">.</span><span class="name">allow_nan</span> <span class="op">=</span> <span class="name">allow_nan</span><br />
+<a class="lnum" href="#141" name="141">0141</a>        <span class="name">self</span><span class="op">.</span><span class="name">sort_keys</span> <span class="op">=</span> <span class="name">sort_keys</span><br />
+<a class="lnum" href="#142" name="142">0142</a>        <span class="name">self</span><span class="op">.</span><span class="name">indent</span> <span class="op">=</span> <span class="name">indent</span><br />
+<a class="lnum" href="#143" name="143">0143</a>        <span class="name">self</span><span class="op">.</span><span class="name">current_indent_level</span> <span class="op">=</span> <span class="number">0</span><br />
+<a class="lnum" href="#144" name="144">0144</a>        <span class="keyword">if</span> <span class="name">separators</span> <span class="keyword">is</span> <span class="keyword">not</span> <span class="name">None</span><span class="op">:</span><br />
+<a class="lnum" href="#145" name="145">0145</a>            <span class="name">self</span><span class="op">.</span><span class="name">item_separator</span><span class="op">,</span> <span class="name">self</span><span class="op">.</span><span class="name">key_separator</span> <span class="op">=</span> <span class="name">separators</span><br />
+<a class="lnum" href="#146" name="146">0146</a>        <span class="name">self</span><span class="op">.</span><span class="name">encoding</span> <span class="op">=</span> <span class="name">encoding</span><br />
+<a class="lnum" href="#147" name="147">0147</a><br />
+<a class="lnum" href="#148" name="148">0148</a>    <span class="keyword">def</span> <span class="name">_newline_indent</span><span class="op">(</span><span class="name">self</span><span class="op">)</span><span class="op">:</span><br />
+<a class="lnum" href="#149" name="149">0149</a>        <span class="keyword">return</span> <span class="string">'\n'</span> <span class="op">+</span> <span class="op">(</span><span class="string">' '</span> <span class="op">*</span> <span class="op">(</span><span class="name">self</span><span class="op">.</span><span class="name">indent</span> <span class="op">*</span> <span class="name">self</span><span class="op">.</span><span class="name">current_indent_level</span><span class="op">)</span><span class="op">)</span><br />
+<a class="lnum" href="#150" name="150">0150</a><br />
+<a class="lnum" href="#151" name="151">0151</a>    <span class="keyword">def</span> <span class="name">_iterencode_list</span><span class="op">(</span><span class="name">self</span><span class="op">,</span> <span class="name">lst</span><span class="op">,</span> <span class="name">markers</span><span class="op">=</span><span class="name">None</span><span class="op">)</span><span class="op">:</span><br />
+<a class="lnum" href="#152" name="152">0152</a>        <span class="keyword">if</span> <span class="keyword">not</span> <span class="name">lst</span><span class="op">:</span><br />
+<a class="lnum" href="#153" name="153">0153</a>            <span class="keyword">yield</span> <span class="string">'[]'</span><br />
+<a class="lnum" href="#154" name="154">0154</a>            <span class="keyword">return</span><br />
+<a class="lnum" href="#155" name="155">0155</a>        <span class="keyword">if</span> <span class="name">markers</span> <span class="keyword">is</span> <span class="keyword">not</span> <span class="name">None</span><span class="op">:</span><br />
+<a class="lnum" href="#156" name="156">0156</a>            <span class="name">markerid</span> <span class="op">=</span> <span class="name">id</span><span class="op">(</span><span class="name">lst</span><span class="op">)</span><br />
+<a class="lnum" href="#157" name="157">0157</a>            <span class="keyword">if</span> <span class="name">markerid</span> <span class="keyword">in</span> <span class="name">markers</span><span class="op">:</span><br />
+<a class="lnum" href="#158" name="158">0158</a>                <span class="keyword">raise</span> <span class="name">ValueError</span><span class="op">(</span><span class="string">"Circular reference detected"</span><span class="op">)</span><br />
+<a class="lnum" href="#159" name="159">0159</a>            <span class="name">markers</span><span class="op">[</span><span class="name">markerid</span><span class="op">]</span> <span class="op">=</span> <span class="name">lst</span><br />
+<a class="lnum" href="#160" name="160">0160</a>        <span class="keyword">yield</span> <span class="string">'['</span><br />
+<a class="lnum" href="#161" name="161">0161</a>        <span class="keyword">if</span> <span class="name">self</span><span class="op">.</span><span class="name">indent</span> <span class="keyword">is</span> <span class="keyword">not</span> <span class="name">None</span><span class="op">:</span><br />
+<a class="lnum" href="#162" name="162">0162</a>            <span class="name">self</span><span class="op">.</span><span class="name">current_indent_level</span> <span class="op">+=</span> <span class="number">1</span><br />
+<a class="lnum" href="#163" name="163">0163</a>            <span class="name">newline_indent</span> <span class="op">=</span> <span class="name">self</span><span class="op">.</span><span class="name">_newline_indent</span><span class="op">(</span><span class="op">)</span><br />
+<a class="lnum" href="#164" name="164">0164</a>            <span class="name">separator</span> <span class="op">=</span> <span class="name">self</span><span class="op">.</span><span class="name">item_separator</span> <span class="op">+</span> <span class="name">newline_indent</span><br />
+<a class="lnum" href="#165" name="165">0165</a>            <span class="keyword">yield</span> <span class="name">newline_indent</span><br />
+<a class="lnum" href="#166" name="166">0166</a>        <span class="keyword">else</span><span class="op">:</span><br />
+<a class="lnum" href="#167" name="167">0167</a>            <span class="name">newline_indent</span> <span class="op">=</span> <span class="name">None</span><br />
+<a class="lnum" href="#168" name="168">0168</a>            <span class="name">separator</span> <span class="op">=</span> <span class="name">self</span><span class="op">.</span><span class="name">item_separator</span><br />
+<a class="lnum" href="#169" name="169">0169</a>        <span class="name">first</span> <span class="op">=</span> <span class="name">True</span><br />
+<a class="lnum" href="#170" name="170">0170</a>        <span class="keyword">for</span> <span class="name">value</span> <span class="keyword">in</span> <span class="name">lst</span><span class="op">:</span><br />
+<a class="lnum" href="#171" name="171">0171</a>            <span class="keyword">if</span> <span class="name">first</span><span class="op">:</span><br />
+<a class="lnum" href="#172" name="172">0172</a>                <span class="name">first</span> <span class="op">=</span> <span class="name">False</span><br />
+<a class="lnum" href="#173" name="173">0173</a>            <span class="keyword">else</span><span class="op">:</span><br />
+<a class="lnum" href="#174" name="174">0174</a>                <span class="keyword">yield</span> <span class="name">separator</span><br />
+<a class="lnum" href="#175" name="175">0175</a>            <span class="keyword">for</span> <span class="name">chunk</span> <span class="keyword">in</span> <span class="name">self</span><span class="op">.</span><span class="name">_iterencode</span><span class="op">(</span><span class="name">value</span><span class="op">,</span> <span class="name">markers</span><span class="op">)</span><span class="op">:</span><br />
+<a class="lnum" href="#176" name="176">0176</a>                <span class="keyword">yield</span> <span class="name">chunk</span><br />
+<a class="lnum" href="#177" name="177">0177</a>        <span class="keyword">if</span> <span class="name">newline_indent</span> <span class="keyword">is</span> <span class="keyword">not</span> <span class="name">None</span><span class="op">:</span><br />
+<a class="lnum" href="#178" name="178">0178</a>            <span class="name">self</span><span class="op">.</span><span class="name">current_indent_level</span> <span class="op">-=</span> <span class="number">1</span><br />
+<a class="lnum" href="#179" name="179">0179</a>            <span class="keyword">yield</span> <span class="name">self</span><span class="op">.</span><span class="name">_newline_indent</span><span class="op">(</span><span class="op">)</span><br />
+<a class="lnum" href="#180" name="180">0180</a>        <span class="keyword">yield</span> <span class="string">']'</span><br />
+<a class="lnum" href="#181" name="181">0181</a>        <span class="keyword">if</span> <span class="name">markers</span> <span class="keyword">is</span> <span class="keyword">not</span> <span class="name">None</span><span class="op">:</span><br />
+<a class="lnum" href="#182" name="182">0182</a>            <span class="keyword">del</span> <span class="name">markers</span><span class="op">[</span><span class="name">markerid</span><span class="op">]</span><br />
+<a class="lnum" href="#183" name="183">0183</a><br />
+<a class="lnum" href="#184" name="184">0184</a>    <span class="keyword">def</span> <span class="name">_iterencode_dict</span><span class="op">(</span><span class="name">self</span><span class="op">,</span> <span class="name">dct</span><span class="op">,</span> <span class="name">markers</span><span class="op">=</span><span class="name">None</span><span class="op">)</span><span class="op">:</span><br />
+<a class="lnum" href="#185" name="185">0185</a>        <span class="keyword">if</span> <span class="keyword">not</span> <span class="name">dct</span><span class="op">:</span><br />
+<a class="lnum" href="#186" name="186">0186</a>            <span class="keyword">yield</span> <span class="string">'{}'</span><br />
+<a class="lnum" href="#187" name="187">0187</a>            <span class="keyword">return</span><br />
+<a class="lnum" href="#188" name="188">0188</a>        <span class="keyword">if</span> <span class="name">markers</span> <span class="keyword">is</span> <span class="keyword">not</span> <span class="name">None</span><span class="op">:</span><br />
+<a class="lnum" href="#189" name="189">0189</a>            <span class="name">markerid</span> <span class="op">=</span> <span class="name">id</span><span class="op">(</span><span class="name">dct</span><span class="op">)</span><br />
+<a class="lnum" href="#190" name="190">0190</a>            <span class="keyword">if</span> <span class="name">markerid</span> <span class="keyword">in</span> <span class="name">markers</span><span class="op">:</span><br />
+<a class="lnum" href="#191" name="191">0191</a>                <span class="keyword">raise</span> <span class="name">ValueError</span><span class="op">(</span><span class="string">"Circular reference detected"</span><span class="op">)</span><br />
+<a class="lnum" href="#192" name="192">0192</a>            <span class="name">markers</span><span class="op">[</span><span class="name">markerid</span><span class="op">]</span> <span class="op">=</span> <span class="name">dct</span><br />
+<a class="lnum" href="#193" name="193">0193</a>        <span class="keyword">yield</span> <span class="string">'{'</span><br />
+<a class="lnum" href="#194" name="194">0194</a>        <span class="name">key_separator</span> <span class="op">=</span> <span class="name">self</span><span class="op">.</span><span class="name">key_separator</span><br />
+<a class="lnum" href="#195" name="195">0195</a>        <span class="keyword">if</span> <span class="name">self</span><span class="op">.</span><span class="name">indent</span> <span class="keyword">is</span> <span class="keyword">not</span> <span class="name">None</span><span class="op">:</span><br />
+<a class="lnum" href="#196" name="196">0196</a>            <span class="name">self</span><span class="op">.</span><span class="name">current_indent_level</span> <span class="op">+=</span> <span class="number">1</span><br />
+<a class="lnum" href="#197" name="197">0197</a>            <span class="name">newline_indent</span> <span class="op">=</span> <span class="name">self</span><span class="op">.</span><span class="name">_newline_indent</span><span class="op">(</span><span class="op">)</span><br />
+<a class="lnum" href="#198" name="198">0198</a>            <span class="name">item_separator</span> <span class="op">=</span> <span class="name">self</span><span class="op">.</span><span class="name">item_separator</span> <span class="op">+</span> <span class="name">newline_indent</span><br />
+<a class="lnum" href="#199" name="199">0199</a>            <span class="keyword">yield</span> <span class="name">newline_indent</span><br />
+<a class="lnum" href="#200" name="200">0200</a>        <span class="keyword">else</span><span class="op">:</span><br />
+<a class="lnum" href="#201" name="201">0201</a>            <span class="name">newline_indent</span> <span class="op">=</span> <span class="name">None</span><br />
+<a class="lnum" href="#202" name="202">0202</a>            <span class="name">item_separator</span> <span class="op">=</span> <span class="name">self</span><span class="op">.</span><span class="name">item_separator</span><br />
+<a class="lnum" href="#203" name="203">0203</a>        <span class="name">first</span> <span class="op">=</span> <span class="name">True</span><br />
+<a class="lnum" href="#204" name="204">0204</a>        <span class="keyword">if</span> <span class="name">self</span><span class="op">.</span><span class="name">ensure_ascii</span><span class="op">:</span><br />
+<a class="lnum" href="#205" name="205">0205</a>            <span class="name">encoder</span> <span class="op">=</span> <span class="name">encode_basestring_ascii</span><br />
+<a class="lnum" href="#206" name="206">0206</a>        <span class="keyword">else</span><span class="op">:</span><br />
+<a class="lnum" href="#207" name="207">0207</a>            <span class="name">encoder</span> <span class="op">=</span> <span class="name">encode_basestring</span><br />
+<a class="lnum" href="#208" name="208">0208</a>        <span class="name">allow_nan</span> <span class="op">=</span> <span class="name">self</span><span class="op">.</span><span class="name">allow_nan</span><br />
+<a class="lnum" href="#209" name="209">0209</a>        <span class="keyword">if</span> <span class="name">self</span><span class="op">.</span><span class="name">sort_keys</span><span class="op">:</span><br />
+<a class="lnum" href="#210" name="210">0210</a>            <span class="name">keys</span> <span class="op">=</span> <span class="name">dct</span><span class="op">.</span><span class="name">keys</span><span class="op">(</span><span class="op">)</span><br />
+<a class="lnum" href="#211" name="211">0211</a>            <span class="name">keys</span><span class="op">.</span><span class="name">sort</span><span class="op">(</span><span class="op">)</span><br />
+<a class="lnum" href="#212" name="212">0212</a>            <span class="name">items</span> <span class="op">=</span> <span class="op">[</span><span class="op">(</span><span class="name">k</span><span class="op">,</span> <span class="name">dct</span><span class="op">[</span><span class="name">k</span><span class="op">]</span><span class="op">)</span> <span class="keyword">for</span> <span class="name">k</span> <span class="keyword">in</span> <span class="name">keys</span><span class="op">]</span><br />
+<a class="lnum" href="#213" name="213">0213</a>        <span class="keyword">else</span><span class="op">:</span><br />
+<a class="lnum" href="#214" name="214">0214</a>            <span class="name">items</span> <span class="op">=</span> <span class="name">dct</span><span class="op">.</span><span class="name">iteritems</span><span class="op">(</span><span class="op">)</span><br />
+<a class="lnum" href="#215" name="215">0215</a>        <span class="keyword">for</span> <span class="name">key</span><span class="op">,</span> <span class="name">value</span> <span class="keyword">in</span> <span class="name">items</span><span class="op">:</span><br />
+<a class="lnum" href="#216" name="216">0216</a>            <span class="keyword">if</span> <span class="name">self</span><span class="op">.</span><span class="name">encoding</span> <span class="keyword">is</span> <span class="keyword">not</span> <span class="name">None</span> <span class="keyword">and</span> <span class="name">isinstance</span><span class="op">(</span><span class="name">key</span><span class="op">,</span> <span class="name">str</span><span class="op">)</span><span class="op">:</span><br />
+<a class="lnum" href="#217" name="217">0217</a>                <span class="name">key</span> <span class="op">=</span> <span class="name">key</span><span class="op">.</span><span class="name">decode</span><span class="op">(</span><span class="name">self</span><span class="op">.</span><span class="name">encoding</span><span class="op">)</span><br />
+<a class="lnum" href="#218" name="218">0218</a>            <span class="keyword">elif</span> <span class="name">isinstance</span><span class="op">(</span><span class="name">key</span><span class="op">,</span> <span class="name">basestring</span><span class="op">)</span><span class="op">:</span><br />
+<a class="lnum" href="#219" name="219">0219</a>                <span class="keyword">pass</span><br />
+<a class="lnum" href="#220" name="220">0220</a>            <span class="comment"># JavaScript is weakly typed for these, so it makes sense to</span><br />
+<a class="lnum" href="#221" name="221">0221</a><span class="comment"></span>            <span class="comment"># also allow them.  Many encoders seem to do something like this.</span><br />
+<a class="lnum" href="#222" name="222">0222</a><span class="comment"></span>            <span class="keyword">elif</span> <span class="name">isinstance</span><span class="op">(</span><span class="name">key</span><span class="op">,</span> <span class="name">float</span><span class="op">)</span><span class="op">:</span><br />
+<a class="lnum" href="#223" name="223">0223</a>                <span class="name">key</span> <span class="op">=</span> <span class="name">floatstr</span><span class="op">(</span><span class="name">key</span><span class="op">,</span> <span class="name">allow_nan</span><span class="op">)</span><br />
+<a class="lnum" href="#224" name="224">0224</a>            <span class="keyword">elif</span> <span class="name">isinstance</span><span class="op">(</span><span class="name">key</span><span class="op">,</span> <span class="op">(</span><span class="name">int</span><span class="op">,</span> <span class="name">long</span><span class="op">)</span><span class="op">)</span><span class="op">:</span><br />
+<a class="lnum" href="#225" name="225">0225</a>                <span class="name">key</span> <span class="op">=</span> <span class="name">str</span><span class="op">(</span><span class="name">key</span><span class="op">)</span><br />
+<a class="lnum" href="#226" name="226">0226</a>            <span class="keyword">elif</span> <span class="name">key</span> <span class="keyword">is</span> <span class="name">True</span><span class="op">:</span><br />
+<a class="lnum" href="#227" name="227">0227</a>                <span class="name">key</span> <span class="op">=</span> <span class="string">'true'</span><br />
+<a class="lnum" href="#228" name="228">0228</a>            <span class="keyword">elif</span> <span class="name">key</span> <span class="keyword">is</span> <span class="name">False</span><span class="op">:</span><br />
+<a class="lnum" href="#229" name="229">0229</a>                <span class="name">key</span> <span class="op">=</span> <span class="string">'false'</span><br />
+<a class="lnum" href="#230" name="230">0230</a>            <span class="keyword">elif</span> <span class="name">key</span> <span class="keyword">is</span> <span class="name">None</span><span class="op">:</span><br />
+<a class="lnum" href="#231" name="231">0231</a>                <span class="name">key</span> <span class="op">=</span> <span class="string">'null'</span><br />
+<a class="lnum" href="#232" name="232">0232</a>            <span class="keyword">elif</span> <span class="name">self</span><span class="op">.</span><span class="name">skipkeys</span><span class="op">:</span><br />
+<a class="lnum" href="#233" name="233">0233</a>                <span class="keyword">continue</span><br />
+<a class="lnum" href="#234" name="234">0234</a>            <span class="keyword">else</span><span class="op">:</span><br />
+<a class="lnum" href="#235" name="235">0235</a>                <span class="keyword">raise</span> <span class="name">TypeError</span><span class="op">(</span><span class="string">"key %r is not a string"</span> <span class="op">%</span> <span class="op">(</span><span class="name">key</span><span class="op">,</span><span class="op">)</span><span class="op">)</span><br />
+<a class="lnum" href="#236" name="236">0236</a>            <span class="keyword">if</span> <span class="name">first</span><span class="op">:</span><br />
+<a class="lnum" href="#237" name="237">0237</a>                <span class="name">first</span> <span class="op">=</span> <span class="name">False</span><br />
+<a class="lnum" href="#238" name="238">0238</a>            <span class="keyword">else</span><span class="op">:</span><br />
+<a class="lnum" href="#239" name="239">0239</a>                <span class="keyword">yield</span> <span class="name">item_separator</span><br />
+<a class="lnum" href="#240" name="240">0240</a>            <span class="keyword">yield</span> <span class="name">encoder</span><span class="op">(</span><span class="name">key</span><span class="op">)</span><br />
+<a class="lnum" href="#241" name="241">0241</a>            <span class="keyword">yield</span> <span class="name">key_separator</span><br />
+<a class="lnum" href="#242" name="242">0242</a>            <span class="keyword">for</span> <span class="name">chunk</span> <span class="keyword">in</span> <span class="name">self</span><span class="op">.</span><span class="name">_iterencode</span><span class="op">(</span><span class="name">value</span><span class="op">,</span> <span class="name">markers</span><span class="op">)</span><span class="op">:</span><br />
+<a class="lnum" href="#243" name="243">0243</a>                <span class="keyword">yield</span> <span class="name">chunk</span><br />
+<a class="lnum" href="#244" name="244">0244</a>        <span class="keyword">if</span> <span class="name">newline_indent</span> <span class="keyword">is</span> <span class="keyword">not</span> <span class="name">None</span><span class="op">:</span><br />
+<a class="lnum" href="#245" name="245">0245</a>            <span class="name">self</span><span class="op">.</span><span class="name">current_indent_level</span> <span class="op">-=</span> <span class="number">1</span><br />
+<a class="lnum" href="#246" name="246">0246</a>            <span class="keyword">yield</span> <span class="name">self</span><span class="op">.</span><span class="name">_newline_indent</span><span class="op">(</span><span class="op">)</span><br />
+<a class="lnum" href="#247" name="247">0247</a>        <span class="keyword">yield</span> <span class="string">'}'</span><br />
+<a class="lnum" href="#248" name="248">0248</a>        <span class="keyword">if</span> <span class="name">markers</span> <span class="keyword">is</span> <span class="keyword">not</span> <span class="name">None</span><span class="op">:</span><br />
+<a class="lnum" href="#249" name="249">0249</a>            <span class="keyword">del</span> <span class="name">markers</span><span class="op">[</span><span class="name">markerid</span><span class="op">]</span><br />
+<a class="lnum" href="#250" name="250">0250</a><br />
+<a class="lnum" href="#251" name="251">0251</a>    <span class="keyword">def</span> <span class="name">_iterencode</span><span class="op">(</span><span class="name">self</span><span class="op">,</span> <span class="name">o</span><span class="op">,</span> <span class="name">markers</span><span class="op">=</span><span class="name">None</span><span class="op">)</span><span class="op">:</span><br />
+<a class="lnum" href="#252" name="252">0252</a>        <span class="keyword">if</span> <span class="name">isinstance</span><span class="op">(</span><span class="name">o</span><span class="op">,</span> <span class="name">basestring</span><span class="op">)</span><span class="op">:</span><br />
+<a class="lnum" href="#253" name="253">0253</a>            <span class="keyword">if</span> <span class="name">self</span><span class="op">.</span><span class="name">ensure_ascii</span><span class="op">:</span><br />
+<a class="lnum" href="#254" name="254">0254</a>                <span class="name">encoder</span> <span class="op">=</span> <span class="name">encode_basestring_ascii</span><br />
+<a class="lnum" href="#255" name="255">0255</a>            <span class="keyword">else</span><span class="op">:</span><br />
+<a class="lnum" href="#256" name="256">0256</a>                <span class="name">encoder</span> <span class="op">=</span> <span class="name">encode_basestring</span><br />
+<a class="lnum" href="#257" name="257">0257</a>            <span class="keyword">if</span> <span class="name">self</span><span class="op">.</span><span class="name">encoding</span> <span class="keyword">and</span> <span class="name">isinstance</span><span class="op">(</span><span class="name">o</span><span class="op">,</span> <span class="name">str</span><span class="op">)</span><span class="op">:</span><br />
+<a class="lnum" href="#258" name="258">0258</a>                <span class="name">o</span> <span class="op">=</span> <span class="name">o</span><span class="op">.</span><span class="name">decode</span><span class="op">(</span><span class="name">self</span><span class="op">.</span><span class="name">encoding</span><span class="op">)</span><br />
+<a class="lnum" href="#259" name="259">0259</a>            <span class="keyword">yield</span> <span class="name">encoder</span><span class="op">(</span><span class="name">o</span><span class="op">)</span><br />
+<a class="lnum" href="#260" name="260">0260</a>        <span class="keyword">elif</span> <span class="name">o</span> <span class="keyword">is</span> <span class="name">None</span><span class="op">:</span><br />
+<a class="lnum" href="#261" name="261">0261</a>            <span class="keyword">yield</span> <span class="string">'null'</span><br />
+<a class="lnum" href="#262" name="262">0262</a>        <span class="keyword">elif</span> <span class="name">o</span> <span class="keyword">is</span> <span class="name">True</span><span class="op">:</span><br />
+<a class="lnum" href="#263" name="263">0263</a>            <span class="keyword">yield</span> <span class="string">'true'</span><br />
+<a class="lnum" href="#264" name="264">0264</a>        <span class="keyword">elif</span> <span class="name">o</span> <span class="keyword">is</span> <span class="name">False</span><span class="op">:</span><br />
+<a class="lnum" href="#265" name="265">0265</a>            <span class="keyword">yield</span> <span class="string">'false'</span><br />
+<a class="lnum" href="#266" name="266">0266</a>        <span class="keyword">elif</span> <span class="name">isinstance</span><span class="op">(</span><span class="name">o</span><span class="op">,</span> <span class="op">(</span><span class="name">int</span><span class="op">,</span> <span class="name">long</span><span class="op">)</span><span class="op">)</span><span class="op">:</span><br />
+<a class="lnum" href="#267" name="267">0267</a>            <span class="keyword">yield</span> <span class="name">str</span><span class="op">(</span><span class="name">o</span><span class="op">)</span><br />
+<a class="lnum" href="#268" name="268">0268</a>        <span class="keyword">elif</span> <span class="name">isinstance</span><span class="op">(</span><span class="name">o</span><span class="op">,</span> <span class="name">float</span><span class="op">)</span><span class="op">:</span><br />
+<a class="lnum" href="#269" name="269">0269</a>            <span class="keyword">yield</span> <span class="name">floatstr</span><span class="op">(</span><span class="name">o</span><span class="op">,</span> <span class="name">self</span><span class="op">.</span><span class="name">allow_nan</span><span class="op">)</span><br />
+<a class="lnum" href="#270" name="270">0270</a>        <span class="keyword">elif</span> <span class="name">isinstance</span><span class="op">(</span><span class="name">o</span><span class="op">,</span> <span class="op">(</span><span class="name">list</span><span class="op">,</span> <span class="name">tuple</span><span class="op">)</span><span class="op">)</span><span class="op">:</span><br />
+<a class="lnum" href="#271" name="271">0271</a>            <span class="keyword">for</span> <span class="name">chunk</span> <span class="keyword">in</span> <span class="name">self</span><span class="op">.</span><span class="name">_iterencode_list</span><span class="op">(</span><span class="name">o</span><span class="op">,</span> <span class="name">markers</span><span class="op">)</span><span class="op">:</span><br />
+<a class="lnum" href="#272" name="272">0272</a>                <span class="keyword">yield</span> <span class="name">chunk</span><br />
+<a class="lnum" href="#273" name="273">0273</a>        <span class="keyword">elif</span> <span class="name">isinstance</span><span class="op">(</span><span class="name">o</span><span class="op">,</span> <span class="name">dict</span><span class="op">)</span><span class="op">:</span><br />
+<a class="lnum" href="#274" name="274">0274</a>            <span class="keyword">for</span> <span class="name">chunk</span> <span class="keyword">in</span> <span class="name">self</span><span class="op">.</span><span class="name">_iterencode_dict</span><span class="op">(</span><span class="name">o</span><span class="op">,</span> <span class="name">markers</span><span class="op">)</span><span class="op">:</span><br />
+<a class="lnum" href="#275" name="275">0275</a>                <span class="keyword">yield</span> <span class="name">chunk</span><br />
+<a class="lnum" href="#276" name="276">0276</a>        <span class="keyword">else</span><span class="op">:</span><br />
+<a class="lnum" href="#277" name="277">0277</a>            <span class="keyword">if</span> <span class="name">markers</span> <span class="keyword">is</span> <span class="keyword">not</span> <span class="name">None</span><span class="op">:</span><br />
+<a class="lnum" href="#278" name="278">0278</a>                <span class="name">markerid</span> <span class="op">=</span> <span class="name">id</span><span class="op">(</span><span class="name">o</span><span class="op">)</span><br />
+<a class="lnum" href="#279" name="279">0279</a>                <span class="keyword">if</span> <span class="name">markerid</span> <span class="keyword">in</span> <span class="name">markers</span><span class="op">:</span><br />
+<a class="lnum" href="#280" name="280">0280</a>                    <span class="keyword">raise</span> <span class="name">ValueError</span><span class="op">(</span><span class="string">"Circular reference detected"</span><span class="op">)</span><br />
+<a class="lnum" href="#281" name="281">0281</a>                <span class="name">markers</span><span class="op">[</span><span class="name">markerid</span><span class="op">]</span> <span class="op">=</span> <span class="name">o</span><br />
+<a class="lnum" href="#282" name="282">0282</a>            <span class="keyword">for</span> <span class="name">chunk</span> <span class="keyword">in</span> <span class="name">self</span><span class="op">.</span><span class="name">_iterencode_default</span><span class="op">(</span><span class="name">o</span><span class="op">,</span> <span class="name">markers</span><span class="op">)</span><span class="op">:</span><br />
+<a class="lnum" href="#283" name="283">0283</a>                <span class="keyword">yield</span> <span class="name">chunk</span><br />
+<a class="lnum" href="#284" name="284">0284</a>            <span class="keyword">if</span> <span class="name">markers</span> <span class="keyword">is</span> <span class="keyword">not</span> <span class="name">None</span><span class="op">:</span><br />
+<a class="lnum" href="#285" name="285">0285</a>                <span class="keyword">del</span> <span class="name">markers</span><span class="op">[</span><span class="name">markerid</span><span class="op">]</span><br />
+<a class="lnum" href="#286" name="286">0286</a><br />
+<a class="lnum" href="#287" name="287">0287</a>    <span class="keyword">def</span> <span class="name">_iterencode_default</span><span class="op">(</span><span class="name">self</span><span class="op">,</span> <span class="name">o</span><span class="op">,</span> <span class="name">markers</span><span class="op">=</span><span class="name">None</span><span class="op">)</span><span class="op">:</span><br />
+<a class="lnum" href="#288" name="288">0288</a>        <span class="name">newobj</span> <span class="op">=</span> <span class="name">self</span><span class="op">.</span><span class="name">default</span><span class="op">(</span><span class="name">o</span><span class="op">)</span><br />
+<a class="lnum" href="#289" name="289">0289</a>        <span class="keyword">return</span> <span class="name">self</span><span class="op">.</span><span class="name">_iterencode</span><span class="op">(</span><span class="name">newobj</span><span class="op">,</span> <span class="name">markers</span><span class="op">)</span><br />
+<a class="lnum" href="#290" name="290">0290</a><br />
+<a class="lnum" href="#291" name="291">0291</a>    <span class="keyword">def</span> <span class="name">default</span><span class="op">(</span><span class="name">self</span><span class="op">,</span> <span class="name">o</span><span class="op">)</span><span class="op">:</span><br />
+<a class="lnum" href="#292" name="292">0292</a>        <span class="string">"""</span><br />
+<a class="lnum" href="#293" name="293">0293</a><span class="string">        Implement this method in a subclass such that it returns</span><br />
+<a class="lnum" href="#294" name="294">0294</a><span class="string">        a serializable object for ``o``, or calls the base implementation</span><br />
+<a class="lnum" href="#295" name="295">0295</a><span class="string">        (to raise a ``TypeError``).</span><br />
+<a class="lnum" href="#296" name="296">0296</a><span class="string"></span><br />
+<a class="lnum" href="#297" name="297">0297</a><span class="string">        For example, to support arbitrary iterators, you could</span><br />
+<a class="lnum" href="#298" name="298">0298</a><span class="string">        implement default like this::</span><br />
+<a class="lnum" href="#299" name="299">0299</a><span class="string">            </span><br />
+<a class="lnum" href="#300" name="300">0300</a><span class="string">            def default(self, o):</span><br />
+<a class="lnum" href="#301" name="301">0301</a><span class="string">                try:</span><br />
+<a class="lnum" href="#302" name="302">0302</a><span class="string">                    iterable = iter(o)</span><br />
+<a class="lnum" href="#303" name="303">0303</a><span class="string">                except TypeError:</span><br />
+<a class="lnum" href="#304" name="304">0304</a><span class="string">                    pass</span><br />
+<a class="lnum" href="#305" name="305">0305</a><span class="string">                else:</span><br />
+<a class="lnum" href="#306" name="306">0306</a><span class="string">                    return list(iterable)</span><br />
+<a class="lnum" href="#307" name="307">0307</a><span class="string">                return JSONEncoder.default(self, o)</span><br />
<a class="lnum" href="#308" name="308">0308</a><span class="string">        """</span><br />
@@ -380,24 +380,33 @@
<a class="lnum" href="#308" name="308">0308</a><span class="string">        """</span><br />
-<a class="lnum" href="#309" name="309">0309</a>        <span class="comment"># This doesn't pass the iterator directly to ''.join() because it</span><br />
-<a class="lnum" href="#310" name="310">0310</a><span class="comment"></span>        <span class="comment"># sucks at reporting exceptions.  It's going to do this internally</span><br />
-<a class="lnum" href="#311" name="311">0311</a><span class="comment"></span>        <span class="comment"># anyway because it uses PySequence_Fast or similar.</span><br />
-<a class="lnum" href="#312" name="312">0312</a><span class="comment"></span>        <span class="name">chunks</span> <span class="op">=</span> <span class="name">list</span><span class="op">(</span><span class="name">self</span><span class="op">.</span><span class="name">iterencode</span><span class="op">(</span><span class="name">o</span><span class="op">)</span><span class="op">)</span><br />
-<a class="lnum" href="#313" name="313">0313</a>        <span class="keyword">return</span> <span class="string">''</span><span class="op">.</span><span class="name">join</span><span class="op">(</span><span class="name">chunks</span><span class="op">)</span><br />
-<a class="lnum" href="#314" name="314">0314</a><br />
-<a class="lnum" href="#315" name="315">0315</a>    <span class="keyword">def</span> <span class="name">iterencode</span><span class="op">(</span><span class="name">self</span><span class="op">,</span> <span class="name">o</span><span class="op">)</span><span class="op">:</span><br />
-<a class="lnum" href="#316" name="316">0316</a>        <span class="string">"""</span><br />
-<a class="lnum" href="#317" name="317">0317</a><span class="string">        Encode the given object and yield each string</span><br />
-<a class="lnum" href="#318" name="318">0318</a><span class="string">        representation as available.</span><br />
-<a class="lnum" href="#319" name="319">0319</a><span class="string">        </span><br />
-<a class="lnum" href="#320" name="320">0320</a><span class="string">        For example::</span><br />
-<a class="lnum" href="#321" name="321">0321</a><span class="string">            </span><br />
-<a class="lnum" href="#322" name="322">0322</a><span class="string">            for chunk in JSONEncoder().iterencode(bigobject):</span><br />
-<a class="lnum" href="#323" name="323">0323</a><span class="string">                mysocket.write(chunk)</span><br />
-<a class="lnum" href="#324" name="324">0324</a><span class="string">        """</span><br />
-<a class="lnum" href="#325" name="325">0325</a>        <span class="keyword">if</span> <span class="name">self</span><span class="op">.</span><span class="name">check_circular</span><span class="op">:</span><br />
-<a class="lnum" href="#326" name="326">0326</a>            <span class="name">markers</span> <span class="op">=</span> <span class="op">{</span><span class="op">}</span><br />
-<a class="lnum" href="#327" name="327">0327</a>        <span class="keyword">else</span><span class="op">:</span><br />
-<a class="lnum" href="#328" name="328">0328</a>            <span class="name">markers</span> <span class="op">=</span> <span class="name">None</span><br />
-<a class="lnum" href="#329" name="329">0329</a>        <span class="keyword">return</span> <span class="name">self</span><span class="op">.</span><span class="name">_iterencode</span><span class="op">(</span><span class="name">o</span><span class="op">,</span> <span class="name">markers</span><span class="op">)</span><br />
-<a class="lnum" href="#330" name="330">0330</a><br />
-<a class="lnum" href="#331" name="331">0331</a><span class="name">__all__</span> <span class="op">=</span> <span class="op">[</span><span class="string">'JSONEncoder'</span><span class="op">]</span></code></div></body></html>
\ No newline at end of file
+<a class="lnum" href="#309" name="309">0309</a>        <span class="keyword">raise</span> <span class="name">TypeError</span><span class="op">(</span><span class="string">"%r is not JSON serializable"</span> <span class="op">%</span> <span class="op">(</span><span class="name">o</span><span class="op">,</span><span class="op">)</span><span class="op">)</span><br />
+<a class="lnum" href="#310" name="310">0310</a><br />
+<a class="lnum" href="#311" name="311">0311</a>    <span class="keyword">def</span> <span class="name">encode</span><span class="op">(</span><span class="name">self</span><span class="op">,</span> <span class="name">o</span><span class="op">)</span><span class="op">:</span><br />
+<a class="lnum" href="#312" name="312">0312</a>        <span class="string">"""</span><br />
+<a class="lnum" href="#313" name="313">0313</a><span class="string">        Return a JSON string representation of a Python data structure.</span><br />
+<a class="lnum" href="#314" name="314">0314</a><span class="string"></span><br />
+<a class="lnum" href="#315" name="315">0315</a><span class="string">        >>> JSONEncoder().encode({"foo": ["bar", "baz"]})</span><br />
+<a class="lnum" href="#316" name="316">0316</a><span class="string">        '{"foo":["bar", "baz"]}'</span><br />
+<a class="lnum" href="#317" name="317">0317</a><span class="string">        """</span><br />
+<a class="lnum" href="#318" name="318">0318</a>        <span class="comment"># This doesn't pass the iterator directly to ''.join() because it</span><br />
+<a class="lnum" href="#319" name="319">0319</a><span class="comment"></span>        <span class="comment"># sucks at reporting exceptions.  It's going to do this internally</span><br />
+<a class="lnum" href="#320" name="320">0320</a><span class="comment"></span>        <span class="comment"># anyway because it uses PySequence_Fast or similar.</span><br />
+<a class="lnum" href="#321" name="321">0321</a><span class="comment"></span>        <span class="name">chunks</span> <span class="op">=</span> <span class="name">list</span><span class="op">(</span><span class="name">self</span><span class="op">.</span><span class="name">iterencode</span><span class="op">(</span><span class="name">o</span><span class="op">)</span><span class="op">)</span><br />
+<a class="lnum" href="#322" name="322">0322</a>        <span class="keyword">return</span> <span class="string">''</span><span class="op">.</span><span class="name">join</span><span class="op">(</span><span class="name">chunks</span><span class="op">)</span><br />
+<a class="lnum" href="#323" name="323">0323</a><br />
+<a class="lnum" href="#324" name="324">0324</a>    <span class="keyword">def</span> <span class="name">iterencode</span><span class="op">(</span><span class="name">self</span><span class="op">,</span> <span class="name">o</span><span class="op">)</span><span class="op">:</span><br />
+<a class="lnum" href="#325" name="325">0325</a>        <span class="string">"""</span><br />
+<a class="lnum" href="#326" name="326">0326</a><span class="string">        Encode the given object and yield each string</span><br />
+<a class="lnum" href="#327" name="327">0327</a><span class="string">        representation as available.</span><br />
+<a class="lnum" href="#328" name="328">0328</a><span class="string">        </span><br />
+<a class="lnum" href="#329" name="329">0329</a><span class="string">        For example::</span><br />
+<a class="lnum" href="#330" name="330">0330</a><span class="string">            </span><br />
+<a class="lnum" href="#331" name="331">0331</a><span class="string">            for chunk in JSONEncoder().iterencode(bigobject):</span><br />
+<a class="lnum" href="#332" name="332">0332</a><span class="string">                mysocket.write(chunk)</span><br />
+<a class="lnum" href="#333" name="333">0333</a><span class="string">        """</span><br />
+<a class="lnum" href="#334" name="334">0334</a>        <span class="keyword">if</span> <span class="name">self</span><span class="op">.</span><span class="name">check_circular</span><span class="op">:</span><br />
+<a class="lnum" href="#335" name="335">0335</a>            <span class="name">markers</span> <span class="op">=</span> <span class="op">{</span><span class="op">}</span><br />
+<a class="lnum" href="#336" name="336">0336</a>        <span class="keyword">else</span><span class="op">:</span><br />
+<a class="lnum" href="#337" name="337">0337</a>            <span class="name">markers</span> <span class="op">=</span> <span class="name">None</span><br />
+<a class="lnum" href="#338" name="338">0338</a>        <span class="keyword">return</span> <span class="name">self</span><span class="op">.</span><span class="name">_iterencode</span><span class="op">(</span><span class="name">o</span><span class="op">,</span> <span class="name">markers</span><span class="op">)</span><br />
+<a class="lnum" href="#339" name="339">0339</a><br />
+<a class="lnum" href="#340" name="340">0340</a><span class="name">__all__</span> <span class="op">=</span> <span class="op">[</span><span class="string">'JSONEncoder'</span><span class="op">]</span></code></div></body></html>
\ No newline at end of file
diff --git a/simplejson/__init__.py b/simplejson/__init__.py
index a4c3f06e5ebca2cc3cabcc6de316a0b4f7419666_c2ltcGxlanNvbi9fX2luaXRfXy5weQ==..c6fa01dc9a352915efb9a5b7985bd27614357d8c_c2ltcGxlanNvbi9fX2luaXRfXy5weQ== 100644
--- a/simplejson/__init__.py
+++ b/simplejson/__init__.py
@@ -96,7 +96,7 @@
from encoder import JSONEncoder
def dump(obj, fp, skipkeys=False, ensure_ascii=True, check_circular=True,
- allow_nan=True, cls=None, indent=None, **kw):
+ allow_nan=True, cls=None, indent=None, encoding='utf-8', **kw):
"""
Serialize ``obj`` as a JSON formatted stream to ``fp`` (a
``.write()``-supporting file-like object).
@@ -107,7 +107,7 @@
If ``ensure_ascii`` is ``False``, then the some chunks written to ``fp``
may be ``unicode`` instances, subject to normal Python ``str`` to
- ``unicode`` coercion rules. Unless ``fp.write()`` explicitly
+ ``unicode`` coercion rules. Unless ``fp.write()`` explicitly
understands ``unicode`` (as in ``codecs.getwriter()``) this is likely
to cause an error.
@@ -121,8 +121,10 @@
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`` is the most compact representation.
+ members will be pretty-printed with that indent level. An indent level
+ of 0 will only insert newlines. ``None`` is the most compact representation.
+
+ ``encoding`` is the character encoding for str instances, default is UTF-8.
To use a custom ``JSONEncoder`` subclass (e.g. one that overrides the
``.default()`` method to serialize additional types), specify it with
@@ -132,10 +134,10 @@
cls = JSONEncoder
iterable = cls(skipkeys=skipkeys, ensure_ascii=ensure_ascii,
check_circular=check_circular, allow_nan=allow_nan, indent=indent,
- **kw).iterencode(obj)
+ encoding=encoding, **kw).iterencode(obj)
# could accelerate with writelines in some versions of Python, at
# a debuggability cost
for chunk in iterable:
fp.write(chunk)
def dumps(obj, skipkeys=False, ensure_ascii=True, check_circular=True,
@@ -136,10 +138,11 @@
# could accelerate with writelines in some versions of Python, at
# a debuggability cost
for chunk in iterable:
fp.write(chunk)
def dumps(obj, skipkeys=False, ensure_ascii=True, check_circular=True,
- allow_nan=True, cls=None, indent=None, separators=None, **kw):
+ allow_nan=True, cls=None, indent=None, separators=None,
+ encoding='utf-8', **kw):
"""
Serialize ``obj`` to a JSON formatted ``str``.
@@ -161,11 +164,11 @@
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`` is the most compact
+ 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 ``separators`` is an ``(item_separator, dict_separator)`` tuple
then it will be used instead of the default ``(', ', ': ')`` separators.
``(',', ':')`` is the most compact JSON representation.
@@ -166,9 +169,11 @@
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.
+ ``encoding`` is the character encoding for str instances, default is UTF-8.
+
To use a custom ``JSONEncoder`` subclass (e.g. one that overrides the
``.default()`` method to serialize additional types), specify it with
the ``cls`` kwarg.
@@ -178,7 +183,7 @@
return cls(
skipkeys=skipkeys, ensure_ascii=ensure_ascii,
check_circular=check_circular, allow_nan=allow_nan, indent=indent,
- separators=separators,
+ separators=separators, encoding=encoding,
**kw).encode(obj)
def load(fp, encoding=None, cls=None, object_hook=None, **kw):
@@ -188,9 +193,9 @@
If the contents of ``fp`` is encoded with an ASCII based encoding 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
+ be specified. Encodings that are not ASCII based (such as UCS-2) are
not allowed, and should be wrapped with
``codecs.getreader(fp)(encoding)``, or simply decoded to a ``unicode``
object and passed to ``loads()``
``object_hook`` is an optional function that will be called with the
@@ -192,10 +197,10 @@
not allowed, and should be wrapped with
``codecs.getreader(fp)(encoding)``, or simply decoded to a ``unicode``
object and passed to ``loads()``
``object_hook`` is an optional function that will be called with the
- result of any object literal decode (a ``dict``). The return value of
- ``object_hook`` will be used instead of the ``dict``. This feature
+ result of any object literal decode (a ``dict``). The return value of
+ ``object_hook`` will be used instead of the ``dict``. This feature
can be used to implement custom decoders (e.g. JSON-RPC class hinting).
To use a custom ``JSONDecoder`` subclass, specify it with the ``cls``
@@ -214,7 +219,7 @@
If ``s`` is a ``str`` instance and is encoded with an ASCII based encoding
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)
+ must be specified. Encodings that are not ASCII based (such as UCS-2)
are not allowed and should be decoded to ``unicode`` first.
``object_hook`` is an optional function that will be called with the
@@ -218,8 +223,8 @@
are not allowed and should be decoded to ``unicode`` first.
``object_hook`` is an optional function that will be called with the
- result of any object literal decode (a ``dict``). The return value of
- ``object_hook`` will be used instead of the ``dict``. This feature
+ result of any object literal decode (a ``dict``). The return value of
+ ``object_hook`` will be used instead of the ``dict``. This feature
can be used to implement custom decoders (e.g. JSON-RPC class hinting).
To use a custom ``JSONDecoder`` subclass, specify it with the ``cls``
@@ -233,7 +238,7 @@
def read(s):
"""
- json-py API compatibility hook. Use loads(s) instead.
+ json-py API compatibility hook. Use loads(s) instead.
"""
import warnings
warnings.warn("simplejson.loads(s) should be used instead of read(s)",
@@ -242,7 +247,7 @@
def write(obj):
"""
- json-py API compatibility hook. Use dumps(s) instead.
+ json-py API compatibility hook. Use dumps(s) instead.
"""
import warnings
warnings.warn("simplejson.dumps(s) should be used instead of write(s)",
diff --git a/simplejson/encoder.py b/simplejson/encoder.py
index a4c3f06e5ebca2cc3cabcc6de316a0b4f7419666_c2ltcGxlanNvbi9lbmNvZGVyLnB5..c6fa01dc9a352915efb9a5b7985bd27614357d8c_c2ltcGxlanNvbi9lbmNvZGVyLnB5 100644
--- a/simplejson/encoder.py
+++ b/simplejson/encoder.py
@@ -94,7 +94,7 @@
key_separator = ': '
def __init__(self, skipkeys=False, ensure_ascii=True,
check_circular=True, allow_nan=True, sort_keys=False,
- indent=None, separators=None):
+ indent=None, separators=None, encoding='utf-8'):
"""
Constructor for JSONEncoder, with sensible defaults.
@@ -128,6 +128,10 @@
If specified, separators should be a (item_separator, key_separator)
tuple. The default is (', ', ': '). To get the most compact JSON
representation you should specify (',', ':') to eliminate whitespace.
+
+ If encoding is not None, then all input strings will be
+ transformed into unicode using that encoding prior to JSON-encoding.
+ The default is UTF-8.
"""
self.skipkeys = skipkeys
@@ -139,6 +143,7 @@
self.current_indent_level = 0
if separators is not None:
self.item_separator, self.key_separator = separators
+ self.encoding = encoding
def _newline_indent(self):
return '\n' + (' ' * (self.indent * self.current_indent_level))
@@ -208,7 +213,9 @@
else:
items = dct.iteritems()
for key, value in items:
- if isinstance(key, basestring):
+ if self.encoding is not None and isinstance(key, str):
+ key = key.decode(self.encoding)
+ elif isinstance(key, basestring):
pass
# JavaScript is weakly typed for these, so it makes sense to
# also allow them. Many encoders seem to do something like this.
@@ -247,6 +254,8 @@
encoder = encode_basestring_ascii
else:
encoder = encode_basestring
+ if self.encoding and isinstance(o, str):
+ o = o.decode(self.encoding)
yield encoder(o)
elif o is None:
yield 'null'
diff --git a/simplejson/tests/test_unicode.py b/simplejson/tests/test_unicode.py
new file mode 100644
index 0000000000000000000000000000000000000000..c6fa01dc9a352915efb9a5b7985bd27614357d8c_c2ltcGxlanNvbi90ZXN0cy90ZXN0X3VuaWNvZGUucHk=
--- /dev/null
+++ b/simplejson/tests/test_unicode.py
@@ -0,0 +1,16 @@
+import simplejson as S
+
+def test_encoding1():
+ encoder = S.JSONEncoder(encoding='utf-8')
+ u = u'\N{GREEK SMALL LETTER ALPHA}\N{GREEK CAPITAL LETTER OMEGA}'
+ s = u.encode('utf-8')
+ ju = encoder.encode(u)
+ js = encoder.encode(s)
+ assert ju == js
+
+def test_encoding2():
+ u = u'\N{GREEK SMALL LETTER ALPHA}\N{GREEK CAPITAL LETTER OMEGA}'
+ s = u.encode('utf-8')
+ ju = S.dumps(u, encoding='utf-8')
+ js = S.dumps(s, encoding='utf-8')
+ assert ju == js