diff options
| -rw-r--r-- | docs/class-simplejson.JSONDecoder.html | 4 | ||||
| -rw-r--r-- | docs/class-simplejson.JSONEncoder.html | 2 | ||||
| -rw-r--r-- | docs/index.html | 15 | ||||
| -rw-r--r-- | docs/module-index.html | 6 | ||||
| -rw-r--r-- | docs/module-simplejson-index.html | 10 | ||||
| -rw-r--r-- | docs/module-simplejson.html | 15 | ||||
| -rw-r--r-- | docs/simplejson/__init__.py.html | 290 | ||||
| -rwxr-xr-x | scripts/make_docs.py | 4 | ||||
| -rw-r--r-- | simplejson/__init__.py | 10 | ||||
| -rw-r--r-- | simplejson/tests/test_dump.py | 10 |
10 files changed, 196 insertions, 170 deletions
diff --git a/docs/class-simplejson.JSONDecoder.html b/docs/class-simplejson.JSONDecoder.html index a6b0a36..c5f31ff 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.7dev-r1000</A></H1> + <H1 ID="doc-title"><A HREF="index.html" REL="index">simplejson 1.7.1</A></H1> <DIV CLASS="online-navigation"> <A HREF="index.html" REL="index">index</A> <SPAN ID="nav-docs"> @@ -148,7 +148,7 @@ deserializations (e.g. to support JSON-RPC class hinting).</P> </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 0x12c6650>)</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 0x13244a0>)</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 a9d5b45..1e42961 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.7dev-r1000</A></H1> + <H1 ID="doc-title"><A HREF="index.html" REL="index">simplejson 1.7.1</A></H1> <DIV CLASS="online-navigation"> <A HREF="index.html" REL="index">index</A> <SPAN ID="nav-docs"> diff --git a/docs/index.html b/docs/index.html index 1c562ae..c142f3f 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.7dev-r1000</A></H1> + <H1 ID="doc-title"><A HREF="index.html" REL="index">simplejson 1.7.1</A></H1> <DIV CLASS="online-navigation"> <A HREF="index.html" REL="index">index</A> <SPAN ID="nav-docs"> @@ -174,8 +174,8 @@ is a subset of YAML, so it may be used as a serializer for that as well.</P> <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, encoding='utf-8', **kw)</TT> - <A HREF="simplejson/__init__.py.html?f=108&l=160#108" 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, separators=None, encoding='utf-8', **kw)</TT> + <A HREF="simplejson/__init__.py.html?f=108&l=164#108" TITLE="View Source">...</A> </H4> <DIV CLASS="pudge-section rst"> @@ -201,6 +201,9 @@ JavaScript equivalents (<TT CLASS="docutils literal"><SPAN CLASS="pre">NaN</SPAN <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> +<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 @@ -212,7 +215,7 @@ the <TT CLASS="docutils literal"><SPAN CLASS="pre">cls</SPAN></TT> kwarg.</P> <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, encoding='utf-8', **kw)</TT> - <A HREF="simplejson/__init__.py.html?f=162&l=213#162" TITLE="View Source">...</A> + <A HREF="simplejson/__init__.py.html?f=166&l=217#166" TITLE="View Source">...</A> </H4> <DIV CLASS="pudge-section rst"> @@ -250,7 +253,7 @@ the <TT CLASS="docutils literal"><SPAN CLASS="pre">cls</SPAN></TT> kwarg.</P> <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=216&l=238#216" TITLE="View Source">...</A> + <A HREF="simplejson/__init__.py.html?f=220&l=242#220" TITLE="View Source">...</A> </H4> <DIV CLASS="pudge-section rst"> @@ -277,7 +280,7 @@ kwarg.</P> <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=239&l=264#239" TITLE="View Source">...</A> + <A HREF="simplejson/__init__.py.html?f=243&l=268#243" TITLE="View Source">...</A> </H4> <DIV CLASS="pudge-section rst"> diff --git a/docs/module-index.html b/docs/module-index.html index 7fe1431..5e92fca 100644 --- a/docs/module-index.html +++ b/docs/module-index.html @@ -2,14 +2,14 @@ <HTML> <HEAD><META CONTENT="text/html; charset=utf-8" HTTP-EQUIV="Content-Type"> - <TITLE>simplejson 1.7dev-r1000 -- Module Reference</TITLE> + <TITLE>simplejson 1.7.1 -- Module Reference</TITLE> <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.7dev-r1000</A></H1> + <H1 ID="doc-title"><A HREF="index.html" REL="index">simplejson 1.7.1</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.7dev-r1000 + simplejson 1.7.1 </H1> <H4 CLASS="pudge-member-page-subheading"> Module Reference diff --git a/docs/module-simplejson-index.html b/docs/module-simplejson-index.html index 86c8349..935e026 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.7dev-r1000</A></H1> + <H1 ID="doc-title"><A HREF="index.html" REL="index">simplejson 1.7.1</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=216&l=238#216">...</A> + <A HREF="simplejson/__init__.py.html?f=220&l=242#220">...</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 JSON document) to a Python object.</SPAN> <A HREF="module-simplejson.html#dump"> <TT>dump</TT> </A> - <A HREF="simplejson/__init__.py.html?f=108&l=160#108">...</A> + <A HREF="simplejson/__init__.py.html?f=108&l=164#108">...</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 JSON document) to a Python object.</SPAN> <A HREF="module-simplejson.html#dumps"> <TT>dumps</TT> </A> - <A HREF="simplejson/__init__.py.html?f=162&l=213#162">...</A> + <A HREF="simplejson/__init__.py.html?f=166&l=217#166">...</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 JSON document) to a Python object.</SPAN> <A HREF="module-simplejson.html#loads"> <TT>loads</TT> </A> - <A HREF="simplejson/__init__.py.html?f=239&l=264#239">...</A> + <A HREF="simplejson/__init__.py.html?f=243&l=268#243">...</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 1c562ae..c142f3f 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.7dev-r1000</A></H1> + <H1 ID="doc-title"><A HREF="index.html" REL="index">simplejson 1.7.1</A></H1> <DIV CLASS="online-navigation"> <A HREF="index.html" REL="index">index</A> <SPAN ID="nav-docs"> @@ -174,8 +174,8 @@ is a subset of YAML, so it may be used as a serializer for that as well.</P> <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, encoding='utf-8', **kw)</TT> - <A HREF="simplejson/__init__.py.html?f=108&l=160#108" 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, separators=None, encoding='utf-8', **kw)</TT> + <A HREF="simplejson/__init__.py.html?f=108&l=164#108" TITLE="View Source">...</A> </H4> <DIV CLASS="pudge-section rst"> @@ -201,6 +201,9 @@ JavaScript equivalents (<TT CLASS="docutils literal"><SPAN CLASS="pre">NaN</SPAN <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> +<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 @@ -212,7 +215,7 @@ the <TT CLASS="docutils literal"><SPAN CLASS="pre">cls</SPAN></TT> kwarg.</P> <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, encoding='utf-8', **kw)</TT> - <A HREF="simplejson/__init__.py.html?f=162&l=213#162" TITLE="View Source">...</A> + <A HREF="simplejson/__init__.py.html?f=166&l=217#166" TITLE="View Source">...</A> </H4> <DIV CLASS="pudge-section rst"> @@ -250,7 +253,7 @@ the <TT CLASS="docutils literal"><SPAN CLASS="pre">cls</SPAN></TT> kwarg.</P> <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=216&l=238#216" TITLE="View Source">...</A> + <A HREF="simplejson/__init__.py.html?f=220&l=242#220" TITLE="View Source">...</A> </H4> <DIV CLASS="pudge-section rst"> @@ -277,7 +280,7 @@ kwarg.</P> <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=239&l=264#239" TITLE="View Source">...</A> + <A HREF="simplejson/__init__.py.html?f=243&l=268#243" 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 baabf45..fb67bda 100644 --- a/docs/simplejson/__init__.py.html +++ b/docs/simplejson/__init__.py.html @@ -158,7 +158,7 @@ function show_line_range() { <a class="lnum" href="#86" name="86">0086</a><span class="string">Note that the JSON produced by this module's default settings</span><br /> <a class="lnum" href="#87" name="87">0087</a><span class="string">is a subset of YAML, so it may be used as a serializer for that as well.</span><br /> <a class="lnum" href="#88" name="88">0088</a><span class="string">"""</span><br /> -<a class="lnum" href="#89" name="89">0089</a><span class="name">__version__</span> <span class="op">=</span> <span class="string">'1.7'</span><br /> +<a class="lnum" href="#89" name="89">0089</a><span class="name">__version__</span> <span class="op">=</span> <span class="string">'1.7.1'</span><br /> <a class="lnum" href="#90" name="90">0090</a><span class="name">__all__</span> <span class="op">=</span> <span class="op">[</span><br /> <a class="lnum" href="#91" name="91">0091</a>    <span class="string">'dump'</span><span class="op">,</span> <span class="string">'dumps'</span><span class="op">,</span> <span class="string">'load'</span><span class="op">,</span> <span class="string">'loads'</span><span class="op">,</span><br /> <a class="lnum" href="#92" name="92">0092</a>    <span class="string">'JSONDecoder'</span><span class="op">,</span> <span class="string">'JSONEncoder'</span><span class="op">,</span><br /> @@ -178,8 +178,8 @@ function show_line_range() { <a class="lnum" href="#106" name="106">0106</a><span class="op">)</span><br /> <a class="lnum" href="#107" name="107">0107</a><br /> <a class="lnum" href="#108" name="108">0108</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="#109" name="109">0109</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><br /> -<a class="lnum" href="#110" name="110">0110</a>        <span class="op">**</span><span class="name">kw</span><span class="op">)</span><span class="op">:</span><br /> +<a class="lnum" href="#109" name="109">0109</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="#110" name="110">0110</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="#111" name="111">0111</a>    <span class="string">"""</span><br /> <a class="lnum" href="#112" name="112">0112</a><span class="string">    Serialize ``obj`` as a JSON formatted stream to ``fp`` (a</span><br /> <a class="lnum" href="#113" name="113">0113</a><span class="string">    ``.write()``-supporting file-like object).</span><br /> @@ -207,147 +207,151 @@ function show_line_range() { <a class="lnum" href="#135" name="135">0135</a><span class="string">    members will be pretty-printed with that indent level. An indent level</span><br /> <a class="lnum" href="#136" name="136">0136</a><span class="string">    of 0 will only insert newlines. ``None`` is the most compact representation.</span><br /> <a class="lnum" href="#137" name="137">0137</a><span class="string"></span><br /> -<a class="lnum" href="#138" name="138">0138</a><span class="string">    ``encoding`` is the character encoding for str instances, default is UTF-8.</span><br /> -<a class="lnum" href="#139" name="139">0139</a><span class="string"></span><br /> -<a class="lnum" href="#140" name="140">0140</a><span class="string">    To use a custom ``JSONEncoder`` subclass (e.g. one that overrides the</span><br /> -<a class="lnum" href="#141" name="141">0141</a><span class="string">    ``.default()`` method to serialize additional types), specify it with</span><br /> -<a class="lnum" href="#142" name="142">0142</a><span class="string">    the ``cls`` kwarg.</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="comment"># cached encoder</span><br /> -<a class="lnum" href="#145" name="145">0145</a><span class="comment"></span>    <span class="keyword">if</span> <span class="op">(</span><span class="name">skipkeys</span> <span class="keyword">is</span> <span class="name">False</span> <span class="keyword">and</span> <span class="name">ensure_ascii</span> <span class="keyword">is</span> <span class="name">True</span> <span class="keyword">and</span><br /> -<a class="lnum" href="#146" name="146">0146</a>        <span class="name">check_circular</span> <span class="keyword">is</span> <span class="name">True</span> <span class="keyword">and</span> <span class="name">allow_nan</span> <span class="keyword">is</span> <span class="name">True</span> <span class="keyword">and</span><br /> -<a class="lnum" href="#147" name="147">0147</a>        <span class="name">cls</span> <span class="keyword">is</span> <span class="name">None</span> <span class="keyword">and</span> <span class="name">indent</span> <span class="keyword">is</span> <span class="name">None</span> <span class="keyword">and</span> <span class="name">separators</span> <span class="keyword">is</span> <span class="name">None</span> <span class="keyword">and</span><br /> -<a class="lnum" href="#148" name="148">0148</a>        <span class="name">encoding</span> <span class="op">==</span> <span class="string">'utf-8'</span> <span class="keyword">and</span> <span class="keyword">not</span> <span class="name">kw</span><span class="op">)</span><span class="op">:</span><br /> -<a class="lnum" href="#149" name="149">0149</a>        <span class="name">iterable</span> <span class="op">=</span> <span class="name">_default_encoder</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="#150" name="150">0150</a>    <span class="keyword">else</span><span class="op">:</span><br /> -<a class="lnum" href="#151" name="151">0151</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="#152" name="152">0152</a>            <span class="name">cls</span> <span class="op">=</span> <span class="name">JSONEncoder</span><br /> -<a class="lnum" href="#153" name="153">0153</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="#154" name="154">0154</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="#155" name="155">0155</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="#156" name="156">0156</a>    <span class="comment"># could accelerate with writelines in some versions of Python, at</span><br /> -<a class="lnum" href="#157" name="157">0157</a><span class="comment"></span>    <span class="comment"># a debuggability cost</span><br /> -<a class="lnum" href="#158" name="158">0158</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="#159" name="159">0159</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="#160" name="160">0160</a><br /> -<a class="lnum" href="#161" name="161">0161</a><br /> -<a class="lnum" href="#162" name="162">0162</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="#163" name="163">0163</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="#164" name="164">0164</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="#165" name="165">0165</a>    <span class="string">"""</span><br /> -<a class="lnum" href="#166" name="166">0166</a><span class="string">    Serialize ``obj`` to a JSON formatted ``str``.</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 ``skipkeys`` is ``True`` then ``dict`` keys that are not basic types</span><br /> -<a class="lnum" href="#169" name="169">0169</a><span class="string">    (``str``, ``unicode``, ``int``, ``long``, ``float``, ``bool``, ``None``) </span><br /> -<a class="lnum" href="#170" name="170">0170</a><span class="string">    will be skipped instead of raising a ``TypeError``.</span><br /> +<a class="lnum" href="#138" name="138">0138</a><span class="string">    If ``separators`` is an ``(item_separator, dict_separator)`` tuple</span><br /> +<a class="lnum" href="#139" name="139">0139</a><span class="string">    then it will be used instead of the default ``(', ', ': ')`` separators.</span><br /> +<a class="lnum" href="#140" name="140">0140</a><span class="string">    ``(',', ':')`` is the most compact JSON representation.</span><br /> +<a class="lnum" href="#141" name="141">0141</a><span class="string"></span><br /> +<a class="lnum" href="#142" name="142">0142</a><span class="string">    ``encoding`` is the character encoding for str instances, default is UTF-8.</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">    To use a custom ``JSONEncoder`` subclass (e.g. one that overrides the</span><br /> +<a class="lnum" href="#145" name="145">0145</a><span class="string">    ``.default()`` method to serialize additional types), specify it with</span><br /> +<a class="lnum" href="#146" name="146">0146</a><span class="string">    the ``cls`` kwarg.</span><br /> +<a class="lnum" href="#147" name="147">0147</a><span class="string">    """</span><br /> +<a class="lnum" href="#148" name="148">0148</a>    <span class="comment"># cached encoder</span><br /> +<a class="lnum" href="#149" name="149">0149</a><span class="comment"></span>    <span class="keyword">if</span> <span class="op">(</span><span class="name">skipkeys</span> <span class="keyword">is</span> <span class="name">False</span> <span class="keyword">and</span> <span class="name">ensure_ascii</span> <span class="keyword">is</span> <span class="name">True</span> <span class="keyword">and</span><br /> +<a class="lnum" href="#150" name="150">0150</a>        <span class="name">check_circular</span> <span class="keyword">is</span> <span class="name">True</span> <span class="keyword">and</span> <span class="name">allow_nan</span> <span class="keyword">is</span> <span class="name">True</span> <span class="keyword">and</span><br /> +<a class="lnum" href="#151" name="151">0151</a>        <span class="name">cls</span> <span class="keyword">is</span> <span class="name">None</span> <span class="keyword">and</span> <span class="name">indent</span> <span class="keyword">is</span> <span class="name">None</span> <span class="keyword">and</span> <span class="name">separators</span> <span class="keyword">is</span> <span class="name">None</span> <span class="keyword">and</span><br /> +<a class="lnum" href="#152" name="152">0152</a>        <span class="name">encoding</span> <span class="op">==</span> <span class="string">'utf-8'</span> <span class="keyword">and</span> <span class="keyword">not</span> <span class="name">kw</span><span class="op">)</span><span class="op">:</span><br /> +<a class="lnum" href="#153" name="153">0153</a>        <span class="name">iterable</span> <span class="op">=</span> <span class="name">_default_encoder</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="#154" name="154">0154</a>    <span class="keyword">else</span><span class="op">:</span><br /> +<a class="lnum" href="#155" name="155">0155</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="#156" name="156">0156</a>            <span class="name">cls</span> <span class="op">=</span> <span class="name">JSONEncoder</span><br /> +<a class="lnum" href="#157" name="157">0157</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="#158" name="158">0158</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="#159" name="159">0159</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> <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="#160" name="160">0160</a>    <span class="comment"># could accelerate with writelines in some versions of Python, at</span><br /> +<a class="lnum" href="#161" name="161">0161</a><span class="comment"></span>    <span class="comment"># a debuggability cost</span><br /> +<a class="lnum" href="#162" name="162">0162</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="#163" name="163">0163</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="#164" name="164">0164</a><br /> +<a class="lnum" href="#165" name="165">0165</a><br /> +<a class="lnum" href="#166" name="166">0166</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="#167" name="167">0167</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="#168" name="168">0168</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="#169" name="169">0169</a>    <span class="string">"""</span><br /> +<a class="lnum" href="#170" name="170">0170</a><span class="string">    Serialize ``obj`` to a JSON formatted ``str``.</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">    If ``ensure_ascii`` is ``False``, then the return value will be a</span><br /> -<a class="lnum" href="#173" name="173">0173</a><span class="string">    ``unicode`` instance subject to normal Python ``str`` to ``unicode``</span><br /> -<a class="lnum" href="#174" name="174">0174</a><span class="string">    coercion rules instead of being escaped to an ASCII ``str``.</span><br /> +<a class="lnum" href="#172" name="172">0172</a><span class="string">    If ``skipkeys`` is ``True`` then ``dict`` keys that are not basic types</span><br /> +<a class="lnum" href="#173" name="173">0173</a><span class="string">    (``str``, ``unicode``, ``int``, ``long``, ``float``, ``bool``, ``None``) </span><br /> +<a class="lnum" href="#174" name="174">0174</a><span class="string">    will be skipped instead of raising a ``TypeError``.</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="string">    If ``check_circular`` is ``False``, then the circular reference check</span><br /> -<a class="lnum" href="#177" name="177">0177</a><span class="string">    for container types will be skipped and a circular reference will</span><br /> -<a class="lnum" href="#178" name="178">0178</a><span class="string">    result in an ``OverflowError`` (or worse).</span><br /> +<a class="lnum" href="#176" name="176">0176</a><span class="string">    If ``ensure_ascii`` is ``False``, then the return value will be a</span><br /> +<a class="lnum" href="#177" name="177">0177</a><span class="string">    ``unicode`` instance subject to normal Python ``str`` to ``unicode``</span><br /> +<a class="lnum" href="#178" name="178">0178</a><span class="string">    coercion rules instead of being escaped to an ASCII ``str``.</span><br /> <a class="lnum" href="#179" name="179">0179</a><span class="string"></span><br /> -<a class="lnum" href="#180" name="180">0180</a><span class="string">    If ``allow_nan`` is ``False``, then it will be a ``ValueError`` to</span><br /> -<a class="lnum" href="#181" name="181">0181</a><span class="string">    serialize out of range ``float`` values (``nan``, ``inf``, ``-inf``) in</span><br /> -<a class="lnum" href="#182" name="182">0182</a><span class="string">    strict compliance of the JSON specification, instead of using the</span><br /> -<a class="lnum" href="#183" name="183">0183</a><span class="string">    JavaScript equivalents (``NaN``, ``Infinity``, ``-Infinity``).</span><br /> -<a class="lnum" href="#184" name="184">0184</a><span class="string"></span><br /> -<a class="lnum" href="#185" name="185">0185</a><span class="string">    If ``indent`` is a non-negative integer, then JSON array elements and</span><br /> -<a class="lnum" href="#186" name="186">0186</a><span class="string">    object members will be pretty-printed with that indent level. An indent</span><br /> -<a class="lnum" href="#187" name="187">0187</a><span class="string">    level of 0 will only insert newlines. ``None`` is the most compact</span><br /> -<a class="lnum" href="#188" name="188">0188</a><span class="string">    representation.</span><br /> -<a class="lnum" href="#189" name="189">0189</a><span class="string"></span><br /> -<a class="lnum" href="#190" name="190">0190</a><span class="string">    If ``separators`` is an ``(item_separator, dict_separator)`` tuple</span><br /> -<a class="lnum" href="#191" name="191">0191</a><span class="string">    then it will be used instead of the default ``(', ', ': ')`` separators.</span><br /> -<a class="lnum" href="#192" name="192">0192</a><span class="string">    ``(',', ':')`` is the most compact JSON representation.</span><br /> +<a class="lnum" href="#180" name="180">0180</a><span class="string">    If ``check_circular`` is ``False``, then the circular reference check</span><br /> +<a class="lnum" href="#181" name="181">0181</a><span class="string">    for container types will be skipped and a circular reference will</span><br /> +<a class="lnum" href="#182" name="182">0182</a><span class="string">    result in an ``OverflowError`` (or worse).</span><br /> +<a class="lnum" href="#183" name="183">0183</a><span class="string"></span><br /> +<a class="lnum" href="#184" name="184">0184</a><span class="string">    If ``allow_nan`` is ``False``, then it will be a ``ValueError`` to</span><br /> +<a class="lnum" href="#185" name="185">0185</a><span class="string">    serialize out of range ``float`` values (``nan``, ``inf``, ``-inf``) in</span><br /> +<a class="lnum" href="#186" name="186">0186</a><span class="string">    strict compliance of the JSON specification, instead of using the</span><br /> +<a class="lnum" href="#187" name="187">0187</a><span class="string">    JavaScript equivalents (``NaN``, ``Infinity``, ``-Infinity``).</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 ``indent`` is a non-negative integer, then JSON array elements and</span><br /> +<a class="lnum" href="#190" name="190">0190</a><span class="string">    object members will be pretty-printed with that indent level. An indent</span><br /> +<a class="lnum" href="#191" name="191">0191</a><span class="string">    level of 0 will only insert newlines. ``None`` is the most compact</span><br /> +<a class="lnum" href="#192" name="192">0192</a><span class="string">    representation.</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">    ``encoding`` is the character encoding for str instances, default is UTF-8.</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">    To use a custom ``JSONEncoder`` subclass (e.g. one that overrides the</span><br /> -<a class="lnum" href="#197" name="197">0197</a><span class="string">    ``.default()`` method to serialize additional types), specify it with</span><br /> -<a class="lnum" href="#198" name="198">0198</a><span class="string">    the ``cls`` kwarg.</span><br /> -<a class="lnum" href="#199" name="199">0199</a><span class="string">    """</span><br /> -<a class="lnum" href="#200" name="200">0200</a>    <span class="comment"># cached encoder</span><br /> -<a class="lnum" href="#201" name="201">0201</a><span class="comment"></span>    <span class="keyword">if</span> <span class="op">(</span><span class="name">skipkeys</span> <span class="keyword">is</span> <span class="name">False</span> <span class="keyword">and</span> <span class="name">ensure_ascii</span> <span class="keyword">is</span> <span class="name">True</span> <span class="keyword">and</span><br /> -<a class="lnum" href="#202" name="202">0202</a>        <span class="name">check_circular</span> <span class="keyword">is</span> <span class="name">True</span> <span class="keyword">and</span> <span class="name">allow_nan</span> <span class="keyword">is</span> <span class="name">True</span> <span class="keyword">and</span><br /> -<a class="lnum" href="#203" name="203">0203</a>        <span class="name">cls</span> <span class="keyword">is</span> <span class="name">None</span> <span class="keyword">and</span> <span class="name">indent</span> <span class="keyword">is</span> <span class="name">None</span> <span class="keyword">and</span> <span class="name">separators</span> <span class="keyword">is</span> <span class="name">None</span> <span class="keyword">and</span><br /> -<a class="lnum" href="#204" name="204">0204</a>        <span class="name">encoding</span> <span class="op">==</span> <span class="string">'utf-8'</span> <span class="keyword">and</span> <span class="keyword">not</span> <span class="name">kw</span><span class="op">)</span><span class="op">:</span><br /> -<a class="lnum" href="#205" name="205">0205</a>        <span class="keyword">return</span> <span class="name">_default_encoder</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="#206" name="206">0206</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="#207" name="207">0207</a>        <span class="name">cls</span> <span class="op">=</span> <span class="name">JSONEncoder</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><br /> -<a class="lnum" href="#209" name="209">0209</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="#210" name="210">0210</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="#211" name="211">0211</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="#212" name="212">0212</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="#213" name="213">0213</a><br /> -<a class="lnum" href="#214" name="214">0214</a><span class="name">_default_decoder</span> <span class="op">=</span> <span class="name">JSONDecoder</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">object_hook</span><span class="op">=</span><span class="name">None</span><span class="op">)</span><br /> -<a class="lnum" href="#215" name="215">0215</a><br /> -<a class="lnum" href="#216" name="216">0216</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="#217" name="217">0217</a>    <span class="string">"""</span><br /> -<a class="lnum" href="#218" name="218">0218</a><span class="string">    Deserialize ``fp`` (a ``.read()``-supporting file-like object containing</span><br /> -<a class="lnum" href="#219" name="219">0219</a><span class="string">    a JSON document) to a Python object.</span><br /> -<a class="lnum" href="#220" name="220">0220</a><span class="string"></span><br /> -<a class="lnum" href="#221" name="221">0221</a><span class="string">    If the contents of ``fp`` is encoded with an ASCII based encoding other</span><br /> -<a class="lnum" href="#222" name="222">0222</a><span class="string">    than utf-8 (e.g. latin-1), then an appropriate ``encoding`` name must</span><br /> -<a class="lnum" href="#223" name="223">0223</a><span class="string">    be specified. Encodings that are not ASCII based (such as UCS-2) are</span><br /> -<a class="lnum" href="#224" name="224">0224</a><span class="string">    not allowed, and should be wrapped with</span><br /> -<a class="lnum" href="#225" name="225">0225</a><span class="string">    ``codecs.getreader(fp)(encoding)``, or simply decoded to a ``unicode``</span><br /> -<a class="lnum" href="#226" name="226">0226</a><span class="string">    object and passed to ``loads()``</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="string">    ``object_hook`` is an optional function that will be called with the</span><br /> -<a class="lnum" href="#229" name="229">0229</a><span class="string">    result of any object literal decode (a ``dict``). The return value of</span><br /> -<a class="lnum" href="#230" name="230">0230</a><span class="string">    ``object_hook`` will be used instead of the ``dict``. This feature</span><br /> -<a class="lnum" href="#231" name="231">0231</a><span class="string">    can be used to implement custom decoders (e.g. JSON-RPC class hinting).</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="string">    To use a custom ``JSONDecoder`` subclass, specify it with the ``cls``</span><br /> -<a class="lnum" href="#234" name="234">0234</a><span class="string">    kwarg.</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="keyword">return</span> <span class="name">loads</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="#237" name="237">0237</a>        <span class="name">encoding</span><span class="op">=</span><span class="name">encoding</span><span class="op">,</span> <span class="name">cls</span><span class="op">=</span><span class="name">cls</span><span class="op">,</span> <span class="name">object_hook</span><span class="op">=</span><span class="name">object_hook</span><span class="op">,</span> <span class="op">**</span><span class="name">kw</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">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="#240" name="240">0240</a>    <span class="string">"""</span><br /> -<a class="lnum" href="#241" name="241">0241</a><span class="string">    Deserialize ``s`` (a ``str`` or ``unicode`` instance containing a JSON</span><br /> -<a class="lnum" href="#242" name="242">0242</a><span class="string">    document) to a Python object.</span><br /> -<a class="lnum" href="#243" name="243">0243</a><span class="string"></span><br /> -<a class="lnum" href="#244" name="244">0244</a><span class="string">    If ``s`` is a ``str`` instance and is encoded with an ASCII based encoding</span><br /> -<a class="lnum" href="#245" name="245">0245</a><span class="string">    other than utf-8 (e.g. latin-1) then an appropriate ``encoding`` name</span><br /> -<a class="lnum" href="#246" name="246">0246</a><span class="string">    must be specified. Encodings that are not ASCII based (such as UCS-2)</span><br /> -<a class="lnum" href="#247" name="247">0247</a><span class="string">    are not allowed and should be decoded to ``unicode`` first.</span><br /> -<a class="lnum" href="#248" name="248">0248</a><span class="string"></span><br /> -<a class="lnum" href="#249" name="249">0249</a><span class="string">    ``object_hook`` is an optional function that will be called with the</span><br /> -<a class="lnum" href="#250" name="250">0250</a><span class="string">    result of any object literal decode (a ``dict``). The return value of</span><br /> -<a class="lnum" href="#251" name="251">0251</a><span class="string">    ``object_hook`` will be used instead of the ``dict``. This feature</span><br /> -<a class="lnum" href="#252" name="252">0252</a><span class="string">    can be used to implement custom decoders (e.g. JSON-RPC class hinting).</span><br /> -<a class="lnum" href="#253" name="253">0253</a><span class="string"></span><br /> -<a class="lnum" href="#254" name="254">0254</a><span class="string">    To use a custom ``JSONDecoder`` subclass, specify it with the ``cls``</span><br /> -<a class="lnum" href="#255" name="255">0255</a><span class="string">    kwarg.</span><br /> -<a class="lnum" href="#256" name="256">0256</a><span class="string">    """</span><br /> -<a class="lnum" href="#257" name="257">0257</a>    <span class="keyword">if</span> <span class="name">cls</span> <span class="keyword">is</span> <span class="name">None</span> <span class="keyword">and</span> <span class="name">encoding</span> <span class="keyword">is</span> <span class="name">None</span> <span class="keyword">and</span> <span class="name">object_hook</span> <span class="keyword">is</span> <span class="name">None</span> <span class="keyword">and</span> <span class="keyword">not</span> <span class="name">kw</span><span class="op">:</span><br /> -<a class="lnum" href="#258" name="258">0258</a>        <span class="keyword">return</span> <span class="name">_default_decoder</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="#259" name="259">0259</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="#260" name="260">0260</a>        <span class="name">cls</span> <span class="op">=</span> <span class="name">JSONDecoder</span><br /> -<a class="lnum" href="#261" name="261">0261</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="#262" name="262">0262</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="#263" name="263">0263</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="#264" name="264">0264</a><br /> -<a class="lnum" href="#265" name="265">0265</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="#266" name="266">0266</a>    <span class="string">"""</span><br /> -<a class="lnum" href="#267" name="267">0267</a><span class="string">    json-py API compatibility hook. Use loads(s) instead.</span><br /> -<a class="lnum" href="#268" name="268">0268</a><span class="string">    """</span><br /> -<a class="lnum" href="#269" name="269">0269</a>    <span class="keyword">import</span> <span class="name">warnings</span><br /> -<a class="lnum" href="#270" name="270">0270</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="#271" name="271">0271</a>        <span class="name">DeprecationWarning</span><span class="op">)</span><br /> -<a class="lnum" href="#272" name="272">0272</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="#273" name="273">0273</a><br /> -<a class="lnum" href="#274" name="274">0274</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="#275" name="275">0275</a>    <span class="string">"""</span><br /> -<a class="lnum" href="#276" name="276">0276</a><span class="string">    json-py API compatibility hook. Use dumps(s) instead.</span><br /> -<a class="lnum" href="#277" name="277">0277</a><span class="string">    """</span><br /> -<a class="lnum" href="#278" name="278">0278</a>    <span class="keyword">import</span> <span class="name">warnings</span><br /> -<a class="lnum" href="#279" name="279">0279</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="#280" name="280">0280</a>        <span class="name">DeprecationWarning</span><span class="op">)</span><br /> -<a class="lnum" href="#281" name="281">0281</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="#194" name="194">0194</a><span class="string">    If ``separators`` is an ``(item_separator, dict_separator)`` tuple</span><br /> +<a class="lnum" href="#195" name="195">0195</a><span class="string">    then it will be used instead of the default ``(', ', ': ')`` separators.</span><br /> +<a class="lnum" href="#196" name="196">0196</a><span class="string">    ``(',', ':')`` is the most compact JSON representation.</span><br /> +<a class="lnum" href="#197" name="197">0197</a><span class="string"></span><br /> +<a class="lnum" href="#198" name="198">0198</a><span class="string">    ``encoding`` is the character encoding for str instances, default is UTF-8.</span><br /> +<a class="lnum" href="#199" name="199">0199</a><span class="string"></span><br /> +<a class="lnum" href="#200" name="200">0200</a><span class="string">    To use a custom ``JSONEncoder`` subclass (e.g. one that overrides the</span><br /> +<a class="lnum" href="#201" name="201">0201</a><span class="string">    ``.default()`` method to serialize additional types), specify it with</span><br /> +<a class="lnum" href="#202" name="202">0202</a><span class="string">    the ``cls`` 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="comment"># cached encoder</span><br /> +<a class="lnum" href="#205" name="205">0205</a><span class="comment"></span>    <span class="keyword">if</span> <span class="op">(</span><span class="name">skipkeys</span> <span class="keyword">is</span> <span class="name">False</span> <span class="keyword">and</span> <span class="name">ensure_ascii</span> <span class="keyword">is</span> <span class="name">True</span> <span class="keyword">and</span><br /> +<a class="lnum" href="#206" name="206">0206</a>        <span class="name">check_circular</span> <span class="keyword">is</span> <span class="name">True</span> <span class="keyword">and</span> <span class="name">allow_nan</span> <span class="keyword">is</span> <span class="name">True</span> <span class="keyword">and</span><br /> +<a class="lnum" href="#207" name="207">0207</a>        <span class="name">cls</span> <span class="keyword">is</span> <span class="name">None</span> <span class="keyword">and</span> <span class="name">indent</span> <span class="keyword">is</span> <span class="name">None</span> <span class="keyword">and</span> <span class="name">separators</span> <span class="keyword">is</span> <span class="name">None</span> <span class="keyword">and</span><br /> +<a class="lnum" href="#208" name="208">0208</a>        <span class="name">encoding</span> <span class="op">==</span> <span class="string">'utf-8'</span> <span class="keyword">and</span> <span class="keyword">not</span> <span class="name">kw</span><span class="op">)</span><span class="op">:</span><br /> +<a class="lnum" href="#209" name="209">0209</a>        <span class="keyword">return</span> <span class="name">_default_encoder</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="#210" name="210">0210</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="#211" name="211">0211</a>        <span class="name">cls</span> <span class="op">=</span> <span class="name">JSONEncoder</span><br /> +<a class="lnum" href="#212" name="212">0212</a>    <span class="keyword">return</span> <span class="name">cls</span><span class="op">(</span><br /> +<a class="lnum" href="#213" name="213">0213</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="#214" name="214">0214</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="#215" name="215">0215</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="#216" name="216">0216</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="#217" name="217">0217</a><br /> +<a class="lnum" href="#218" name="218">0218</a><span class="name">_default_decoder</span> <span class="op">=</span> <span class="name">JSONDecoder</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">object_hook</span><span class="op">=</span><span class="name">None</span><span class="op">)</span><br /> +<a class="lnum" href="#219" name="219">0219</a><br /> +<a class="lnum" href="#220" name="220">0220</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="#221" name="221">0221</a>    <span class="string">"""</span><br /> +<a class="lnum" href="#222" name="222">0222</a><span class="string">    Deserialize ``fp`` (a ``.read()``-supporting file-like object containing</span><br /> +<a class="lnum" href="#223" name="223">0223</a><span class="string">    a JSON document) to a Python object.</span><br /> +<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">    If the contents of ``fp`` is encoded with an ASCII based encoding other</span><br /> +<a class="lnum" href="#226" name="226">0226</a><span class="string">    than utf-8 (e.g. latin-1), then an appropriate ``encoding`` name must</span><br /> +<a class="lnum" href="#227" name="227">0227</a><span class="string">    be specified. Encodings that are not ASCII based (such as UCS-2) are</span><br /> +<a class="lnum" href="#228" name="228">0228</a><span class="string">    not allowed, and should be wrapped with</span><br /> +<a class="lnum" href="#229" name="229">0229</a><span class="string">    ``codecs.getreader(fp)(encoding)``, or simply decoded to a ``unicode``</span><br /> +<a class="lnum" href="#230" name="230">0230</a><span class="string">    object and passed to ``loads()``</span><br /> +<a class="lnum" href="#231" name="231">0231</a><span class="string"></span><br /> +<a class="lnum" href="#232" name="232">0232</a><span class="string">    ``object_hook`` is an optional function that will be called with the</span><br /> +<a class="lnum" href="#233" name="233">0233</a><span class="string">    result of any object literal decode (a ``dict``). The return value of</span><br /> +<a class="lnum" href="#234" name="234">0234</a><span class="string">    ``object_hook`` will be used instead of the ``dict``. This feature</span><br /> +<a class="lnum" href="#235" name="235">0235</a><span class="string">    can be used to implement custom decoders (e.g. JSON-RPC class hinting).</span><br /> +<a class="lnum" href="#236" name="236">0236</a><span class="string">    </span><br /> +<a class="lnum" href="#237" name="237">0237</a><span class="string">    To use a custom ``JSONDecoder`` subclass, specify it with the ``cls``</span><br /> +<a class="lnum" href="#238" name="238">0238</a><span class="string">    kwarg.</span><br /> +<a class="lnum" href="#239" name="239">0239</a><span class="string">    """</span><br /> +<a class="lnum" href="#240" name="240">0240</a>    <span class="keyword">return</span> <span class="name">loads</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="#241" name="241">0241</a>        <span class="name">encoding</span><span class="op">=</span><span class="name">encoding</span><span class="op">,</span> <span class="name">cls</span><span class="op">=</span><span class="name">cls</span><span class="op">,</span> <span class="name">object_hook</span><span class="op">=</span><span class="name">object_hook</span><span class="op">,</span> <span class="op">**</span><span class="name">kw</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">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="#244" name="244">0244</a>    <span class="string">"""</span><br /> +<a class="lnum" href="#245" name="245">0245</a><span class="string">    Deserialize ``s`` (a ``str`` or ``unicode`` instance containing a JSON</span><br /> +<a class="lnum" href="#246" name="246">0246</a><span class="string">    document) to a Python object.</span><br /> +<a class="lnum" href="#247" name="247">0247</a><span class="string"></span><br /> +<a class="lnum" href="#248" name="248">0248</a><span class="string">    If ``s`` is a ``str`` instance and is encoded with an ASCII based encoding</span><br /> +<a class="lnum" href="#249" name="249">0249</a><span class="string">    other than utf-8 (e.g. latin-1) then an appropriate ``encoding`` name</span><br /> +<a class="lnum" href="#250" name="250">0250</a><span class="string">    must be specified. Encodings that are not ASCII based (such as UCS-2)</span><br /> +<a class="lnum" href="#251" name="251">0251</a><span class="string">    are not allowed and should be decoded to ``unicode`` first.</span><br /> +<a class="lnum" href="#252" name="252">0252</a><span class="string"></span><br /> +<a class="lnum" href="#253" name="253">0253</a><span class="string">    ``object_hook`` is an optional function that will be called with the</span><br /> +<a class="lnum" href="#254" name="254">0254</a><span class="string">    result of any object literal decode (a ``dict``). The return value of</span><br /> +<a class="lnum" href="#255" name="255">0255</a><span class="string">    ``object_hook`` will be used instead of the ``dict``. This feature</span><br /> +<a class="lnum" href="#256" name="256">0256</a><span class="string">    can be used to implement custom decoders (e.g. JSON-RPC class hinting).</span><br /> +<a class="lnum" href="#257" name="257">0257</a><span class="string"></span><br /> +<a class="lnum" href="#258" name="258">0258</a><span class="string">    To use a custom ``JSONDecoder`` subclass, specify it with the ``cls``</span><br /> +<a class="lnum" href="#259" name="259">0259</a><span class="string">    kwarg.</span><br /> +<a class="lnum" href="#260" name="260">0260</a><span class="string">    """</span><br /> +<a class="lnum" href="#261" name="261">0261</a>    <span class="keyword">if</span> <span class="name">cls</span> <span class="keyword">is</span> <span class="name">None</span> <span class="keyword">and</span> <span class="name">encoding</span> <span class="keyword">is</span> <span class="name">None</span> <span class="keyword">and</span> <span class="name">object_hook</span> <span class="keyword">is</span> <span class="name">None</span> <span class="keyword">and</span> <span class="keyword">not</span> <span class="name">kw</span><span class="op">:</span><br /> +<a class="lnum" href="#262" name="262">0262</a>        <span class="keyword">return</span> <span class="name">_default_decoder</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="#263" name="263">0263</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="#264" name="264">0264</a>        <span class="name">cls</span> <span class="op">=</span> <span class="name">JSONDecoder</span><br /> +<a class="lnum" href="#265" name="265">0265</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="#266" name="266">0266</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="#267" name="267">0267</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="#268" name="268">0268</a><br /> +<a class="lnum" href="#269" name="269">0269</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="#270" name="270">0270</a>    <span class="string">"""</span><br /> +<a class="lnum" href="#271" name="271">0271</a><span class="string">    json-py API compatibility hook. Use loads(s) instead.</span><br /> +<a class="lnum" href="#272" name="272">0272</a><span class="string">    """</span><br /> +<a class="lnum" href="#273" name="273">0273</a>    <span class="keyword">import</span> <span class="name">warnings</span><br /> +<a class="lnum" href="#274" name="274">0274</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="#275" name="275">0275</a>        <span class="name">DeprecationWarning</span><span class="op">)</span><br /> +<a class="lnum" href="#276" name="276">0276</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="#277" name="277">0277</a><br /> +<a class="lnum" href="#278" name="278">0278</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="#279" name="279">0279</a>    <span class="string">"""</span><br /> +<a class="lnum" href="#280" name="280">0280</a><span class="string">    json-py API compatibility hook. Use dumps(s) instead.</span><br /> +<a class="lnum" href="#281" name="281">0281</a><span class="string">    """</span><br /> +<a class="lnum" href="#282" name="282">0282</a>    <span class="keyword">import</span> <span class="name">warnings</span><br /> +<a class="lnum" href="#283" name="283">0283</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="#284" name="284">0284</a>        <span class="name">DeprecationWarning</span><span class="op">)</span><br /> +<a class="lnum" href="#285" name="285">0285</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/scripts/make_docs.py b/scripts/make_docs.py index 62a4724..2c59032 100755 --- a/scripts/make_docs.py +++ b/scripts/make_docs.py @@ -15,9 +15,11 @@ def _get_version(): return dist.version VERSION = _get_version() +PUDGE = '/Library/Frameworks/Python.framework/Versions/2.4/bin/pudge' +#PUDGE = 'pudge' res = subprocess.call([ - 'pudge', '-v', '-d', 'docs', '-m', PROJECT, + PUDGE, '-v', '-d', 'docs', '-m', PROJECT, '-l', '%s %s' % (PROJECT, VERSION), '--theme=green' ]) diff --git a/simplejson/__init__.py b/simplejson/__init__.py index 0d6f58c..8dae51a 100644 --- a/simplejson/__init__.py +++ b/simplejson/__init__.py @@ -106,8 +106,8 @@ _default_encoder = JSONEncoder( ) def dump(obj, fp, skipkeys=False, ensure_ascii=True, check_circular=True, - allow_nan=True, cls=None, indent=None, encoding='utf-8', - **kw): + allow_nan=True, cls=None, indent=None, separators=None, + encoding='utf-8', **kw): """ Serialize ``obj`` as a JSON formatted stream to ``fp`` (a ``.write()``-supporting file-like object). @@ -135,6 +135,10 @@ def dump(obj, fp, skipkeys=False, ensure_ascii=True, check_circular=True, 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. + ``encoding`` is the character encoding for str instances, default is UTF-8. To use a custom ``JSONEncoder`` subclass (e.g. one that overrides the @@ -152,7 +156,7 @@ def dump(obj, fp, skipkeys=False, ensure_ascii=True, check_circular=True, cls = JSONEncoder iterable = cls(skipkeys=skipkeys, ensure_ascii=ensure_ascii, check_circular=check_circular, allow_nan=allow_nan, indent=indent, - encoding=encoding, **kw).iterencode(obj) + separators=separators, encoding=encoding, **kw).iterencode(obj) # could accelerate with writelines in some versions of Python, at # a debuggability cost for chunk in iterable: diff --git a/simplejson/tests/test_dump.py b/simplejson/tests/test_dump.py new file mode 100644 index 0000000..b4e236e --- /dev/null +++ b/simplejson/tests/test_dump.py @@ -0,0 +1,10 @@ +from cStringIO import StringIO +import simplejson as S + +def test_dump(): + sio = StringIO() + S.dump({}, sio) + assert sio.getvalue() == '{}' + +def test_dumps(): + assert S.dumps({}) == '{}' |