Mercurial > hg
changeset 8490:ea1981f65b3a
merge with crew
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Sun, 17 May 2009 23:07:23 +0200 |
| parents | 1a96f1d9599b (current diff) 338412820a57 (diff) |
| children | bd45047afaeb |
| files | |
| diffstat | 7 files changed, 225 insertions(+), 131 deletions(-) [+] |
line wrap: on
line diff
--- a/templates/coal/map Sun May 17 22:51:17 2009 +0200 +++ b/templates/coal/map Sun May 17 23:07:23 2009 +0200 @@ -52,7 +52,8 @@ fileannotate = ../paper/fileannotate.tmpl filediff = ../paper/filediff.tmpl filelog = ../paper/filelog.tmpl -fileline = '<div class="parity{parity} source"><a href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</div>' +fileline = ' + <div class="parity{parity} source"><a href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</div>' filelogentry = ../paper/filelogentry.tmpl annotateline = '
--- a/templates/gitweb/map Sun May 17 22:51:17 2009 +0200 +++ b/templates/gitweb/map Sun May 17 23:07:23 2009 +0200 @@ -70,7 +70,12 @@ fileannotate = fileannotate.tmpl filediff = filediff.tmpl filelog = filelog.tmpl -fileline = '<div style="font-family:monospace" class="parity{parity}"><pre><a class="linenr" href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</pre></div>' +fileline = ' + <div style="font-family:monospace" class="parity{parity}"> + <pre> + <a class="linenr" href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape} + </pre> + </div>' annotateline = ' <tr style="font-family:monospace" class="parity{parity}"> <td class="linenr" style="text-align: right;">
--- a/templates/monoblue/map Sun May 17 22:51:17 2009 +0200 +++ b/templates/monoblue/map Sun May 17 23:07:23 2009 +0200 @@ -61,7 +61,12 @@ fileannotate = fileannotate.tmpl filediff = filediff.tmpl filelog = filelog.tmpl -fileline = '<div style="font-family:monospace" class="parity{parity}"><pre><a class="linenr" href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</pre></div>' +fileline = ' + <div style="font-family:monospace" class="parity{parity}"> + <pre> + <a class="linenr" href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape} + </pre> + </div>' annotateline = ' <tr class="parity{parity}"> <td class="linenr">
--- a/templates/paper/map Sun May 17 22:51:17 2009 +0200 +++ b/templates/paper/map Sun May 17 23:07:23 2009 +0200 @@ -52,7 +52,8 @@ fileannotate = fileannotate.tmpl filediff = filediff.tmpl filelog = filelog.tmpl -fileline = '<div class="parity{parity} source"><a href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</div>' +fileline = ' + <div class="parity{parity} source"><a href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</div>' filelogentry = filelogentry.tmpl annotateline = '
--- a/tests/test-hgweb-commands.out Sun May 17 22:51:17 2009 +0200 +++ b/tests/test-hgweb-commands.out Sun May 17 23:07:23 2009 +0200 @@ -435,6 +435,7 @@ <div class="overflow"> <div class="sourcefirst"> line source</div> + <div class="parity0 source"><a href="#l1" id="l1"> 1</a> foo </div> <div class="sourcelast"></div>
--- a/tests/test-highlight Sun May 17 22:51:17 2009 +0200 +++ b/tests/test-highlight Sun May 17 23:07:23 2009 +0200 @@ -11,7 +11,41 @@ hg init test cd test -cp $TESTDIR/get-with-headers.py ./ +# create random Python file to exercise Pygments +cat <<EOF > primes.py +#!/usr/bin/env python + +"""Fun with generators. Corresponding Haskell implementation: + +primes = 2 : sieve [3, 5..] + where sieve (p:ns) = p : sieve [n | n <- ns, mod n p /= 0] +""" + +from itertools import dropwhile, ifilter, islice, count, chain + +def primes(): + """Generate all primes.""" + def sieve(ns): + p = ns.next() + # It is important to yield *here* in order to stop the + # infinite recursion. + yield p + ns = ifilter(lambda n: n % p != 0, ns) + for n in sieve(ns): + yield n + + odds = ifilter(lambda i: i % 2 == 1, count()) + return chain([2], sieve(dropwhile(lambda n: n < 3, odds))) + +if __name__ == "__main__": + import sys + try: + n = int(sys.argv[1]) + except (ValueError, IndexError): + n = 10 + p = primes() + print "The first %d primes: %s" % (n, list(islice(p, n))) +EOF # check for UnicodeDecodeError with iso-8859-1 file contents python -c 'fp = open("isolatin.txt", "w"); fp.write("h\xFCbsch\n"); fp.close();' @@ -23,7 +57,7 @@ cat hg.pid >> $DAEMON_PIDS echo % hgweb filerevision, html -("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/get-with-headers.py') \ +("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/primes.py') \ | sed "s/class=\"k\"/class=\"kn\"/g" | sed "s/class=\"mf\"/class=\"mi\"/g" echo % hgweb filerevision, html @@ -31,17 +65,17 @@ | sed "s/class=\"k\"/class=\"kn\"/g" echo % hgweb fileannotate, html -("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/annotate/tip/get-with-headers.py') \ +("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/annotate/tip/primes.py') \ | sed "s/class=\"k\"/class=\"kn\"/g" | sed "s/class=\"mi\"/class=\"mf\"/g" echo % hgweb fileannotate, raw -("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/annotate/tip/get-with-headers.py?style=raw') \ +("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/annotate/tip/primes.py?style=raw') \ | sed "s/test@//" > a echo "200 Script output follows" > b echo "" >> b echo "" >> b -hg annotate "get-with-headers.py" >> b +hg annotate "primes.py" >> b echo "" >> b echo "" >> b echo "" >> b @@ -51,12 +85,12 @@ echo echo % hgweb filerevision, raw -("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/get-with-headers.py?style=raw') \ +("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/primes.py?style=raw') \ > a echo "200 Script output follows" > b echo "" >> b -hg cat get-with-headers.py >> b +hg cat primes.py >> b diff -u b a
--- a/tests/test-highlight.out Sun May 17 22:51:17 2009 +0200 +++ b/tests/test-highlight.out Sun May 17 23:07:23 2009 +0200 @@ -1,5 +1,5 @@ -adding get-with-headers.py adding isolatin.txt +adding primes.py % hg serve % hgweb filerevision, html 200 Script output follows @@ -12,7 +12,7 @@ <link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> <link rel="stylesheet" href="/highlightcss" type="text/css" /> -<title>test: 93b701795893 get-with-headers.py</title> +<title>test: 3e1445510fe7 primes.py</title> </head> <body> @@ -23,27 +23,27 @@ <img src="/static/hglogo.png" alt="mercurial" /></a> </div> <ul> -<li><a href="/shortlog/93b701795893">log</a></li> -<li><a href="/graph/93b701795893">graph</a></li> +<li><a href="/shortlog/3e1445510fe7">log</a></li> +<li><a href="/graph/3e1445510fe7">graph</a></li> <li><a href="/tags">tags</a></li> <li><a href="/branches">branches</a></li> </ul> <ul> -<li><a href="/rev/93b701795893">changeset</a></li> -<li><a href="/file/93b701795893/">browse</a></li> +<li><a href="/rev/3e1445510fe7">changeset</a></li> +<li><a href="/file/3e1445510fe7/">browse</a></li> </ul> <ul> <li class="active">file</li> -<li><a href="/diff/93b701795893/get-with-headers.py">diff</a></li> -<li><a href="/annotate/93b701795893/get-with-headers.py">annotate</a></li> -<li><a href="/log/93b701795893/get-with-headers.py">file log</a></li> -<li><a href="/raw-file/93b701795893/get-with-headers.py">raw</a></li> +<li><a href="/diff/3e1445510fe7/primes.py">diff</a></li> +<li><a href="/annotate/3e1445510fe7/primes.py">annotate</a></li> +<li><a href="/log/3e1445510fe7/primes.py">file log</a></li> +<li><a href="/raw-file/3e1445510fe7/primes.py">raw</a></li> </ul> </div> <div class="main"> <h2><a href="/">test</a></h2> -<h3>view get-with-headers.py @ 0:93b701795893</h3> +<h3>view primes.py @ 0:3e1445510fe7</h3> <form class="search" action="/log"> @@ -76,7 +76,39 @@ <div class="overflow"> <div class="sourcefirst"> line source</div> -<div class="parity0 source"><a href="#l1" id="l1"> 1</a> <span class="c">#!/usr/bin/env python</span></div><div class="parity1 source"><a href="#l2" id="l2"> 2</a> </div><div class="parity0 source"><a href="#l3" id="l3"> 3</a> <span class="sd">"""This does HTTP GET requests given a host:port and path and returns</span></div><div class="parity1 source"><a href="#l4" id="l4"> 4</a> <span class="sd">a subset of the headers plus the body of the result."""</span></div><div class="parity0 source"><a href="#l5" id="l5"> 5</a> </div><div class="parity1 source"><a href="#l6" id="l6"> 6</a> <span class="kn">import</span> <span class="nn">httplib</span><span class="o">,</span> <span class="nn">sys</span><span class="o">,</span> <span class="nn">re</span></div><div class="parity0 source"><a href="#l7" id="l7"> 7</a> </div><div class="parity1 source"><a href="#l8" id="l8"> 8</a> <span class="kn">try</span><span class="p">:</span></div><div class="parity0 source"><a href="#l9" id="l9"> 9</a> <span class="kn">import</span> <span class="nn">msvcrt</span><span class="o">,</span> <span class="nn">os</span></div><div class="parity1 source"><a href="#l10" id="l10"> 10</a> <span class="n">msvcrt</span><span class="o">.</span><span class="n">setmode</span><span class="p">(</span><span class="n">sys</span><span class="o">.</span><span class="n">stdout</span><span class="o">.</span><span class="n">fileno</span><span class="p">(),</span> <span class="n">os</span><span class="o">.</span><span class="n">O_BINARY</span><span class="p">)</span></div><div class="parity0 source"><a href="#l11" id="l11"> 11</a> <span class="n">msvcrt</span><span class="o">.</span><span class="n">setmode</span><span class="p">(</span><span class="n">sys</span><span class="o">.</span><span class="n">stderr</span><span class="o">.</span><span class="n">fileno</span><span class="p">(),</span> <span class="n">os</span><span class="o">.</span><span class="n">O_BINARY</span><span class="p">)</span></div><div class="parity1 source"><a href="#l12" id="l12"> 12</a> <span class="kn">except</span> <span class="ne">ImportError</span><span class="p">:</span></div><div class="parity0 source"><a href="#l13" id="l13"> 13</a> <span class="kn">pass</span></div><div class="parity1 source"><a href="#l14" id="l14"> 14</a> </div><div class="parity0 source"><a href="#l15" id="l15"> 15</a> <span class="n">headers</span> <span class="o">=</span> <span class="p">[</span><span class="n">h</span><span class="o">.</span><span class="n">lower</span><span class="p">()</span> <span class="kn">for</span> <span class="n">h</span> <span class="ow">in</span> <span class="n">sys</span><span class="o">.</span><span class="n">argv</span><span class="p">[</span><span class="mi">3</span><span class="p">:]]</span></div><div class="parity1 source"><a href="#l16" id="l16"> 16</a> <span class="n">conn</span> <span class="o">=</span> <span class="n">httplib</span><span class="o">.</span><span class="n">HTTPConnection</span><span class="p">(</span><span class="n">sys</span><span class="o">.</span><span class="n">argv</span><span class="p">[</span><span class="mi">1</span><span class="p">])</span></div><div class="parity0 source"><a href="#l17" id="l17"> 17</a> <span class="n">conn</span><span class="o">.</span><span class="n">request</span><span class="p">(</span><span class="s">"GET"</span><span class="p">,</span> <span class="n">sys</span><span class="o">.</span><span class="n">argv</span><span class="p">[</span><span class="mi">2</span><span class="p">])</span></div><div class="parity1 source"><a href="#l18" id="l18"> 18</a> <span class="n">response</span> <span class="o">=</span> <span class="n">conn</span><span class="o">.</span><span class="n">getresponse</span><span class="p">()</span></div><div class="parity0 source"><a href="#l19" id="l19"> 19</a> <span class="kn">print</span> <span class="n">response</span><span class="o">.</span><span class="n">status</span><span class="p">,</span> <span class="n">response</span><span class="o">.</span><span class="n">reason</span></div><div class="parity1 source"><a href="#l20" id="l20"> 20</a> <span class="kn">for</span> <span class="n">h</span> <span class="ow">in</span> <span class="n">headers</span><span class="p">:</span></div><div class="parity0 source"><a href="#l21" id="l21"> 21</a> <span class="kn">if</span> <span class="n">response</span><span class="o">.</span><span class="n">getheader</span><span class="p">(</span><span class="n">h</span><span class="p">,</span> <span class="bp">None</span><span class="p">)</span> <span class="ow">is</span> <span class="ow">not</span> <span class="bp">None</span><span class="p">:</span></div><div class="parity1 source"><a href="#l22" id="l22"> 22</a> <span class="kn">print</span> <span class="s">"</span><span class="si">%s</span><span class="s">: </span><span class="si">%s</span><span class="s">"</span> <span class="o">%</span> <span class="p">(</span><span class="n">h</span><span class="p">,</span> <span class="n">response</span><span class="o">.</span><span class="n">getheader</span><span class="p">(</span><span class="n">h</span><span class="p">))</span></div><div class="parity0 source"><a href="#l23" id="l23"> 23</a> <span class="kn">print</span></div><div class="parity1 source"><a href="#l24" id="l24"> 24</a> <span class="n">data</span> <span class="o">=</span> <span class="n">response</span><span class="o">.</span><span class="n">read</span><span class="p">()</span></div><div class="parity0 source"><a href="#l25" id="l25"> 25</a> <span class="n">data</span> <span class="o">=</span> <span class="n">re</span><span class="o">.</span><span class="n">sub</span><span class="p">(</span><span class="s">'\d+ years'</span><span class="p">,</span> <span class="s">'many years'</span><span class="p">,</span> <span class="n">data</span><span class="p">)</span></div><div class="parity1 source"><a href="#l26" id="l26"> 26</a> <span class="n">sys</span><span class="o">.</span><span class="n">stdout</span><span class="o">.</span><span class="n">write</span><span class="p">(</span><span class="n">data</span><span class="p">)</span></div><div class="parity0 source"><a href="#l27" id="l27"> 27</a> </div><div class="parity1 source"><a href="#l28" id="l28"> 28</a> <span class="kn">if</span> <span class="mi">200</span> <span class="o"><=</span> <span class="n">response</span><span class="o">.</span><span class="n">status</span> <span class="o"><=</span> <span class="mi">299</span><span class="p">:</span></div><div class="parity0 source"><a href="#l29" id="l29"> 29</a> <span class="n">sys</span><span class="o">.</span><span class="n">exit</span><span class="p">(</span><span class="mi">0</span><span class="p">)</span></div><div class="parity1 source"><a href="#l30" id="l30"> 30</a> <span class="n">sys</span><span class="o">.</span><span class="n">exit</span><span class="p">(</span><span class="mi">1</span><span class="p">)</span></div> + +<div class="parity0 source"><a href="#l1" id="l1"> 1</a> <span class="c">#!/usr/bin/env python</span></div> +<div class="parity1 source"><a href="#l2" id="l2"> 2</a> </div> +<div class="parity0 source"><a href="#l3" id="l3"> 3</a> <span class="sd">"""Fun with generators. Corresponding Haskell implementation:</span></div> +<div class="parity1 source"><a href="#l4" id="l4"> 4</a> </div> +<div class="parity0 source"><a href="#l5" id="l5"> 5</a> <span class="sd">primes = 2 : sieve [3, 5..]</span></div> +<div class="parity1 source"><a href="#l6" id="l6"> 6</a> <span class="sd"> where sieve (p:ns) = p : sieve [n | n <- ns, mod n p /= 0]</span></div> +<div class="parity0 source"><a href="#l7" id="l7"> 7</a> <span class="sd">"""</span></div> +<div class="parity1 source"><a href="#l8" id="l8"> 8</a> </div> +<div class="parity0 source"><a href="#l9" id="l9"> 9</a> <span class="kn">from</span> <span class="nn">itertools</span> <span class="kn">import</span> <span class="n">dropwhile</span><span class="p">,</span> <span class="n">ifilter</span><span class="p">,</span> <span class="n">islice</span><span class="p">,</span> <span class="n">count</span><span class="p">,</span> <span class="n">chain</span></div> +<div class="parity1 source"><a href="#l10" id="l10"> 10</a> </div> +<div class="parity0 source"><a href="#l11" id="l11"> 11</a> <span class="kn">def</span> <span class="nf">primes</span><span class="p">():</span></div> +<div class="parity1 source"><a href="#l12" id="l12"> 12</a> <span class="sd">"""Generate all primes."""</span></div> +<div class="parity0 source"><a href="#l13" id="l13"> 13</a> <span class="kn">def</span> <span class="nf">sieve</span><span class="p">(</span><span class="n">ns</span><span class="p">):</span></div> +<div class="parity1 source"><a href="#l14" id="l14"> 14</a> <span class="n">p</span> <span class="o">=</span> <span class="n">ns</span><span class="o">.</span><span class="n">next</span><span class="p">()</span></div> +<div class="parity0 source"><a href="#l15" id="l15"> 15</a> <span class="c"># It is important to yield *here* in order to stop the</span></div> +<div class="parity1 source"><a href="#l16" id="l16"> 16</a> <span class="c"># infinite recursion.</span></div> +<div class="parity0 source"><a href="#l17" id="l17"> 17</a> <span class="kn">yield</span> <span class="n">p</span></div> +<div class="parity1 source"><a href="#l18" id="l18"> 18</a> <span class="n">ns</span> <span class="o">=</span> <span class="n">ifilter</span><span class="p">(</span><span class="kn">lambda</span> <span class="n">n</span><span class="p">:</span> <span class="n">n</span> <span class="o">%</span> <span class="n">p</span> <span class="o">!=</span> <span class="mi">0</span><span class="p">,</span> <span class="n">ns</span><span class="p">)</span></div> +<div class="parity0 source"><a href="#l19" id="l19"> 19</a> <span class="kn">for</span> <span class="n">n</span> <span class="ow">in</span> <span class="n">sieve</span><span class="p">(</span><span class="n">ns</span><span class="p">):</span></div> +<div class="parity1 source"><a href="#l20" id="l20"> 20</a> <span class="kn">yield</span> <span class="n">n</span></div> +<div class="parity0 source"><a href="#l21" id="l21"> 21</a> </div> +<div class="parity1 source"><a href="#l22" id="l22"> 22</a> <span class="n">odds</span> <span class="o">=</span> <span class="n">ifilter</span><span class="p">(</span><span class="kn">lambda</span> <span class="n">i</span><span class="p">:</span> <span class="n">i</span> <span class="o">%</span> <span class="mi">2</span> <span class="o">==</span> <span class="mi">1</span><span class="p">,</span> <span class="n">count</span><span class="p">())</span></div> +<div class="parity0 source"><a href="#l23" id="l23"> 23</a> <span class="kn">return</span> <span class="n">chain</span><span class="p">([</span><span class="mi">2</span><span class="p">],</span> <span class="n">sieve</span><span class="p">(</span><span class="n">dropwhile</span><span class="p">(</span><span class="kn">lambda</span> <span class="n">n</span><span class="p">:</span> <span class="n">n</span> <span class="o"><</span> <span class="mi">3</span><span class="p">,</span> <span class="n">odds</span><span class="p">)))</span></div> +<div class="parity1 source"><a href="#l24" id="l24"> 24</a> </div> +<div class="parity0 source"><a href="#l25" id="l25"> 25</a> <span class="kn">if</span> <span class="n">__name__</span> <span class="o">==</span> <span class="s">"__main__"</span><span class="p">:</span></div> +<div class="parity1 source"><a href="#l26" id="l26"> 26</a> <span class="kn">import</span> <span class="nn">sys</span></div> +<div class="parity0 source"><a href="#l27" id="l27"> 27</a> <span class="kn">try</span><span class="p">:</span></div> +<div class="parity1 source"><a href="#l28" id="l28"> 28</a> <span class="n">n</span> <span class="o">=</span> <span class="nb">int</span><span class="p">(</span><span class="n">sys</span><span class="o">.</span><span class="n">argv</span><span class="p">[</span><span class="mi">1</span><span class="p">])</span></div> +<div class="parity0 source"><a href="#l29" id="l29"> 29</a> <span class="kn">except</span> <span class="p">(</span><span class="ne">ValueError</span><span class="p">,</span> <span class="ne">IndexError</span><span class="p">):</span></div> +<div class="parity1 source"><a href="#l30" id="l30"> 30</a> <span class="n">n</span> <span class="o">=</span> <span class="mi">10</span></div> +<div class="parity0 source"><a href="#l31" id="l31"> 31</a> <span class="n">p</span> <span class="o">=</span> <span class="n">primes</span><span class="p">()</span></div> +<div class="parity1 source"><a href="#l32" id="l32"> 32</a> <span class="kn">print</span> <span class="s">"The first </span><span class="si">%d</span><span class="s"> primes: </span><span class="si">%s</span><span class="s">"</span> <span class="o">%</span> <span class="p">(</span><span class="n">n</span><span class="p">,</span> <span class="nb">list</span><span class="p">(</span><span class="n">islice</span><span class="p">(</span><span class="n">p</span><span class="p">,</span> <span class="n">n</span><span class="p">)))</span></div> <div class="sourcelast"></div> </div> </div> @@ -98,7 +130,7 @@ <link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> <link rel="stylesheet" href="/highlightcss" type="text/css" /> -<title>test: 93b701795893 isolatin.txt</title> +<title>test: 3e1445510fe7 isolatin.txt</title> </head> <body> @@ -109,27 +141,27 @@ <img src="/static/hglogo.png" alt="mercurial" /></a> </div> <ul> -<li><a href="/shortlog/93b701795893">log</a></li> -<li><a href="/graph/93b701795893">graph</a></li> +<li><a href="/shortlog/3e1445510fe7">log</a></li> +<li><a href="/graph/3e1445510fe7">graph</a></li> <li><a href="/tags">tags</a></li> <li><a href="/branches">branches</a></li> </ul> <ul> -<li><a href="/rev/93b701795893">changeset</a></li> -<li><a href="/file/93b701795893/">browse</a></li> +<li><a href="/rev/3e1445510fe7">changeset</a></li> +<li><a href="/file/3e1445510fe7/">browse</a></li> </ul> <ul> <li class="active">file</li> -<li><a href="/diff/93b701795893/isolatin.txt">diff</a></li> -<li><a href="/annotate/93b701795893/isolatin.txt">annotate</a></li> -<li><a href="/log/93b701795893/isolatin.txt">file log</a></li> -<li><a href="/raw-file/93b701795893/isolatin.txt">raw</a></li> +<li><a href="/diff/3e1445510fe7/isolatin.txt">diff</a></li> +<li><a href="/annotate/3e1445510fe7/isolatin.txt">annotate</a></li> +<li><a href="/log/3e1445510fe7/isolatin.txt">file log</a></li> +<li><a href="/raw-file/3e1445510fe7/isolatin.txt">raw</a></li> </ul> </div> <div class="main"> <h2><a href="/">test</a></h2> -<h3>view isolatin.txt @ 0:93b701795893</h3> +<h3>view isolatin.txt @ 0:3e1445510fe7</h3> <form class="search" action="/log"> @@ -162,6 +194,7 @@ <div class="overflow"> <div class="sourcefirst"> line source</div> + <div class="parity0 source"><a href="#l1" id="l1"> 1</a> h?bsch</div> <div class="sourcelast"></div> </div> @@ -184,7 +217,7 @@ <link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> <link rel="stylesheet" href="/highlightcss" type="text/css" /> -<title>test: get-with-headers.py annotate</title> +<title>test: primes.py annotate</title> </head> <body> @@ -195,28 +228,28 @@ <img src="/static/hglogo.png" alt="mercurial" /></a> </div> <ul> -<li><a href="/shortlog/93b701795893">log</a></li> -<li><a href="/graph/93b701795893">graph</a></li> +<li><a href="/shortlog/3e1445510fe7">log</a></li> +<li><a href="/graph/3e1445510fe7">graph</a></li> <li><a href="/tags">tags</a></li> <li><a href="/branches">branches</a></li> </ul> <ul> -<li><a href="/rev/93b701795893">changeset</a></li> -<li><a href="/file/93b701795893/">browse</a></li> +<li><a href="/rev/3e1445510fe7">changeset</a></li> +<li><a href="/file/3e1445510fe7/">browse</a></li> </ul> <ul> -<li><a href="/file/93b701795893/get-with-headers.py">file</a></li> -<li><a href="/diff/93b701795893/get-with-headers.py">diff</a></li> +<li><a href="/file/3e1445510fe7/primes.py">file</a></li> +<li><a href="/diff/3e1445510fe7/primes.py">diff</a></li> <li class="active">annotate</li> -<li><a href="/log/93b701795893/get-with-headers.py">file log</a></li> -<li><a href="/raw-annotate/93b701795893/get-with-headers.py">raw</a></li> +<li><a href="/log/3e1445510fe7/primes.py">file log</a></li> +<li><a href="/raw-annotate/3e1445510fe7/primes.py">raw</a></li> </ul> </div> <div class="main"> <h2><a href="/">test</a></h2> -<h3>annotate get-with-headers.py @ 0:93b701795893</h3> +<h3>annotate primes.py @ 0:3e1445510fe7</h3> <form class="search" action="/log"> @@ -258,213 +291,227 @@ <tr class="parity0"> <td class="annotate"> -<a href="/annotate/93b701795893/get-with-headers.py#1" -title="93b701795893: a">test@0</a> +<a href="/annotate/3e1445510fe7/primes.py#1" +title="3e1445510fe7: a">test@0</a> </td> <td class="source"><a href="#l1" id="l1"> 1</a> <span class="c">#!/usr/bin/env python</span></td> </tr> <tr class="parity1"> <td class="annotate"> -<a href="/annotate/93b701795893/get-with-headers.py#2" -title="93b701795893: a">test@0</a> +<a href="/annotate/3e1445510fe7/primes.py#2" +title="3e1445510fe7: a">test@0</a> </td> <td class="source"><a href="#l2" id="l2"> 2</a> </td> </tr> <tr class="parity0"> <td class="annotate"> -<a href="/annotate/93b701795893/get-with-headers.py#3" -title="93b701795893: a">test@0</a> +<a href="/annotate/3e1445510fe7/primes.py#3" +title="3e1445510fe7: a">test@0</a> </td> -<td class="source"><a href="#l3" id="l3"> 3</a> <span class="sd">"""This does HTTP GET requests given a host:port and path and returns</span></td> +<td class="source"><a href="#l3" id="l3"> 3</a> <span class="sd">"""Fun with generators. Corresponding Haskell implementation:</span></td> </tr> <tr class="parity1"> <td class="annotate"> -<a href="/annotate/93b701795893/get-with-headers.py#4" -title="93b701795893: a">test@0</a> +<a href="/annotate/3e1445510fe7/primes.py#4" +title="3e1445510fe7: a">test@0</a> </td> -<td class="source"><a href="#l4" id="l4"> 4</a> <span class="sd">a subset of the headers plus the body of the result."""</span></td> +<td class="source"><a href="#l4" id="l4"> 4</a> </td> </tr> <tr class="parity0"> <td class="annotate"> -<a href="/annotate/93b701795893/get-with-headers.py#5" -title="93b701795893: a">test@0</a> +<a href="/annotate/3e1445510fe7/primes.py#5" +title="3e1445510fe7: a">test@0</a> </td> -<td class="source"><a href="#l5" id="l5"> 5</a> </td> +<td class="source"><a href="#l5" id="l5"> 5</a> <span class="sd">primes = 2 : sieve [3, 5..]</span></td> </tr> <tr class="parity1"> <td class="annotate"> -<a href="/annotate/93b701795893/get-with-headers.py#6" -title="93b701795893: a">test@0</a> +<a href="/annotate/3e1445510fe7/primes.py#6" +title="3e1445510fe7: a">test@0</a> </td> -<td class="source"><a href="#l6" id="l6"> 6</a> <span class="kn">import</span> <span class="nn">httplib</span><span class="o">,</span> <span class="nn">sys</span><span class="o">,</span> <span class="nn">re</span></td> +<td class="source"><a href="#l6" id="l6"> 6</a> <span class="sd"> where sieve (p:ns) = p : sieve [n | n <- ns, mod n p /= 0]</span></td> </tr> <tr class="parity0"> <td class="annotate"> -<a href="/annotate/93b701795893/get-with-headers.py#7" -title="93b701795893: a">test@0</a> +<a href="/annotate/3e1445510fe7/primes.py#7" +title="3e1445510fe7: a">test@0</a> </td> -<td class="source"><a href="#l7" id="l7"> 7</a> </td> +<td class="source"><a href="#l7" id="l7"> 7</a> <span class="sd">"""</span></td> </tr> <tr class="parity1"> <td class="annotate"> -<a href="/annotate/93b701795893/get-with-headers.py#8" -title="93b701795893: a">test@0</a> +<a href="/annotate/3e1445510fe7/primes.py#8" +title="3e1445510fe7: a">test@0</a> </td> -<td class="source"><a href="#l8" id="l8"> 8</a> <span class="kn">try</span><span class="p">:</span></td> +<td class="source"><a href="#l8" id="l8"> 8</a> </td> </tr> <tr class="parity0"> <td class="annotate"> -<a href="/annotate/93b701795893/get-with-headers.py#9" -title="93b701795893: a">test@0</a> +<a href="/annotate/3e1445510fe7/primes.py#9" +title="3e1445510fe7: a">test@0</a> </td> -<td class="source"><a href="#l9" id="l9"> 9</a> <span class="kn">import</span> <span class="nn">msvcrt</span><span class="o">,</span> <span class="nn">os</span></td> +<td class="source"><a href="#l9" id="l9"> 9</a> <span class="kn">from</span> <span class="nn">itertools</span> <span class="kn">import</span> <span class="n">dropwhile</span><span class="p">,</span> <span class="n">ifilter</span><span class="p">,</span> <span class="n">islice</span><span class="p">,</span> <span class="n">count</span><span class="p">,</span> <span class="n">chain</span></td> </tr> <tr class="parity1"> <td class="annotate"> -<a href="/annotate/93b701795893/get-with-headers.py#10" -title="93b701795893: a">test@0</a> +<a href="/annotate/3e1445510fe7/primes.py#10" +title="3e1445510fe7: a">test@0</a> </td> -<td class="source"><a href="#l10" id="l10"> 10</a> <span class="n">msvcrt</span><span class="o">.</span><span class="n">setmode</span><span class="p">(</span><span class="n">sys</span><span class="o">.</span><span class="n">stdout</span><span class="o">.</span><span class="n">fileno</span><span class="p">(),</span> <span class="n">os</span><span class="o">.</span><span class="n">O_BINARY</span><span class="p">)</span></td> +<td class="source"><a href="#l10" id="l10"> 10</a> </td> </tr> <tr class="parity0"> <td class="annotate"> -<a href="/annotate/93b701795893/get-with-headers.py#11" -title="93b701795893: a">test@0</a> +<a href="/annotate/3e1445510fe7/primes.py#11" +title="3e1445510fe7: a">test@0</a> </td> -<td class="source"><a href="#l11" id="l11"> 11</a> <span class="n">msvcrt</span><span class="o">.</span><span class="n">setmode</span><span class="p">(</span><span class="n">sys</span><span class="o">.</span><span class="n">stderr</span><span class="o">.</span><span class="n">fileno</span><span class="p">(),</span> <span class="n">os</span><span class="o">.</span><span class="n">O_BINARY</span><span class="p">)</span></td> +<td class="source"><a href="#l11" id="l11"> 11</a> <span class="kn">def</span> <span class="nf">primes</span><span class="p">():</span></td> </tr> <tr class="parity1"> <td class="annotate"> -<a href="/annotate/93b701795893/get-with-headers.py#12" -title="93b701795893: a">test@0</a> +<a href="/annotate/3e1445510fe7/primes.py#12" +title="3e1445510fe7: a">test@0</a> </td> -<td class="source"><a href="#l12" id="l12"> 12</a> <span class="kn">except</span> <span class="ne">ImportError</span><span class="p">:</span></td> +<td class="source"><a href="#l12" id="l12"> 12</a> <span class="sd">"""Generate all primes."""</span></td> </tr> <tr class="parity0"> <td class="annotate"> -<a href="/annotate/93b701795893/get-with-headers.py#13" -title="93b701795893: a">test@0</a> +<a href="/annotate/3e1445510fe7/primes.py#13" +title="3e1445510fe7: a">test@0</a> </td> -<td class="source"><a href="#l13" id="l13"> 13</a> <span class="kn">pass</span></td> +<td class="source"><a href="#l13" id="l13"> 13</a> <span class="kn">def</span> <span class="nf">sieve</span><span class="p">(</span><span class="n">ns</span><span class="p">):</span></td> </tr> <tr class="parity1"> <td class="annotate"> -<a href="/annotate/93b701795893/get-with-headers.py#14" -title="93b701795893: a">test@0</a> +<a href="/annotate/3e1445510fe7/primes.py#14" +title="3e1445510fe7: a">test@0</a> </td> -<td class="source"><a href="#l14" id="l14"> 14</a> </td> +<td class="source"><a href="#l14" id="l14"> 14</a> <span class="n">p</span> <span class="o">=</span> <span class="n">ns</span><span class="o">.</span><span class="n">next</span><span class="p">()</span></td> </tr> <tr class="parity0"> <td class="annotate"> -<a href="/annotate/93b701795893/get-with-headers.py#15" -title="93b701795893: a">test@0</a> +<a href="/annotate/3e1445510fe7/primes.py#15" +title="3e1445510fe7: a">test@0</a> </td> -<td class="source"><a href="#l15" id="l15"> 15</a> <span class="n">headers</span> <span class="o">=</span> <span class="p">[</span><span class="n">h</span><span class="o">.</span><span class="n">lower</span><span class="p">()</span> <span class="kn">for</span> <span class="n">h</span> <span class="ow">in</span> <span class="n">sys</span><span class="o">.</span><span class="n">argv</span><span class="p">[</span><span class="mf">3</span><span class="p">:]]</span></td> +<td class="source"><a href="#l15" id="l15"> 15</a> <span class="c"># It is important to yield *here* in order to stop the</span></td> </tr> <tr class="parity1"> <td class="annotate"> -<a href="/annotate/93b701795893/get-with-headers.py#16" -title="93b701795893: a">test@0</a> +<a href="/annotate/3e1445510fe7/primes.py#16" +title="3e1445510fe7: a">test@0</a> </td> -<td class="source"><a href="#l16" id="l16"> 16</a> <span class="n">conn</span> <span class="o">=</span> <span class="n">httplib</span><span class="o">.</span><span class="n">HTTPConnection</span><span class="p">(</span><span class="n">sys</span><span class="o">.</span><span class="n">argv</span><span class="p">[</span><span class="mf">1</span><span class="p">])</span></td> +<td class="source"><a href="#l16" id="l16"> 16</a> <span class="c"># infinite recursion.</span></td> </tr> <tr class="parity0"> <td class="annotate"> -<a href="/annotate/93b701795893/get-with-headers.py#17" -title="93b701795893: a">test@0</a> +<a href="/annotate/3e1445510fe7/primes.py#17" +title="3e1445510fe7: a">test@0</a> </td> -<td class="source"><a href="#l17" id="l17"> 17</a> <span class="n">conn</span><span class="o">.</span><span class="n">request</span><span class="p">(</span><span class="s">"GET"</span><span class="p">,</span> <span class="n">sys</span><span class="o">.</span><span class="n">argv</span><span class="p">[</span><span class="mf">2</span><span class="p">])</span></td> +<td class="source"><a href="#l17" id="l17"> 17</a> <span class="kn">yield</span> <span class="n">p</span></td> </tr> <tr class="parity1"> <td class="annotate"> -<a href="/annotate/93b701795893/get-with-headers.py#18" -title="93b701795893: a">test@0</a> +<a href="/annotate/3e1445510fe7/primes.py#18" +title="3e1445510fe7: a">test@0</a> </td> -<td class="source"><a href="#l18" id="l18"> 18</a> <span class="n">response</span> <span class="o">=</span> <span class="n">conn</span><span class="o">.</span><span class="n">getresponse</span><span class="p">()</span></td> +<td class="source"><a href="#l18" id="l18"> 18</a> <span class="n">ns</span> <span class="o">=</span> <span class="n">ifilter</span><span class="p">(</span><span class="kn">lambda</span> <span class="n">n</span><span class="p">:</span> <span class="n">n</span> <span class="o">%</span> <span class="n">p</span> <span class="o">!=</span> <span class="mf">0</span><span class="p">,</span> <span class="n">ns</span><span class="p">)</span></td> </tr> <tr class="parity0"> <td class="annotate"> -<a href="/annotate/93b701795893/get-with-headers.py#19" -title="93b701795893: a">test@0</a> +<a href="/annotate/3e1445510fe7/primes.py#19" +title="3e1445510fe7: a">test@0</a> </td> -<td class="source"><a href="#l19" id="l19"> 19</a> <span class="kn">print</span> <span class="n">response</span><span class="o">.</span><span class="n">status</span><span class="p">,</span> <span class="n">response</span><span class="o">.</span><span class="n">reason</span></td> +<td class="source"><a href="#l19" id="l19"> 19</a> <span class="kn">for</span> <span class="n">n</span> <span class="ow">in</span> <span class="n">sieve</span><span class="p">(</span><span class="n">ns</span><span class="p">):</span></td> </tr> <tr class="parity1"> <td class="annotate"> -<a href="/annotate/93b701795893/get-with-headers.py#20" -title="93b701795893: a">test@0</a> +<a href="/annotate/3e1445510fe7/primes.py#20" +title="3e1445510fe7: a">test@0</a> </td> -<td class="source"><a href="#l20" id="l20"> 20</a> <span class="kn">for</span> <span class="n">h</span> <span class="ow">in</span> <span class="n">headers</span><span class="p">:</span></td> +<td class="source"><a href="#l20" id="l20"> 20</a> <span class="kn">yield</span> <span class="n">n</span></td> </tr> <tr class="parity0"> <td class="annotate"> -<a href="/annotate/93b701795893/get-with-headers.py#21" -title="93b701795893: a">test@0</a> +<a href="/annotate/3e1445510fe7/primes.py#21" +title="3e1445510fe7: a">test@0</a> </td> -<td class="source"><a href="#l21" id="l21"> 21</a> <span class="kn">if</span> <span class="n">response</span><span class="o">.</span><span class="n">getheader</span><span class="p">(</span><span class="n">h</span><span class="p">,</span> <span class="bp">None</span><span class="p">)</span> <span class="ow">is</span> <span class="ow">not</span> <span class="bp">None</span><span class="p">:</span></td> +<td class="source"><a href="#l21" id="l21"> 21</a> </td> </tr> <tr class="parity1"> <td class="annotate"> -<a href="/annotate/93b701795893/get-with-headers.py#22" -title="93b701795893: a">test@0</a> +<a href="/annotate/3e1445510fe7/primes.py#22" +title="3e1445510fe7: a">test@0</a> </td> -<td class="source"><a href="#l22" id="l22"> 22</a> <span class="kn">print</span> <span class="s">"</span><span class="si">%s</span><span class="s">: </span><span class="si">%s</span><span class="s">"</span> <span class="o">%</span> <span class="p">(</span><span class="n">h</span><span class="p">,</span> <span class="n">response</span><span class="o">.</span><span class="n">getheader</span><span class="p">(</span><span class="n">h</span><span class="p">))</span></td> +<td class="source"><a href="#l22" id="l22"> 22</a> <span class="n">odds</span> <span class="o">=</span> <span class="n">ifilter</span><span class="p">(</span><span class="kn">lambda</span> <span class="n">i</span><span class="p">:</span> <span class="n">i</span> <span class="o">%</span> <span class="mf">2</span> <span class="o">==</span> <span class="mf">1</span><span class="p">,</span> <span class="n">count</span><span class="p">())</span></td> </tr> <tr class="parity0"> <td class="annotate"> -<a href="/annotate/93b701795893/get-with-headers.py#23" -title="93b701795893: a">test@0</a> +<a href="/annotate/3e1445510fe7/primes.py#23" +title="3e1445510fe7: a">test@0</a> </td> -<td class="source"><a href="#l23" id="l23"> 23</a> <span class="kn">print</span></td> +<td class="source"><a href="#l23" id="l23"> 23</a> <span class="kn">return</span> <span class="n">chain</span><span class="p">([</span><span class="mf">2</span><span class="p">],</span> <span class="n">sieve</span><span class="p">(</span><span class="n">dropwhile</span><span class="p">(</span><span class="kn">lambda</span> <span class="n">n</span><span class="p">:</span> <span class="n">n</span> <span class="o"><</span> <span class="mf">3</span><span class="p">,</span> <span class="n">odds</span><span class="p">)))</span></td> </tr> <tr class="parity1"> <td class="annotate"> -<a href="/annotate/93b701795893/get-with-headers.py#24" -title="93b701795893: a">test@0</a> +<a href="/annotate/3e1445510fe7/primes.py#24" +title="3e1445510fe7: a">test@0</a> </td> -<td class="source"><a href="#l24" id="l24"> 24</a> <span class="n">data</span> <span class="o">=</span> <span class="n">response</span><span class="o">.</span><span class="n">read</span><span class="p">()</span></td> +<td class="source"><a href="#l24" id="l24"> 24</a> </td> </tr> <tr class="parity0"> <td class="annotate"> -<a href="/annotate/93b701795893/get-with-headers.py#25" -title="93b701795893: a">test@0</a> +<a href="/annotate/3e1445510fe7/primes.py#25" +title="3e1445510fe7: a">test@0</a> </td> -<td class="source"><a href="#l25" id="l25"> 25</a> <span class="n">data</span> <span class="o">=</span> <span class="n">re</span><span class="o">.</span><span class="n">sub</span><span class="p">(</span><span class="s">'\d+ years'</span><span class="p">,</span> <span class="s">'many years'</span><span class="p">,</span> <span class="n">data</span><span class="p">)</span></td> +<td class="source"><a href="#l25" id="l25"> 25</a> <span class="kn">if</span> <span class="n">__name__</span> <span class="o">==</span> <span class="s">"__main__"</span><span class="p">:</span></td> </tr> <tr class="parity1"> <td class="annotate"> -<a href="/annotate/93b701795893/get-with-headers.py#26" -title="93b701795893: a">test@0</a> +<a href="/annotate/3e1445510fe7/primes.py#26" +title="3e1445510fe7: a">test@0</a> </td> -<td class="source"><a href="#l26" id="l26"> 26</a> <span class="n">sys</span><span class="o">.</span><span class="n">stdout</span><span class="o">.</span><span class="n">write</span><span class="p">(</span><span class="n">data</span><span class="p">)</span></td> +<td class="source"><a href="#l26" id="l26"> 26</a> <span class="kn">import</span> <span class="nn">sys</span></td> </tr> <tr class="parity0"> <td class="annotate"> -<a href="/annotate/93b701795893/get-with-headers.py#27" -title="93b701795893: a">test@0</a> +<a href="/annotate/3e1445510fe7/primes.py#27" +title="3e1445510fe7: a">test@0</a> </td> -<td class="source"><a href="#l27" id="l27"> 27</a> </td> +<td class="source"><a href="#l27" id="l27"> 27</a> <span class="kn">try</span><span class="p">:</span></td> </tr> <tr class="parity1"> <td class="annotate"> -<a href="/annotate/93b701795893/get-with-headers.py#28" -title="93b701795893: a">test@0</a> +<a href="/annotate/3e1445510fe7/primes.py#28" +title="3e1445510fe7: a">test@0</a> </td> -<td class="source"><a href="#l28" id="l28"> 28</a> <span class="kn">if</span> <span class="mf">200</span> <span class="o"><=</span> <span class="n">response</span><span class="o">.</span><span class="n">status</span> <span class="o"><=</span> <span class="mf">299</span><span class="p">:</span></td> +<td class="source"><a href="#l28" id="l28"> 28</a> <span class="n">n</span> <span class="o">=</span> <span class="nb">int</span><span class="p">(</span><span class="n">sys</span><span class="o">.</span><span class="n">argv</span><span class="p">[</span><span class="mf">1</span><span class="p">])</span></td> </tr> <tr class="parity0"> <td class="annotate"> -<a href="/annotate/93b701795893/get-with-headers.py#29" -title="93b701795893: a">test@0</a> +<a href="/annotate/3e1445510fe7/primes.py#29" +title="3e1445510fe7: a">test@0</a> </td> -<td class="source"><a href="#l29" id="l29"> 29</a> <span class="n">sys</span><span class="o">.</span><span class="n">exit</span><span class="p">(</span><span class="mf">0</span><span class="p">)</span></td> +<td class="source"><a href="#l29" id="l29"> 29</a> <span class="kn">except</span> <span class="p">(</span><span class="ne">ValueError</span><span class="p">,</span> <span class="ne">IndexError</span><span class="p">):</span></td> </tr> <tr class="parity1"> <td class="annotate"> -<a href="/annotate/93b701795893/get-with-headers.py#30" -title="93b701795893: a">test@0</a> +<a href="/annotate/3e1445510fe7/primes.py#30" +title="3e1445510fe7: a">test@0</a> </td> -<td class="source"><a href="#l30" id="l30"> 30</a> <span class="n">sys</span><span class="o">.</span><span class="n">exit</span><span class="p">(</span><span class="mf">1</span><span class="p">)</span></td> +<td class="source"><a href="#l30" id="l30"> 30</a> <span class="n">n</span> <span class="o">=</span> <span class="mf">10</span></td> +</tr> +<tr class="parity0"> +<td class="annotate"> +<a href="/annotate/3e1445510fe7/primes.py#31" +title="3e1445510fe7: a">test@0</a> +</td> +<td class="source"><a href="#l31" id="l31"> 31</a> <span class="n">p</span> <span class="o">=</span> <span class="n">primes</span><span class="p">()</span></td> +</tr> +<tr class="parity1"> +<td class="annotate"> +<a href="/annotate/3e1445510fe7/primes.py#32" +title="3e1445510fe7: a">test@0</a> +</td> +<td class="source"><a href="#l32" id="l32"> 32</a> <span class="kn">print</span> <span class="s">"The first </span><span class="si">%d</span><span class="s"> primes: </span><span class="si">%s</span><span class="s">"</span> <span class="o">%</span> <span class="p">(</span><span class="n">n</span><span class="p">,</span> <span class="nb">list</span><span class="p">(</span><span class="n">islice</span><span class="p">(</span><span class="n">p</span><span class="p">,</span> <span class="n">n</span><span class="p">)))</span></td> </tr> </table> </div>