Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Rollup of 7 pull requests #74810

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 17 commits into from
Closed

Rollup of 7 pull requests #74810

Changes from 2 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
9e42d3e
Pull out some shared code into a new function
smmalis37 Jul 25, 2020
617dd0a
Fix commas.
smmalis37 Jul 25, 2020
79c0db4
Clean up some uses of logging in ui tests
oli-obk Jul 25, 2020
7a5d3ab
Avoid writes without any data in `Write::write_all_vectored`
tmiasko Jul 6, 2020
bb2687d
Add str::[r]split_once
matklad Jul 24, 2020
b663892
Remove more obsolete test flags
oli-obk Jul 26, 2020
86ac65c
Bless you
oli-obk Jul 26, 2020
db4e972
python codes cleanup
jnozsc Jul 26, 2020
0b32008
report kind of deprecated item in message
euclio Jul 25, 2020
51b99d4
Don't italicize comments in ayu theme
Cldfire Jul 26, 2020
3413370
Rollup merge of #74088 - tmiasko:write-all-vectored-empty, r=KodrAus
Manishearth Jul 27, 2020
29a8eaf
Rollup merge of #74707 - matklad:split_once, r=dtolnay
Manishearth Jul 27, 2020
7a3163a
Rollup merge of #74737 - smmalis37:astconv-factor, r=davidtwco
Manishearth Jul 27, 2020
142f316
Rollup merge of #74750 - oli-obk:logging_and_test_cleanups, r=JohnTitor
Manishearth Jul 27, 2020
a240d00
Rollup merge of #74783 - jnozsc:python_cleanup, r=Mark-Simulacrum
Manishearth Jul 27, 2020
3584233
Rollup merge of #74785 - euclio:deprecation-kinds, r=petrochenkov
Manishearth Jul 27, 2020
90c590f
Rollup merge of #74790 - Cldfire:ayu-no-italic-comments, r=GuillaumeG…
Manishearth Jul 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/etc/htmldocck.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,8 @@
from htmlentitydefs import name2codepoint

# "void elements" (no closing tag) from the HTML Standard section 12.1.2
VOID_ELEMENTS = set(['area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input', 'keygen',
'link', 'menuitem', 'meta', 'param', 'source', 'track', 'wbr'])
VOID_ELEMENTS = {'area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input', 'keygen',
'link', 'menuitem', 'meta', 'param', 'source', 'track', 'wbr'}

# Python 2 -> 3 compatibility
try:
Expand All @@ -146,7 +146,7 @@ def __init__(self, target=None):
self.__builder = target or ET.TreeBuilder()

def handle_starttag(self, tag, attrs):
attrs = dict((k, v or '') for k, v in attrs)
attrs = {k: v or '' for k, v in attrs}
self.__builder.start(tag, attrs)
if tag in VOID_ELEMENTS:
self.__builder.end(tag)
Expand All @@ -155,7 +155,7 @@ def handle_endtag(self, tag):
self.__builder.end(tag)

def handle_startendtag(self, tag, attrs):
attrs = dict((k, v or '') for k, v in attrs)
attrs = {k: v or '' for k, v in attrs}
self.__builder.start(tag, attrs)
self.__builder.end(tag)

Expand Down