Merge pull request #2780 from bdarnell/lint-updates

author Ben Darnell <ben@bendarnell.com>

Sat, 23 Nov 2019 20:48:43 +0000 (15:48 -0500)

committer GitHub <noreply@github.com>

Sat, 23 Nov 2019 20:48:43 +0000 (15:48 -0500)
author Ben Darnell <ben@bendarnell.com>
Sat, 23 Nov 2019 20:48:43 +0000 (15:48 -0500)
committer GitHub <noreply@github.com>
Sat, 23 Nov 2019 20:48:43 +0000 (15:48 -0500)
diff --cc tornado/test/web_test.py
Simple merge
diff --cc tornado/web.py
Simple merge
author	Ben Darnell <ben@bendarnell.com>
	Sat, 23 Nov 2019 20:48:43 +0000 (15:48 -0500)
committer	GitHub <noreply@github.com>
	Sat, 23 Nov 2019 20:48:43 +0000 (15:48 -0500)
		1	2
tornado/test/web_test.py	patch \|	diff1 \|	diff2 \|	blob \| history
tornado/web.py	patch \|	diff1 \|	diff2 \|	blob \| history