Merge git://gitorious.org/python-markdown/mainline

Conflicts:

	markdown.py
	mdx_rss.py

2 files changed, 31 insertions, 0 deletions

diff --git a/tests/extensions-x-codehilite/code.html b/tests/extensions-x-codehilite/code.html
new file mode 100644
index 0000000..43b09ea
--- /dev/null
+++ b/tests/extensions-x-codehilite/code.html
@@ -0,0 +1,19 @@
+
+<p>Some text
+</p>
+<table><tr><td class="linenos"><pre>1
+2
+3
+4
+5
+6</pre></td><td class="code"><div class="codehilite"><pre><span class="k">def</span> <span class="nf">__init__</span> <span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">pattern</span><span class="p">)</span> <span class="p">:</span>
+    <span class="bp">self</span><span class="o">.</span><span class="n">pattern</span> <span class="o">=</span> <span class="n">pattern</span>
+    <span class="bp">self</span><span class="o">.</span><span class="n">compiled_re</span> <span class="o">=</span> <span class="n">re</span><span class="o">.</span><span class="n">compile</span><span class="p">(</span><span class="s">&quot;^(.*)</span><span class="si">%s</span><span class="s">(.*)$&quot;</span> <span class="o">%</span> <span class="n">pattern</span><span class="p">,</span> <span class="n">re</span><span class="o">.</span><span class="n">DOTALL</span><span class="p">)</span>
+
+<span class="k">def</span> <span class="nf">getCompiledRegExp</span> <span class="p">(</span><span class="bp">self</span><span class="p">)</span> <span class="p">:</span>
+    <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">compiled_re</span>
+</pre></div>
+</td></tr></table><p>More text
+</p>
+
+
diff --git a/tests/extensions-x-codehilite/code.txt b/tests/extensions-x-codehilite/code.txt
new file mode 100644
index 0000000..6c62e6a
--- /dev/null
+++ b/tests/extensions-x-codehilite/code.txt
@@ -0,0 +1,12 @@
+
+Some text
+
+    #!python
+    def __init__ (self, pattern) :
+        self.pattern = pattern
+        self.compiled_re = re.compile("^(.*)%s(.*)$" % pattern, re.DOTALL)
+
+    def getCompiledRegExp (self) :
+        return self.compiled_re
+
+More text
\ No newline at end of file