Merge branch 'master' of git://github.com/fiesta/Python-Markdown into fiesta

Conflicts:
	markdown/inlinepatterns.py

5 files changed, 138 insertions, 0 deletions

diff --git a/tests/extensions/fenced_code.html b/tests/extensions/fenced_code.html
new file mode 100644
index 0000000..7b86e79
--- /dev/null
+++ b/tests/extensions/fenced_code.html
@@ -0,0 +1,32 @@
+<p>index 0000000..6e956a9</p>
+<pre><code>--- /dev/null
++++ b/test/data/stripped_text/mike-30-lili
+@@ -0,0 +1,27 @@
++Summary:
++ drift_mod.py |    1 +
++ 1 files changed, 1 insertions(+), 0 deletions(-)
++
++commit da4bfb04debdd994683740878d09988b2641513d
++Author: Mike Dirolf &lt;mike@dirolf.com&gt;
++Date:   Tue Jan 17 13:42:28 2012 -0500
++
++```
++minor: just wanted to push something.
++```
++
++diff --git a/drift_mod.py b/drift_mod.py
++index 34dfba6..8a88a69 100644
++
++```
++--- a/drift_mod.py
+++++ b/drift_mod.py
++@@ -281,6 +281,7 @@ CONTEXT_DIFF_LINE_PATTERN = re.compile(r'^('
++                                        '|\+ .*'
++                                        '|- .*'
++                                        ')$')
+++
++ def wrap_context_diffs(message_text):
++     return _wrap_diff(CONTEXT_DIFF_HEADER_PATTERN,
++                       CONTEXT_DIFF_LINE_PATTERN,
++```
+</code></pre>
\ No newline at end of file
diff --git a/tests/extensions/fenced_code.txt b/tests/extensions/fenced_code.txt
new file mode 100644
index 0000000..73c0337
--- /dev/null
+++ b/tests/extensions/fenced_code.txt
@@ -0,0 +1,34 @@
+index 0000000..6e956a9
+
+```
+--- /dev/null
++++ b/test/data/stripped_text/mike-30-lili
+@@ -0,0 +1,27 @@
++Summary:
++ drift_mod.py |    1 +
++ 1 files changed, 1 insertions(+), 0 deletions(-)
++
++commit da4bfb04debdd994683740878d09988b2641513d
++Author: Mike Dirolf <mike@dirolf.com>
++Date:   Tue Jan 17 13:42:28 2012 -0500
++
++```
++minor: just wanted to push something.
++```
++
++diff --git a/drift_mod.py b/drift_mod.py
++index 34dfba6..8a88a69 100644
++
++```
++--- a/drift_mod.py
+++++ b/drift_mod.py
++@@ -281,6 +281,7 @@ CONTEXT_DIFF_LINE_PATTERN = re.compile(r'^('
++                                        '|\+ .*'
++                                        '|- .*'
++                                        ')$')
+++
++ def wrap_context_diffs(message_text):
++     return _wrap_diff(CONTEXT_DIFF_HEADER_PATTERN,
++                       CONTEXT_DIFF_LINE_PATTERN,
++```
+```
diff --git a/tests/extensions/github_flavored.html b/tests/extensions/github_flavored.html
new file mode 100644
index 0000000..60e16b1
--- /dev/null
+++ b/tests/extensions/github_flavored.html
@@ -0,0 +1,32 @@
+<p>index 0000000..6e956a9</p>
+<div class="codehilite"><pre><span class="gd">--- /dev/null</span>
+<span class="gi">+++ b/test/data/stripped_text/mike-30-lili</span>
+<span class="gu">@@ -0,0 +1,27 @@</span>
+<span class="gi">+Summary:</span>
+<span class="gi">+ drift_mod.py |    1 +</span>
+<span class="gi">+ 1 files changed, 1 insertions(+), 0 deletions(-)</span>
+<span class="gi">+</span>
+<span class="gi">+commit da4bfb04debdd994683740878d09988b2641513d</span>
+<span class="gi">+Author: Mike Dirolf &lt;mike@dirolf.com&gt;</span>
+<span class="gi">+Date:   Tue Jan 17 13:42:28 2012 -0500</span>
+<span class="gi">+</span>
+<span class="gi">+```</span>
+<span class="gi">+minor: just wanted to push something.</span>
+<span class="gi">+```</span>
+<span class="gi">+</span>
+<span class="gi">+diff --git a/drift_mod.py b/drift_mod.py</span>
+<span class="gi">+index 34dfba6..8a88a69 100644</span>
+<span class="gi">+</span>
+<span class="gi">+```</span>
+<span class="gi">+--- a/drift_mod.py</span>
+<span class="gi">++++ b/drift_mod.py</span>
+<span class="gi">+@@ -281,6 +281,7 @@ CONTEXT_DIFF_LINE_PATTERN = re.compile(r&#39;^(&#39;</span>
+<span class="gi">+                                        &#39;|\+ .*&#39;</span>
+<span class="gi">+                                        &#39;|- .*&#39;</span>
+<span class="gi">+                                        &#39;)$&#39;)</span>
+<span class="gi">++</span>
+<span class="gi">+ def wrap_context_diffs(message_text):</span>
+<span class="gi">+     return _wrap_diff(CONTEXT_DIFF_HEADER_PATTERN,</span>
+<span class="gi">+                       CONTEXT_DIFF_LINE_PATTERN,</span>
+<span class="gi">+```</span>
+</pre></div>
\ No newline at end of file
diff --git a/tests/extensions/github_flavored.txt b/tests/extensions/github_flavored.txt
new file mode 100644
index 0000000..d0737bd
--- /dev/null
+++ b/tests/extensions/github_flavored.txt
@@ -0,0 +1,34 @@
+index 0000000..6e956a9
+
+```diff
+--- /dev/null
++++ b/test/data/stripped_text/mike-30-lili
+@@ -0,0 +1,27 @@
++Summary:
++ drift_mod.py |    1 +
++ 1 files changed, 1 insertions(+), 0 deletions(-)
++
++commit da4bfb04debdd994683740878d09988b2641513d
++Author: Mike Dirolf <mike@dirolf.com>
++Date:   Tue Jan 17 13:42:28 2012 -0500
++
++```
++minor: just wanted to push something.
++```
++
++diff --git a/drift_mod.py b/drift_mod.py
++index 34dfba6..8a88a69 100644
++
++```
++--- a/drift_mod.py
+++++ b/drift_mod.py
++@@ -281,6 +281,7 @@ CONTEXT_DIFF_LINE_PATTERN = re.compile(r'^('
++                                        '|\+ .*'
++                                        '|- .*'
++                                        ')$')
+++
++ def wrap_context_diffs(message_text):
++     return _wrap_diff(CONTEXT_DIFF_HEADER_PATTERN,
++                       CONTEXT_DIFF_LINE_PATTERN,
++```
+```
diff --git a/tests/extensions/test.cfg b/tests/extensions/test.cfg
index c25bdfb..ebe9a8f 100644
--- a/tests/extensions/test.cfg
+++ b/tests/extensions/test.cfg
@@ -20,3 +20,9 @@ extensions=toc
 
 [wikilinks]
 extensions=wikilinks
+
+[fenced_code]
+extensions=fenced_code
+
+[github_flavored]
+extensions=codehilite,fenced_code