##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

highlight: produce correct markup when there's a blank line just before EOF...
av6 -
r25867:a74e9806 stable
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -51,12 +51,9 b' def pygmentize(field, fctx, style, tmpl)'
51 51 except (ClassNotFound, ValueError):
52 52 lexer = TextLexer(stripnl=False)
53 53
54 formatter = HtmlFormatter(style=style)
54 formatter = HtmlFormatter(nowrap=True, style=style)
55 55
56 56 colorized = highlight(text, lexer, formatter)
57 # strip wrapping div
58 colorized = colorized[:colorized.find('\n</pre>')]
59 colorized = colorized[colorized.find('<pre>') + 5:]
60 57 coloriter = (s.encode(encoding.encoding, 'replace')
61 58 for s in colorized.splitlines())
62 59
Show file before | Show file after | Hide comments
@@ -45,6 +45,7 b' create random Python file to exercise Py'
45 45 > p = primes()
46 46 > print "The first %d primes: %s" % (n, list(islice(p, n)))
47 47 > EOF
48 $ echo >> primes.py # to test html markup with an empty line just before EOF
48 49 $ hg ci -Ama
49 50 adding primes.py
50 51
@@ -68,7 +69,7 b' hgweb filerevision, html'
68 69 <script type="text/javascript" src="/static/mercurial.js"></script>
69 70
70 71 <link rel="stylesheet" href="/highlightcss" type="text/css" />
71 <title>test: 853dcd4de2a6 primes.py</title>
72 <title>test: 06824edf55d0 primes.py</title>
72 73 </head>
73 74 <body>
74 75
@@ -106,7 +107,7 b' hgweb filerevision, html'
106 107 <div class="main">
107 108 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
108 109 <h3>
109 view primes.py @ 0:<a href="/rev/853dcd4de2a6">853dcd4de2a6</a>
110 view primes.py @ 0:<a href="/rev/06824edf55d0">06824edf55d0</a>
110 111 <span class="tag">tip</span>
111 112 </h3>
112 113
@@ -173,7 +174,8 b' hgweb filerevision, html'
173 174 <span id="l29"> <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></span><a href="#l29"></a>
174 175 <span id="l30"> <span class="n">n</span> <span class="o">=</span> <span class="mi">10</span></span><a href="#l30"></a>
175 176 <span id="l31"> <span class="n">p</span> <span class="o">=</span> <span class="n">primes</span><span class="p">()</span></span><a href="#l31"></a>
176 <span id="l32"> <span class="kn">print</span> <span class="s">&quot;The first </span><span class="si">%d</span><span class="s"> primes: </span><span class="si">%s</span><span class="s">&quot;</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></span><a href="#l32"></a></pre>
177 <span id="l32"> <span class="kn">print</span> <span class="s">&quot;The first </span><span class="si">%d</span><span class="s"> primes: </span><span class="si">%s</span><span class="s">&quot;</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></span><a href="#l32"></a>
178 <span id="l33"></span><a href="#l33"></a></pre>
177 179 <div class="sourcelast"></div>
178 180 </div>
179 181 </div>
@@ -240,7 +242,7 b' hgweb fileannotate, html'
240 242 <div class="main">
241 243 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
242 244 <h3>
243 annotate primes.py @ 0:<a href="/rev/853dcd4de2a6">853dcd4de2a6</a>
245 annotate primes.py @ 0:<a href="/rev/06824edf55d0">06824edf55d0</a>
244 246 <span class="tag">tip</span>
245 247 </h3>
246 248
@@ -284,228 +286,235 b' hgweb fileannotate, html'
284 286
285 287 <tr id="l1">
286 288 <td class="annotate">
287 <a href="/annotate/853dcd4de2a6/primes.py#l1"
288 title="853dcd4de2a6: a">test@0</a>
289 <a href="/annotate/06824edf55d0/primes.py#l1"
290 title="06824edf55d0: a">test@0</a>
289 291 </td>
290 292 <td class="source"><a href="#l1"> 1</a> <span class="c">#!/usr/bin/env python</span></td>
291 293 </tr>
292 294 <tr id="l2">
293 295 <td class="annotate">
294 <a href="/annotate/853dcd4de2a6/primes.py#l2"
295 title="853dcd4de2a6: a">test@0</a>
296 <a href="/annotate/06824edf55d0/primes.py#l2"
297 title="06824edf55d0: a">test@0</a>
296 298 </td>
297 299 <td class="source"><a href="#l2"> 2</a> </td>
298 300 </tr>
299 301 <tr id="l3">
300 302 <td class="annotate">
301 <a href="/annotate/853dcd4de2a6/primes.py#l3"
302 title="853dcd4de2a6: a">test@0</a>
303 <a href="/annotate/06824edf55d0/primes.py#l3"
304 title="06824edf55d0: a">test@0</a>
303 305 </td>
304 306 <td class="source"><a href="#l3"> 3</a> <span class="sd">&quot;&quot;&quot;Fun with generators. Corresponding Haskell implementation:</span></td>
305 307 </tr>
306 308 <tr id="l4">
307 309 <td class="annotate">
308 <a href="/annotate/853dcd4de2a6/primes.py#l4"
309 title="853dcd4de2a6: a">test@0</a>
310 <a href="/annotate/06824edf55d0/primes.py#l4"
311 title="06824edf55d0: a">test@0</a>
310 312 </td>
311 313 <td class="source"><a href="#l4"> 4</a> </td>
312 314 </tr>
313 315 <tr id="l5">
314 316 <td class="annotate">
315 <a href="/annotate/853dcd4de2a6/primes.py#l5"
316 title="853dcd4de2a6: a">test@0</a>
317 <a href="/annotate/06824edf55d0/primes.py#l5"
318 title="06824edf55d0: a">test@0</a>
317 319 </td>
318 320 <td class="source"><a href="#l5"> 5</a> <span class="sd">primes = 2 : sieve [3, 5..]</span></td>
319 321 </tr>
320 322 <tr id="l6">
321 323 <td class="annotate">
322 <a href="/annotate/853dcd4de2a6/primes.py#l6"
323 title="853dcd4de2a6: a">test@0</a>
324 <a href="/annotate/06824edf55d0/primes.py#l6"
325 title="06824edf55d0: a">test@0</a>
324 326 </td>
325 327 <td class="source"><a href="#l6"> 6</a> <span class="sd"> where sieve (p:ns) = p : sieve [n | n &lt;- ns, mod n p /= 0]</span></td>
326 328 </tr>
327 329 <tr id="l7">
328 330 <td class="annotate">
329 <a href="/annotate/853dcd4de2a6/primes.py#l7"
330 title="853dcd4de2a6: a">test@0</a>
331 <a href="/annotate/06824edf55d0/primes.py#l7"
332 title="06824edf55d0: a">test@0</a>
331 333 </td>
332 334 <td class="source"><a href="#l7"> 7</a> <span class="sd">&quot;&quot;&quot;</span></td>
333 335 </tr>
334 336 <tr id="l8">
335 337 <td class="annotate">
336 <a href="/annotate/853dcd4de2a6/primes.py#l8"
337 title="853dcd4de2a6: a">test@0</a>
338 <a href="/annotate/06824edf55d0/primes.py#l8"
339 title="06824edf55d0: a">test@0</a>
338 340 </td>
339 341 <td class="source"><a href="#l8"> 8</a> </td>
340 342 </tr>
341 343 <tr id="l9">
342 344 <td class="annotate">
343 <a href="/annotate/853dcd4de2a6/primes.py#l9"
344 title="853dcd4de2a6: a">test@0</a>
345 <a href="/annotate/06824edf55d0/primes.py#l9"
346 title="06824edf55d0: a">test@0</a>
345 347 </td>
346 348 <td class="source"><a href="#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>
347 349 </tr>
348 350 <tr id="l10">
349 351 <td class="annotate">
350 <a href="/annotate/853dcd4de2a6/primes.py#l10"
351 title="853dcd4de2a6: a">test@0</a>
352 <a href="/annotate/06824edf55d0/primes.py#l10"
353 title="06824edf55d0: a">test@0</a>
352 354 </td>
353 355 <td class="source"><a href="#l10"> 10</a> </td>
354 356 </tr>
355 357 <tr id="l11">
356 358 <td class="annotate">
357 <a href="/annotate/853dcd4de2a6/primes.py#l11"
358 title="853dcd4de2a6: a">test@0</a>
359 <a href="/annotate/06824edf55d0/primes.py#l11"
360 title="06824edf55d0: a">test@0</a>
359 361 </td>
360 362 <td class="source"><a href="#l11"> 11</a> <span class="kn">def</span> <span class="nf">primes</span><span class="p">():</span></td>
361 363 </tr>
362 364 <tr id="l12">
363 365 <td class="annotate">
364 <a href="/annotate/853dcd4de2a6/primes.py#l12"
365 title="853dcd4de2a6: a">test@0</a>
366 <a href="/annotate/06824edf55d0/primes.py#l12"
367 title="06824edf55d0: a">test@0</a>
366 368 </td>
367 369 <td class="source"><a href="#l12"> 12</a> <span class="sd">&quot;&quot;&quot;Generate all primes.&quot;&quot;&quot;</span></td>
368 370 </tr>
369 371 <tr id="l13">
370 372 <td class="annotate">
371 <a href="/annotate/853dcd4de2a6/primes.py#l13"
372 title="853dcd4de2a6: a">test@0</a>
373 <a href="/annotate/06824edf55d0/primes.py#l13"
374 title="06824edf55d0: a">test@0</a>
373 375 </td>
374 376 <td class="source"><a href="#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>
375 377 </tr>
376 378 <tr id="l14">
377 379 <td class="annotate">
378 <a href="/annotate/853dcd4de2a6/primes.py#l14"
379 title="853dcd4de2a6: a">test@0</a>
380 <a href="/annotate/06824edf55d0/primes.py#l14"
381 title="06824edf55d0: a">test@0</a>
380 382 </td>
381 383 <td class="source"><a href="#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>
382 384 </tr>
383 385 <tr id="l15">
384 386 <td class="annotate">
385 <a href="/annotate/853dcd4de2a6/primes.py#l15"
386 title="853dcd4de2a6: a">test@0</a>
387 <a href="/annotate/06824edf55d0/primes.py#l15"
388 title="06824edf55d0: a">test@0</a>
387 389 </td>
388 390 <td class="source"><a href="#l15"> 15</a> <span class="c"># It is important to yield *here* in order to stop the</span></td>
389 391 </tr>
390 392 <tr id="l16">
391 393 <td class="annotate">
392 <a href="/annotate/853dcd4de2a6/primes.py#l16"
393 title="853dcd4de2a6: a">test@0</a>
394 <a href="/annotate/06824edf55d0/primes.py#l16"
395 title="06824edf55d0: a">test@0</a>
394 396 </td>
395 397 <td class="source"><a href="#l16"> 16</a> <span class="c"># infinite recursion.</span></td>
396 398 </tr>
397 399 <tr id="l17">
398 400 <td class="annotate">
399 <a href="/annotate/853dcd4de2a6/primes.py#l17"
400 title="853dcd4de2a6: a">test@0</a>
401 <a href="/annotate/06824edf55d0/primes.py#l17"
402 title="06824edf55d0: a">test@0</a>
401 403 </td>
402 404 <td class="source"><a href="#l17"> 17</a> <span class="kn">yield</span> <span class="n">p</span></td>
403 405 </tr>
404 406 <tr id="l18">
405 407 <td class="annotate">
406 <a href="/annotate/853dcd4de2a6/primes.py#l18"
407 title="853dcd4de2a6: a">test@0</a>
408 <a href="/annotate/06824edf55d0/primes.py#l18"
409 title="06824edf55d0: a">test@0</a>
408 410 </td>
409 411 <td class="source"><a href="#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>
410 412 </tr>
411 413 <tr id="l19">
412 414 <td class="annotate">
413 <a href="/annotate/853dcd4de2a6/primes.py#l19"
414 title="853dcd4de2a6: a">test@0</a>
415 <a href="/annotate/06824edf55d0/primes.py#l19"
416 title="06824edf55d0: a">test@0</a>
415 417 </td>
416 418 <td class="source"><a href="#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>
417 419 </tr>
418 420 <tr id="l20">
419 421 <td class="annotate">
420 <a href="/annotate/853dcd4de2a6/primes.py#l20"
421 title="853dcd4de2a6: a">test@0</a>
422 <a href="/annotate/06824edf55d0/primes.py#l20"
423 title="06824edf55d0: a">test@0</a>
422 424 </td>
423 425 <td class="source"><a href="#l20"> 20</a> <span class="kn">yield</span> <span class="n">n</span></td>
424 426 </tr>
425 427 <tr id="l21">
426 428 <td class="annotate">
427 <a href="/annotate/853dcd4de2a6/primes.py#l21"
428 title="853dcd4de2a6: a">test@0</a>
429 <a href="/annotate/06824edf55d0/primes.py#l21"
430 title="06824edf55d0: a">test@0</a>
429 431 </td>
430 432 <td class="source"><a href="#l21"> 21</a> </td>
431 433 </tr>
432 434 <tr id="l22">
433 435 <td class="annotate">
434 <a href="/annotate/853dcd4de2a6/primes.py#l22"
435 title="853dcd4de2a6: a">test@0</a>
436 <a href="/annotate/06824edf55d0/primes.py#l22"
437 title="06824edf55d0: a">test@0</a>
436 438 </td>
437 439 <td class="source"><a href="#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>
438 440 </tr>
439 441 <tr id="l23">
440 442 <td class="annotate">
441 <a href="/annotate/853dcd4de2a6/primes.py#l23"
442 title="853dcd4de2a6: a">test@0</a>
443 <a href="/annotate/06824edf55d0/primes.py#l23"
444 title="06824edf55d0: a">test@0</a>
443 445 </td>
444 446 <td class="source"><a href="#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">&lt;</span> <span class="mf">3</span><span class="p">,</span> <span class="n">odds</span><span class="p">)))</span></td>
445 447 </tr>
446 448 <tr id="l24">
447 449 <td class="annotate">
448 <a href="/annotate/853dcd4de2a6/primes.py#l24"
449 title="853dcd4de2a6: a">test@0</a>
450 <a href="/annotate/06824edf55d0/primes.py#l24"
451 title="06824edf55d0: a">test@0</a>
450 452 </td>
451 453 <td class="source"><a href="#l24"> 24</a> </td>
452 454 </tr>
453 455 <tr id="l25">
454 456 <td class="annotate">
455 <a href="/annotate/853dcd4de2a6/primes.py#l25"
456 title="853dcd4de2a6: a">test@0</a>
457 <a href="/annotate/06824edf55d0/primes.py#l25"
458 title="06824edf55d0: a">test@0</a>
457 459 </td>
458 460 <td class="source"><a href="#l25"> 25</a> <span class="kn">if</span> <span class="n">__name__</span> <span class="o">==</span> <span class="s">&quot;__main__&quot;</span><span class="p">:</span></td>
459 461 </tr>
460 462 <tr id="l26">
461 463 <td class="annotate">
462 <a href="/annotate/853dcd4de2a6/primes.py#l26"
463 title="853dcd4de2a6: a">test@0</a>
464 <a href="/annotate/06824edf55d0/primes.py#l26"
465 title="06824edf55d0: a">test@0</a>
464 466 </td>
465 467 <td class="source"><a href="#l26"> 26</a> <span class="kn">import</span> <span class="nn">sys</span></td>
466 468 </tr>
467 469 <tr id="l27">
468 470 <td class="annotate">
469 <a href="/annotate/853dcd4de2a6/primes.py#l27"
470 title="853dcd4de2a6: a">test@0</a>
471 <a href="/annotate/06824edf55d0/primes.py#l27"
472 title="06824edf55d0: a">test@0</a>
471 473 </td>
472 474 <td class="source"><a href="#l27"> 27</a> <span class="kn">try</span><span class="p">:</span></td>
473 475 </tr>
474 476 <tr id="l28">
475 477 <td class="annotate">
476 <a href="/annotate/853dcd4de2a6/primes.py#l28"
477 title="853dcd4de2a6: a">test@0</a>
478 <a href="/annotate/06824edf55d0/primes.py#l28"
479 title="06824edf55d0: a">test@0</a>
478 480 </td>
479 481 <td class="source"><a href="#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>
480 482 </tr>
481 483 <tr id="l29">
482 484 <td class="annotate">
483 <a href="/annotate/853dcd4de2a6/primes.py#l29"
484 title="853dcd4de2a6: a">test@0</a>
485 <a href="/annotate/06824edf55d0/primes.py#l29"
486 title="06824edf55d0: a">test@0</a>
485 487 </td>
486 488 <td class="source"><a href="#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>
487 489 </tr>
488 490 <tr id="l30">
489 491 <td class="annotate">
490 <a href="/annotate/853dcd4de2a6/primes.py#l30"
491 title="853dcd4de2a6: a">test@0</a>
492 <a href="/annotate/06824edf55d0/primes.py#l30"
493 title="06824edf55d0: a">test@0</a>
492 494 </td>
493 495 <td class="source"><a href="#l30"> 30</a> <span class="n">n</span> <span class="o">=</span> <span class="mf">10</span></td>
494 496 </tr>
495 497 <tr id="l31">
496 498 <td class="annotate">
497 <a href="/annotate/853dcd4de2a6/primes.py#l31"
498 title="853dcd4de2a6: a">test@0</a>
499 <a href="/annotate/06824edf55d0/primes.py#l31"
500 title="06824edf55d0: a">test@0</a>
499 501 </td>
500 502 <td class="source"><a href="#l31"> 31</a> <span class="n">p</span> <span class="o">=</span> <span class="n">primes</span><span class="p">()</span></td>
501 503 </tr>
502 504 <tr id="l32">
503 505 <td class="annotate">
504 <a href="/annotate/853dcd4de2a6/primes.py#l32"
505 title="853dcd4de2a6: a">test@0</a>
506 <a href="/annotate/06824edf55d0/primes.py#l32"
507 title="06824edf55d0: a">test@0</a>
506 508 </td>
507 509 <td class="source"><a href="#l32"> 32</a> <span class="kn">print</span> <span class="s">&quot;The first </span><span class="si">%d</span><span class="s"> primes: </span><span class="si">%s</span><span class="s">&quot;</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>
508 510 </tr>
511 <tr id="l33">
512 <td class="annotate">
513 <a href="/annotate/06824edf55d0/primes.py#l33"
514 title="06824edf55d0: a">test@0</a>
515 </td>
516 <td class="source"><a href="#l33"> 33</a> </td>
517 </tr>
509 518 </tbody>
510 519 </table>
511 520 </div>
General Comments 0
You need to be logged in to leave comments. Login now