summaryrefslogtreecommitdiff
path: root/sphinx/config.py
diff options
context:
space:
mode:
authorDmitry Shachnev <mitya57@gmail.com>2014-01-20 18:32:47 +0400
committerDmitry Shachnev <mitya57@gmail.com>2014-01-20 18:32:47 +0400
commitc2eaf2af81c1c0bce89ce8e4e43d853ac768c8f3 (patch)
treebb18c53d431f98cb3a33df663efe9093af0775ea /sphinx/config.py
parent8115aa81a2972a5cc20b8d7c244c52e792ecad98 (diff)
parentce2185ce279664e54ba22b14663091abc5a3a8f2 (diff)
downloadsphinx-git-c2eaf2af81c1c0bce89ce8e4e43d853ac768c8f3.tar.gz
Merge
Diffstat (limited to 'sphinx/config.py')
-rw-r--r--sphinx/config.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/sphinx/config.py b/sphinx/config.py
index ace5f2a61..127425aec 100644
--- a/sphinx/config.py
+++ b/sphinx/config.py
@@ -226,7 +226,7 @@ class Config(object):
os.chdir(dirname)
try:
execfile_(filename, config)
- except SyntaxError, err:
+ except SyntaxError as err:
raise ConfigError(CONFIG_SYNTAX_ERROR % err)
finally:
os.chdir(olddir)