Skip to content

Commit c89ba42

Browse files
committed
Merge remote-tracking branch 'upstream/master'
* upstream/master: travis: Check whether index-functions-{c,cpp}.xml can be parsed test: Fix errors that appeared after releasing new pylint
2 parents ffd8645 + f35e77f commit c89ba42

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

.travis.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ before_script:
2222

2323
script:
2424
- "python -m unittest discover"
25+
- "mkdir -p tmp"
26+
- "python index2browser.py index-functions-c.xml tmp/index-functions-c-web.html"
27+
- "python index2browser.py index-functions-cpp.xml tmp/index-functions-cpp-web.html"
2528

2629
notifications:
2730
email: false

config/pylintrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ disable=
6363
missing-docstring,
6464
too-many-lines,
6565
no-self-use,
66+
chained-comparison,
6667
duplicate-code,
6768
too-many-ancestors,
6869
too-many-instance-attributes,

ddg_parse_html.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,7 @@ def get_declarations(root_el, name):
111111
if len(dcls) == 0:
112112
if not ignored:
113113
raise DdgException("dcl table contains no declarations")
114-
else:
115-
raise DdgException("All entries in dcl table were ignored")
114+
raise DdgException("All entries in dcl table were ignored")
116115

117116
return dcls
118117

0 commit comments

Comments
 (0)