Merge pull request #5840 from tk0miya/1956_conf.py_flake8_error

Fix flake8 violation in conf.py

CHANGES

@@ -28,6 +28,7 @@ Bugs fixed
 * #5636: C++, fix parsing of floating point literals.
 * #5496 (again): C++, fix assertion in partial builds with duplicates.
 * #5724: quickstart: sphinx-quickstart fails when $LC_ALL is empty
+* #1956: Default conf.py is not PEP8-compliant
 
 Testing
 --------

sphinx/templates/quickstart/conf.py_t

@@ -202,3 +202,4 @@ intersphinx_mapping = {'https://docs.python.org/': None}
 # If true, `todo` and `todoList` produce output, else they produce nothing.
 todo_include_todos = True
 {%- endif %}
+