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

Don't use execfile() anymore

Browse Source
This commit is contained in:
Daniel Neuhäuser 2010-04-29 20:34:08 +02:00
parent 4adbc98350
commit 21376f21e7
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sphinx/config.py
View File

@ -165,7 +165,11 @@ class Config(object):
try: try:
try: try:
os.chdir(dirname) os.chdir(dirname)
execfile(config['__file__'], config) try:
f = open(config_file, 'U')
exec f in config
finally:
f.close()
except SyntaxError, err: except SyntaxError, err:
raise ConfigError('There is a syntax error in your ' raise ConfigError('There is a syntax error in your '
'configuration file: ' + str(err)) 'configuration file: ' + str(err))

12
tests/test_quickstart.py
View File

@ -85,7 +85,11 @@ def test_quickstart_defaults(tempdir):
conffile = tempdir / 'conf.py' conffile = tempdir / 'conf.py'
assert conffile.isfile() assert conffile.isfile()
ns = {} ns = {}
execfile(conffile, ns) try:
f = open(conffile, 'U')
exec f in ns
finally:
f.close()
assert ns['extensions'] == [] assert ns['extensions'] == []
assert ns['templates_path'] == ['_templates'] assert ns['templates_path'] == ['_templates']
assert ns['source_suffix'] == '.rst' assert ns['source_suffix'] == '.rst'
@ -138,7 +142,11 @@ def test_quickstart_all_answers(tempdir):
conffile = tempdir / 'source' / 'conf.py' conffile = tempdir / 'source' / 'conf.py'
assert conffile.isfile() assert conffile.isfile()
ns = {} ns = {}
execfile(conffile, ns) try:
f = open(conffile, 'U')
exec f in ns
finally:
f.close()
assert ns['extensions'] == ['sphinx.ext.autodoc', 'sphinx.ext.doctest'] assert ns['extensions'] == ['sphinx.ext.autodoc', 'sphinx.ext.doctest']
assert ns['templates_path'] == ['.templates'] assert ns['templates_path'] == ['.templates']
assert ns['source_suffix'] == '.txt' assert ns['source_suffix'] == '.txt'