summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Ippolito <bob@redivi.com>2008-03-16 18:51:50 +0000
committerBob Ippolito <bob@redivi.com>2008-03-16 18:51:50 +0000
commit59ac2588ac3de835b4789f8975dd346617a5f977 (patch)
tree5406942e0917207105c1c62139a455eb46595612
parentcc29bd11e9f3da5777efdeb49a464be08e5b8806 (diff)
downloadsimplejson-59ac2588ac3de835b4789f8975dd346617a5f977.tar.gz
update version to 1.7.5
git-svn-id: http://simplejson.googlecode.com/svn/trunk@62 a4795897-2c25-0410-b006-0d3caba88fa1
-rw-r--r--docs/class-simplejson.JSONDecoder.html4
-rw-r--r--docs/class-simplejson.JSONEncoder.html2
-rw-r--r--docs/index.html2
-rw-r--r--docs/module-index.html6
-rw-r--r--docs/module-simplejson-index.html2
-rw-r--r--docs/module-simplejson.html2
-rw-r--r--docs/simplejson/__init__.py.html2
-rw-r--r--docs/simplejson/scanner.py.html69
-rw-r--r--setup.py2
-rw-r--r--simplejson/__init__.py2
10 files changed, 47 insertions, 46 deletions
diff --git a/docs/class-simplejson.JSONDecoder.html b/docs/class-simplejson.JSONDecoder.html
index c5f31ff..29322d2 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.7.1</A></H1>
+ <H1 ID="doc-title"><A HREF="index.html" REL="index">simplejson 1.7.5</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=&lt;built-in method match of _sre.SRE_Pattern object at 0x13244a0>)</TT>
+ <TT><A HREF="class-simplejson.JSONDecoder.html#decode" CLASS="pudge-obj-link">decode</A>(self, s, _w=&lt;built-in method match of _sre.SRE_Pattern object at 0x1539770>)</TT>
<A HREF="simplejson/decoder.py.html?f=246&amp;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 1e42961..25bb919 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.7.1</A></H1>
+ <H1 ID="doc-title"><A HREF="index.html" REL="index">simplejson 1.7.5</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 c142f3f..b65dcec 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.7.1</A></H1>
+ <H1 ID="doc-title"><A HREF="index.html" REL="index">simplejson 1.7.5</A></H1>
<DIV CLASS="online-navigation">
<A HREF="index.html" REL="index">index</A>
<SPAN ID="nav-docs">
diff --git a/docs/module-index.html b/docs/module-index.html
index 5e92fca..f3c9d32 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.7.1 -- Module Reference</TITLE>
+ <TITLE>simplejson 1.7.5 -- 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.7.1</A></H1>
+ <H1 ID="doc-title"><A HREF="index.html" REL="index">simplejson 1.7.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.7.1
+ simplejson 1.7.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 935e026..1e70d99 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.7.1</A></H1>
+ <H1 ID="doc-title"><A HREF="index.html" REL="index">simplejson 1.7.5</A></H1>
<DIV CLASS="online-navigation">
<A HREF="index.html" REL="index">index</A>
<SPAN ID="nav-docs">
diff --git a/docs/module-simplejson.html b/docs/module-simplejson.html
index c142f3f..b65dcec 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.7.1</A></H1>
+ <H1 ID="doc-title"><A HREF="index.html" REL="index">simplejson 1.7.5</A></H1>
<DIV CLASS="online-navigation">
<A HREF="index.html" REL="index">index</A>
<SPAN ID="nav-docs">
diff --git a/docs/simplejson/__init__.py.html b/docs/simplejson/__init__.py.html
index fb67bda..f4767ef 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&#0160;that&#0160;the&#0160;JSON&#0160;produced&#0160;by&#0160;this&#0160;module's&#0160;default&#0160;settings</span><br />
<a class="lnum" href="#87" name="87">0087</a><span class="string">is&#0160;a&#0160;subset&#0160;of&#0160;YAML,&#0160;so&#0160;it&#0160;may&#0160;be&#0160;used&#0160;as&#0160;a&#0160;serializer&#0160;for&#0160;that&#0160;as&#0160;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>&#0160;<span class="op">=</span>&#0160;<span class="string">'1.7.1'</span><br />
+<a class="lnum" href="#89" name="89">0089</a><span class="name">__version__</span>&#0160;<span class="op">=</span>&#0160;<span class="string">'1.7.5'</span><br />
<a class="lnum" href="#90" name="90">0090</a><span class="name">__all__</span>&#0160;<span class="op">=</span>&#0160;<span class="op">[</span><br />
<a class="lnum" href="#91" name="91">0091</a>&#0160;&#0160;&#0160;&#0160;<span class="string">'dump'</span><span class="op">,</span>&#0160;<span class="string">'dumps'</span><span class="op">,</span>&#0160;<span class="string">'load'</span><span class="op">,</span>&#0160;<span class="string">'loads'</span><span class="op">,</span><br />
<a class="lnum" href="#92" name="92">0092</a>&#0160;&#0160;&#0160;&#0160;<span class="string">'JSONDecoder'</span><span class="op">,</span>&#0160;<span class="string">'JSONEncoder'</span><span class="op">,</span><br />
diff --git a/docs/simplejson/scanner.py.html b/docs/simplejson/scanner.py.html
index 031da08..c29fe65 100644
--- a/docs/simplejson/scanner.py.html
+++ b/docs/simplejson/scanner.py.html
@@ -98,38 +98,39 @@ function show_line_range() {
<a class="lnum" href="#26" name="26">0026</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="name">p</span><span class="op">.</span><span class="name">append</span><span class="op">(</span><span class="name">subpattern</span><span class="op">)</span><br />
<a class="lnum" href="#27" name="27">0027</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="name">self</span><span class="op">.</span><span class="name">actions</span><span class="op">.</span><span class="name">append</span><span class="op">(</span><span class="name">token</span><span class="op">)</span><br />
<a class="lnum" href="#28" name="28">0028</a><br />
-<a class="lnum" href="#29" name="29">0029</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="name">p</span>&#0160;<span class="op">=</span>&#0160;<span class="name">sre_parse</span><span class="op">.</span><span class="name">SubPattern</span><span class="op">(</span><span class="name">s</span><span class="op">,</span>&#0160;<span class="op">[</span><span class="op">(</span><span class="name">BRANCH</span><span class="op">,</span>&#0160;<span class="op">(</span><span class="name">None</span><span class="op">,</span>&#0160;<span class="name">p</span><span class="op">)</span><span class="op">)</span><span class="op">]</span><span class="op">)</span><br />
-<a class="lnum" href="#30" name="30">0030</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="name">self</span><span class="op">.</span><span class="name">scanner</span>&#0160;<span class="op">=</span>&#0160;<span class="name">sre_compile</span><span class="op">.</span><span class="name">compile</span><span class="op">(</span><span class="name">p</span><span class="op">)</span><br />
-<a class="lnum" href="#31" name="31">0031</a><br />
+<a class="lnum" href="#29" name="29">0029</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="name">s</span><span class="op">.</span><span class="name">groups</span>&#0160;<span class="op">=</span>&#0160;<span class="name">len</span><span class="op">(</span><span class="name">p</span><span class="op">)</span><span class="op">+</span><span class="number">1</span>&#0160;&#0160;<span class="comment">#&#0160;NOTE(guido):&#0160;Added&#0160;to&#0160;make&#0160;SRE&#0160;validation&#0160;work</span><br />
+<a class="lnum" href="#30" name="30">0030</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="name">p</span>&#0160;<span class="op">=</span>&#0160;<span class="name">sre_parse</span><span class="op">.</span><span class="name">SubPattern</span><span class="op">(</span><span class="name">s</span><span class="op">,</span>&#0160;<span class="op">[</span><span class="op">(</span><span class="name">BRANCH</span><span class="op">,</span>&#0160;<span class="op">(</span><span class="name">None</span><span class="op">,</span>&#0160;<span class="name">p</span><span class="op">)</span><span class="op">)</span><span class="op">]</span><span class="op">)</span><br />
+<a class="lnum" href="#31" name="31">0031</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="name">self</span><span class="op">.</span><span class="name">scanner</span>&#0160;<span class="op">=</span>&#0160;<span class="name">sre_compile</span><span class="op">.</span><span class="name">compile</span><span class="op">(</span><span class="name">p</span><span class="op">)</span><br />
<a class="lnum" href="#32" name="32">0032</a><br />
-<a class="lnum" href="#33" name="33">0033</a>&#0160;&#0160;&#0160;&#0160;<span class="keyword">def</span>&#0160;<span class="name">iterscan</span><span class="op">(</span><span class="name">self</span><span class="op">,</span>&#0160;<span class="name">string</span><span class="op">,</span>&#0160;<span class="name">idx</span><span class="op">=</span><span class="number">0</span><span class="op">,</span>&#0160;<span class="name">context</span><span class="op">=</span><span class="name">None</span><span class="op">)</span><span class="op">:</span><br />
-<a class="lnum" href="#34" name="34">0034</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="string">"""</span><br />
-<a class="lnum" href="#35" name="35">0035</a><span class="string">&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;Yield&#0160;match,&#0160;end_idx&#0160;for&#0160;each&#0160;match</span><br />
-<a class="lnum" href="#36" name="36">0036</a><span class="string">&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;"""</span><br />
-<a class="lnum" href="#37" name="37">0037</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="name">match</span>&#0160;<span class="op">=</span>&#0160;<span class="name">self</span><span class="op">.</span><span class="name">scanner</span><span class="op">.</span><span class="name">scanner</span><span class="op">(</span><span class="name">string</span><span class="op">,</span>&#0160;<span class="name">idx</span><span class="op">)</span><span class="op">.</span><span class="name">match</span><br />
-<a class="lnum" href="#38" name="38">0038</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="name">actions</span>&#0160;<span class="op">=</span>&#0160;<span class="name">self</span><span class="op">.</span><span class="name">actions</span><br />
-<a class="lnum" href="#39" name="39">0039</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="name">lastend</span>&#0160;<span class="op">=</span>&#0160;<span class="name">idx</span><br />
-<a class="lnum" href="#40" name="40">0040</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="name">end</span>&#0160;<span class="op">=</span>&#0160;<span class="name">len</span><span class="op">(</span><span class="name">string</span><span class="op">)</span><br />
-<a class="lnum" href="#41" name="41">0041</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="keyword">while</span>&#0160;<span class="name">True</span><span class="op">:</span><br />
-<a class="lnum" href="#42" name="42">0042</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="name">m</span>&#0160;<span class="op">=</span>&#0160;<span class="name">match</span><span class="op">(</span><span class="op">)</span><br />
-<a class="lnum" href="#43" name="43">0043</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="keyword">if</span>&#0160;<span class="name">m</span>&#0160;<span class="keyword">is</span>&#0160;<span class="name">None</span><span class="op">:</span><br />
-<a class="lnum" href="#44" name="44">0044</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="keyword">break</span><br />
-<a class="lnum" href="#45" name="45">0045</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="name">matchbegin</span><span class="op">,</span>&#0160;<span class="name">matchend</span>&#0160;<span class="op">=</span>&#0160;<span class="name">m</span><span class="op">.</span><span class="name">span</span><span class="op">(</span><span class="op">)</span><br />
-<a class="lnum" href="#46" name="46">0046</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="keyword">if</span>&#0160;<span class="name">lastend</span>&#0160;<span class="op">==</span>&#0160;<span class="name">matchend</span><span class="op">:</span><br />
-<a class="lnum" href="#47" name="47">0047</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="keyword">break</span><br />
-<a class="lnum" href="#48" name="48">0048</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="name">action</span>&#0160;<span class="op">=</span>&#0160;<span class="name">actions</span><span class="op">[</span><span class="name">m</span><span class="op">.</span><span class="name">lastindex</span><span class="op">]</span><br />
-<a class="lnum" href="#49" name="49">0049</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="keyword">if</span>&#0160;<span class="name">action</span>&#0160;<span class="keyword">is</span>&#0160;<span class="keyword">not</span>&#0160;<span class="name">None</span><span class="op">:</span><br />
-<a class="lnum" href="#50" name="50">0050</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="name">rval</span><span class="op">,</span>&#0160;<span class="name">next_pos</span>&#0160;<span class="op">=</span>&#0160;<span class="name">action</span><span class="op">(</span><span class="name">m</span><span class="op">,</span>&#0160;<span class="name">context</span><span class="op">)</span><br />
-<a class="lnum" href="#51" name="51">0051</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="keyword">if</span>&#0160;<span class="name">next_pos</span>&#0160;<span class="keyword">is</span>&#0160;<span class="keyword">not</span>&#0160;<span class="name">None</span>&#0160;<span class="keyword">and</span>&#0160;<span class="name">next_pos</span>&#0160;<span class="op">!=</span>&#0160;<span class="name">matchend</span><span class="op">:</span><br />
-<a class="lnum" href="#52" name="52">0052</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="comment">#&#0160;"fast&#0160;forward"&#0160;the&#0160;scanner</span><br />
-<a class="lnum" href="#53" name="53">0053</a><span class="comment"></span>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="name">matchend</span>&#0160;<span class="op">=</span>&#0160;<span class="name">next_pos</span><br />
-<a class="lnum" href="#54" name="54">0054</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="name">match</span>&#0160;<span class="op">=</span>&#0160;<span class="name">self</span><span class="op">.</span><span class="name">scanner</span><span class="op">.</span><span class="name">scanner</span><span class="op">(</span><span class="name">string</span><span class="op">,</span>&#0160;<span class="name">matchend</span><span class="op">)</span><span class="op">.</span><span class="name">match</span><br />
-<a class="lnum" href="#55" name="55">0055</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="keyword">yield</span>&#0160;<span class="name">rval</span><span class="op">,</span>&#0160;<span class="name">matchend</span><br />
-<a class="lnum" href="#56" name="56">0056</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="name">lastend</span>&#0160;<span class="op">=</span>&#0160;<span class="name">matchend</span><br />
-<a class="lnum" href="#57" name="57">0057</a><br />
-<a class="lnum" href="#58" name="58">0058</a><span class="keyword">def</span>&#0160;<span class="name">pattern</span><span class="op">(</span><span class="name">pattern</span><span class="op">,</span>&#0160;<span class="name">flags</span><span class="op">=</span><span class="name">FLAGS</span><span class="op">)</span><span class="op">:</span><br />
-<a class="lnum" href="#59" name="59">0059</a>&#0160;&#0160;&#0160;&#0160;<span class="keyword">def</span>&#0160;<span class="name">decorator</span><span class="op">(</span><span class="name">fn</span><span class="op">)</span><span class="op">:</span><br />
-<a class="lnum" href="#60" name="60">0060</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="name">fn</span><span class="op">.</span><span class="name">pattern</span>&#0160;<span class="op">=</span>&#0160;<span class="name">pattern</span><br />
-<a class="lnum" href="#61" name="61">0061</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="name">fn</span><span class="op">.</span><span class="name">regex</span>&#0160;<span class="op">=</span>&#0160;<span class="name">re</span><span class="op">.</span><span class="name">compile</span><span class="op">(</span><span class="name">pattern</span><span class="op">,</span>&#0160;<span class="name">flags</span><span class="op">)</span><br />
-<a class="lnum" href="#62" name="62">0062</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="keyword">return</span>&#0160;<span class="name">fn</span><br />
-<a class="lnum" href="#63" name="63">0063</a>&#0160;&#0160;&#0160;&#0160;<span class="keyword">return</span>&#0160;<span class="name">decorator</span></code></div></body></html> \ No newline at end of file
+<a class="lnum" href="#33" name="33">0033</a><br />
+<a class="lnum" href="#34" name="34">0034</a>&#0160;&#0160;&#0160;&#0160;<span class="keyword">def</span>&#0160;<span class="name">iterscan</span><span class="op">(</span><span class="name">self</span><span class="op">,</span>&#0160;<span class="name">string</span><span class="op">,</span>&#0160;<span class="name">idx</span><span class="op">=</span><span class="number">0</span><span class="op">,</span>&#0160;<span class="name">context</span><span class="op">=</span><span class="name">None</span><span class="op">)</span><span class="op">:</span><br />
+<a class="lnum" href="#35" name="35">0035</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="string">"""</span><br />
+<a class="lnum" href="#36" name="36">0036</a><span class="string">&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;Yield&#0160;match,&#0160;end_idx&#0160;for&#0160;each&#0160;match</span><br />
+<a class="lnum" href="#37" name="37">0037</a><span class="string">&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;"""</span><br />
+<a class="lnum" href="#38" name="38">0038</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="name">match</span>&#0160;<span class="op">=</span>&#0160;<span class="name">self</span><span class="op">.</span><span class="name">scanner</span><span class="op">.</span><span class="name">scanner</span><span class="op">(</span><span class="name">string</span><span class="op">,</span>&#0160;<span class="name">idx</span><span class="op">)</span><span class="op">.</span><span class="name">match</span><br />
+<a class="lnum" href="#39" name="39">0039</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="name">actions</span>&#0160;<span class="op">=</span>&#0160;<span class="name">self</span><span class="op">.</span><span class="name">actions</span><br />
+<a class="lnum" href="#40" name="40">0040</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="name">lastend</span>&#0160;<span class="op">=</span>&#0160;<span class="name">idx</span><br />
+<a class="lnum" href="#41" name="41">0041</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="name">end</span>&#0160;<span class="op">=</span>&#0160;<span class="name">len</span><span class="op">(</span><span class="name">string</span><span class="op">)</span><br />
+<a class="lnum" href="#42" name="42">0042</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="keyword">while</span>&#0160;<span class="name">True</span><span class="op">:</span><br />
+<a class="lnum" href="#43" name="43">0043</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="name">m</span>&#0160;<span class="op">=</span>&#0160;<span class="name">match</span><span class="op">(</span><span class="op">)</span><br />
+<a class="lnum" href="#44" name="44">0044</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="keyword">if</span>&#0160;<span class="name">m</span>&#0160;<span class="keyword">is</span>&#0160;<span class="name">None</span><span class="op">:</span><br />
+<a class="lnum" href="#45" name="45">0045</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="keyword">break</span><br />
+<a class="lnum" href="#46" name="46">0046</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="name">matchbegin</span><span class="op">,</span>&#0160;<span class="name">matchend</span>&#0160;<span class="op">=</span>&#0160;<span class="name">m</span><span class="op">.</span><span class="name">span</span><span class="op">(</span><span class="op">)</span><br />
+<a class="lnum" href="#47" name="47">0047</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="keyword">if</span>&#0160;<span class="name">lastend</span>&#0160;<span class="op">==</span>&#0160;<span class="name">matchend</span><span class="op">:</span><br />
+<a class="lnum" href="#48" name="48">0048</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="keyword">break</span><br />
+<a class="lnum" href="#49" name="49">0049</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="name">action</span>&#0160;<span class="op">=</span>&#0160;<span class="name">actions</span><span class="op">[</span><span class="name">m</span><span class="op">.</span><span class="name">lastindex</span><span class="op">]</span><br />
+<a class="lnum" href="#50" name="50">0050</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="keyword">if</span>&#0160;<span class="name">action</span>&#0160;<span class="keyword">is</span>&#0160;<span class="keyword">not</span>&#0160;<span class="name">None</span><span class="op">:</span><br />
+<a class="lnum" href="#51" name="51">0051</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="name">rval</span><span class="op">,</span>&#0160;<span class="name">next_pos</span>&#0160;<span class="op">=</span>&#0160;<span class="name">action</span><span class="op">(</span><span class="name">m</span><span class="op">,</span>&#0160;<span class="name">context</span><span class="op">)</span><br />
+<a class="lnum" href="#52" name="52">0052</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="keyword">if</span>&#0160;<span class="name">next_pos</span>&#0160;<span class="keyword">is</span>&#0160;<span class="keyword">not</span>&#0160;<span class="name">None</span>&#0160;<span class="keyword">and</span>&#0160;<span class="name">next_pos</span>&#0160;<span class="op">!=</span>&#0160;<span class="name">matchend</span><span class="op">:</span><br />
+<a class="lnum" href="#53" name="53">0053</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="comment">#&#0160;"fast&#0160;forward"&#0160;the&#0160;scanner</span><br />
+<a class="lnum" href="#54" name="54">0054</a><span class="comment"></span>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="name">matchend</span>&#0160;<span class="op">=</span>&#0160;<span class="name">next_pos</span><br />
+<a class="lnum" href="#55" name="55">0055</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="name">match</span>&#0160;<span class="op">=</span>&#0160;<span class="name">self</span><span class="op">.</span><span class="name">scanner</span><span class="op">.</span><span class="name">scanner</span><span class="op">(</span><span class="name">string</span><span class="op">,</span>&#0160;<span class="name">matchend</span><span class="op">)</span><span class="op">.</span><span class="name">match</span><br />
+<a class="lnum" href="#56" name="56">0056</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="keyword">yield</span>&#0160;<span class="name">rval</span><span class="op">,</span>&#0160;<span class="name">matchend</span><br />
+<a class="lnum" href="#57" name="57">0057</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="name">lastend</span>&#0160;<span class="op">=</span>&#0160;<span class="name">matchend</span><br />
+<a class="lnum" href="#58" name="58">0058</a><br />
+<a class="lnum" href="#59" name="59">0059</a><span class="keyword">def</span>&#0160;<span class="name">pattern</span><span class="op">(</span><span class="name">pattern</span><span class="op">,</span>&#0160;<span class="name">flags</span><span class="op">=</span><span class="name">FLAGS</span><span class="op">)</span><span class="op">:</span><br />
+<a class="lnum" href="#60" name="60">0060</a>&#0160;&#0160;&#0160;&#0160;<span class="keyword">def</span>&#0160;<span class="name">decorator</span><span class="op">(</span><span class="name">fn</span><span class="op">)</span><span class="op">:</span><br />
+<a class="lnum" href="#61" name="61">0061</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="name">fn</span><span class="op">.</span><span class="name">pattern</span>&#0160;<span class="op">=</span>&#0160;<span class="name">pattern</span><br />
+<a class="lnum" href="#62" name="62">0062</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="name">fn</span><span class="op">.</span><span class="name">regex</span>&#0160;<span class="op">=</span>&#0160;<span class="name">re</span><span class="op">.</span><span class="name">compile</span><span class="op">(</span><span class="name">pattern</span><span class="op">,</span>&#0160;<span class="name">flags</span><span class="op">)</span><br />
+<a class="lnum" href="#63" name="63">0063</a>&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;&#0160;<span class="keyword">return</span>&#0160;<span class="name">fn</span><br />
+<a class="lnum" href="#64" name="64">0064</a>&#0160;&#0160;&#0160;&#0160;<span class="keyword">return</span>&#0160;<span class="name">decorator</span></code></div></body></html> \ No newline at end of file
diff --git a/setup.py b/setup.py
index a4303d9..7e8d242 100644
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,7 @@ from distutils.command.build_ext import build_ext
from distutils.errors import CCompilerError, DistutilsExecError, \
DistutilsPlatformError
-VERSION = '1.7.4'
+VERSION = '1.7.5'
DESCRIPTION = "Simple, fast, extensible JSON encoder/decoder for Python"
LONG_DESCRIPTION = """
simplejson is a simple, fast, complete, correct and extensible
diff --git a/simplejson/__init__.py b/simplejson/__init__.py
index 9b87225..615b2f3 100644
--- a/simplejson/__init__.py
+++ b/simplejson/__init__.py
@@ -86,7 +86,7 @@ Extending JSONEncoder::
Note that the JSON produced by this module's default settings
is a subset of YAML, so it may be used as a serializer for that as well.
"""
-__version__ = '1.7.4'
+__version__ = '1.7.5'
__all__ = [
'dump', 'dumps', 'load', 'loads',
'JSONDecoder', 'JSONEncoder',