Skip to content

Commit e5e73ca

Browse files
nicholasserranicholasserra
authored
Merge branch 'master' into process-escaped-html-comments
2 parents 2390b87 + 796e57f commit e5e73ca

15 files changed

+104
-20
lines changed

‎CHANGES.md

+2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44

55
- [pull #519] Add support for custom extras
66
- [pull #519] Drop Python 3.5 support
7+
- [pull #568] Add `prepend` arg to toc extra (#397)
78
- [pull #569] Process HTML comments as markdown in 'escape' safe mode
9+
- [pull #570] Fix syntax warnings in test suite
810

911

1012
## python-markdown2 2.4.13

‎lib/markdown2.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ def toc_sort(entry):
513513
self._toc_html = calculate_toc_html(self._toc)
514514

515515
# Prepend toc html to output
516-
if self.cli:
516+
if self.cli or (self.extras['toc'] is not None and self.extras['toc'].get('prepend', False)):
517517
text = '{}\n{}'.format(self._toc_html, text)
518518

519519
text += "\n"

‎test/test_markdown2.py

+6-2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import difflib
1515
import doctest
1616
from json import loads as json_loads
17+
import warnings
1718

1819
sys.path.insert(0, join(dirname(dirname(abspath(__file__)))))
1920
try:
@@ -150,11 +151,14 @@ def generate_tests(cls):
150151
opts_path = splitext(text_path)[0] + ".opts"
151152
if exists(opts_path):
152153
try:
153-
opts = eval(open(opts_path, 'r').read())
154+
with warnings.catch_warnings(record=True) as caught_warnings:
155+
opts = eval(open(opts_path, 'r').read())
156+
for warning in caught_warnings:
157+
print("WARNING: loading %s generated warning: %s - lineno %d" % (opts_path, warning.message, warning.lineno), file=sys.stderr)
154158
except Exception:
155159
_, ex, _ = sys.exc_info()
156160
print("WARNING: couldn't load `%s' opts file: %s" \
157-
% (opts_path, ex))
161+
% (opts_path, ex), file=sys.stderr)
158162

159163
toc_html_path = splitext(text_path)[0] + ".toc_html"
160164
if not exists(toc_html_path):

‎test/testall.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def testall():
6868
# capture and re-print stderr while process is running
6969
line = proc.stderr.readline().decode().strip()
7070
print(line, file=sys.stderr)
71-
if 'WARNING:test:' in line:
71+
if 'WARNING:' in line:
7272
# if stderr contains a warning, save this for later
7373
all_warnings.append((python, ver_str, line))
7474

‎test/tm-cases/link_patterns.opts

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
{"extras": ["link-patterns"],
22
"link_patterns": [
3-
(re.compile("recipe\s+(\d+)", re.I), r"http://code.activestate.com/recipes/\1/"),
4-
(re.compile("(?:komodo\s+)?bug\s+(\d+)", re.I), r"http://bugs.activestate.com/show_bug.cgi?id=\1"),
5-
(re.compile("PEP\s+(\d+)", re.I), lambda m: "http://www.python.org/dev/peps/pep-%04d/" % int(m.group(1))),
3+
(re.compile(r"recipe\s+(\d+)", re.I), r"http://code.activestate.com/recipes/\1/"),
4+
(re.compile(r"(?:komodo\s+)?bug\s+(\d+)", re.I), r"http://bugs.activestate.com/show_bug.cgi?id=\1"),
5+
(re.compile(r"PEP\s+(\d+)", re.I), lambda m: "http://www.python.org/dev/peps/pep-%04d/" % int(m.group(1))),
66
],
77
}
8-

‎test/tm-cases/link_patterns_double_hit.opts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{"extras": ["link-patterns"],
22
"link_patterns": [
33
(re.compile(r'mozilla\s+bug\s+(\d+)', re.I), r'http://bugzilla.mozilla.org/show_bug.cgi?id=\1'),
4-
(re.compile("(?:komodo\s+)?bug\s+(\d+)", re.I), r"http://bugs.activestate.com/show_bug.cgi?id=\1"),
4+
(re.compile(r"(?:komodo\s+)?bug\s+(\d+)", re.I), r"http://bugs.activestate.com/show_bug.cgi?id=\1"),
55
],
66
}
7-

‎test/tm-cases/link_patterns_edge_cases.opts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{"extras": ["link-patterns"],
22
"link_patterns": [
3-
(re.compile("Blah\s+(\d+)", re.I), r"http://foo.com/blah_blah_blah/\1"),
3+
(re.compile(r"Blah\s+(\d+)", re.I), r"http://foo.com/blah_blah_blah/\1"),
44
(re.compile("#([1-9][0-9]*)"), r"http://localhost/issue/\1"),
55
],
66
}
7-

‎test/tm-cases/link_patterns_escape.opts

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
{"extras": ["link-patterns"],
22
"link_patterns": [
3-
(re.compile("recipe\s+(\d+)", re.I), r"http://code.activestate.com/recipes/\1/"),
4-
(re.compile("(?:komodo\s+)?bug\s+(\d+)", re.I), r"http://bugs.activestate.com/show_bug.cgi?id=\1"),
5-
(re.compile("PEP\s+(\d+)", re.I), lambda m: "http://www.python.org/dev/peps/pep-%04d/" % int(m.group(1))),
3+
(re.compile(r"recipe\s+(\d+)", re.I), r"http://code.activestate.com/recipes/\1/"),
4+
(re.compile(r"(?:komodo\s+)?bug\s+(\d+)", re.I), r"http://bugs.activestate.com/show_bug.cgi?id=\1"),
5+
(re.compile(r"PEP\s+(\d+)", re.I), lambda m: "http://www.python.org/dev/peps/pep-%04d/" % int(m.group(1))),
66
],
77
}
8-

‎test/tm-cases/link_patterns_hash_matching_issue287.opts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{"extras": ["link-patterns"],
22
"link_patterns": [
3-
(re.compile("#(\d+)", re.I), r"https://github.com/pyfa-org/Pyfa/issues/\1"),
4-
(re.compile("@(\w+)", re.I), r"https://github.com/\1"),
3+
(re.compile(r"#(\d+)", re.I), r"https://github.com/pyfa-org/Pyfa/issues/\1"),
4+
(re.compile(r"@(\w+)", re.I), r"https://github.com/\1"),
55
(re.compile("([0-9a-f]{6,40})", re.I), r"https://github.com/pyfa-org/Pyfa/commit/\1")
66
]
77
}

‎test/tm-cases/link_patterns_markdown_syntax.opts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{"extras": ["link-patterns"],
22
"link_patterns": [
3-
(re.compile("recipe\s+(\d+)", re.I), r"http://code.activestate.com/recipes/\1/"),
3+
(re.compile(r"recipe\s+(\d+)", re.I), r"http://code.activestate.com/recipes/\1/"),
44
],
5-
}
5+
}

‎test/tm-cases/toc_prepend.html

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<ul>
2+
<li><a href="#readme-for-blah">README for Blah</a>
3+
<ul>
4+
<li><a href="#introduction">Introduction</a></li>
5+
<li><a href="#the-meat">The Meat</a>
6+
<ul>
7+
<li><a href="#beef">Beef</a>
8+
<ul>
9+
<li><a href="#steak">Steak</a></li>
10+
<li><a href="#burgers">Burgers</a></li>
11+
</ul></li>
12+
<li><a href="#chicken">Chicken</a></li>
13+
<li><a href="#pork">Pork</a>
14+
<ul>
15+
<li><a href="#mmmmmmmm-bacon">Mmmmmmmm, bacon</a></li>
16+
</ul></li>
17+
</ul></li>
18+
</ul></li>
19+
<li><a href="#at-the-top-level-again">At the <em>top</em> level again!?</a></li>
20+
</ul>
21+
22+
<h1 id="readme-for-blah">README for Blah</h1>
23+
24+
<h2 id="introduction">Introduction</h2>
25+
26+
<h2 id="the-meat">The Meat</h2>
27+
28+
<h3 id="beef">Beef</h3>
29+
30+
<h5 id="steak">Steak</h5>
31+
32+
<h5 id="burgers">Burgers</h5>
33+
34+
<h3 id="chicken">Chicken</h3>
35+
36+
<h3 id="pork">Pork</h3>
37+
38+
<h4 id="mmmmmmmm-bacon">Mmmmmmmm, bacon</h4>
39+
40+
<h1 id="at-the-top-level-again">At the <em>top</em> level again!?</h1>

‎test/tm-cases/toc_prepend.opts

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"extras": {"toc": {"prepend": True}}}

‎test/tm-cases/toc_prepend.tags

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
toc extra

‎test/tm-cases/toc_prepend.text

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# README for Blah
2+
3+
## Introduction
4+
5+
## The Meat
6+
7+
### Beef
8+
9+
##### Steak
10+
11+
##### Burgers
12+
13+
### Chicken
14+
15+
### Pork
16+
17+
#### Mmmmmmmm, bacon
18+
19+
# At the *top* level again!?
20+

‎test/tm-cases/toc_prepend.toc_html

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<ul>
2+
<li><a href="#readme-for-blah">README for Blah</a>
3+
<ul>
4+
<li><a href="#introduction">Introduction</a></li>
5+
<li><a href="#the-meat">The Meat</a>
6+
<ul>
7+
<li><a href="#beef">Beef</a>
8+
<ul>
9+
<li><a href="#steak">Steak</a></li>
10+
<li><a href="#burgers">Burgers</a></li>
11+
</ul></li>
12+
<li><a href="#chicken">Chicken</a></li>
13+
<li><a href="#pork">Pork</a>
14+
<ul>
15+
<li><a href="#mmmmmmmm-bacon">Mmmmmmmm, bacon</a></li>
16+
</ul></li>
17+
</ul></li>
18+
</ul></li>
19+
<li><a href="#at-the-top-level-again">At the <em>top</em> level again!?</a></li>
20+
</ul>

0 commit comments

Comments
 (0)