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

Use code objects for exec statements instead of files

Browse Source
This commit is contained in:
Daniel Neuhäuser 2010-05-08 22:00:15 +02:00
parent b81d428b89
commit 25b16f89e0
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sphinx/config.py
View File

@ -167,9 +167,10 @@ class Config(object):
os.chdir(dirname)
f = open(config_file, 'U')
try:
exec f in config
code = compile(f.read(), config_file, 'exec')
finally:
f.close()
exec code in config
except SyntaxError, err:
raise ConfigError('There is a syntax error in your '
'configuration file: ' + str(err))

6
tests/test_quickstart.py
View File

@ -87,9 +87,10 @@ def test_quickstart_defaults(tempdir):
ns = {}
f = open(conffile, 'U')
try:
exec f in ns
code = compile(f.read(), conffile, 'exec')
finally:
f.close()
exec code in ns
assert ns['extensions'] == []
assert ns['templates_path'] == ['_templates']
assert ns['source_suffix'] == '.rst'
@ -144,9 +145,10 @@ def test_quickstart_all_answers(tempdir):
ns = {}
f = open(conffile, 'U')
try:
exec f in ns
code = compile(f.read(), conffile, 'exec')
finally:
f.close()
exec code in ns
assert ns['extensions'] == ['sphinx.ext.autodoc', 'sphinx.ext.doctest']
assert ns['templates_path'] == ['.templates']
assert ns['source_suffix'] == '.txt'