IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5931 from tk0miya/5928_KeyError

Browse Source 
Fix #5928: KeyError: 'DOCUTILSCONFIG' when running build
This commit is contained in:
Takeshi KOMIYA 2019-01-12 22:11:54 +09:00 committed by GitHub
commit f39fa12f8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -24,6 +24,7 @@ Bugs fixed
* #5755: C++, fix duplicate declaration error on function templates with constraints * #5755: C++, fix duplicate declaration error on function templates with constraints
in the return type. in the return type.
* C++, parse unary right fold expressions and binary fold expressions. * C++, parse unary right fold expressions and binary fold expressions.
* #5928: KeyError: 'DOCUTILSCONFIG' when running build
Testing Testing
-------- --------

2
sphinx/util/docutils.py
View File

@ -131,7 +131,7 @@ def using_user_docutils_conf(confdir):
yield yield
finally: finally:
if docutilsconfig is None: if docutilsconfig is None:
os.environ.pop('DOCUTILSCONFIG') os.environ.pop('DOCUTILSCONFIG', None)
else: else:
os.environ['DOCUTILSCONFIG'] = docutilsconfig os.environ['DOCUTILSCONFIG'] = docutilsconfig