maya-chen/flask
1
0
Fork 0
forked from orbit-oss/flask
Code Pull requests Activity

Merge branch 'exec' of github.com:ThomasWaldmann/flask into sprint-branch

Browse source 
Conflicts:
	flask/config.py
This commit is contained in:
Daniel Neuhäuser 2013-05-18 17:32:38 +02:00
commit 05923f7f2f
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
flask/config.py
View file

@ -126,7 +126,7 @@ class Config(dict):
d = imp.new_module('config') d = imp.new_module('config')
d.__file__ = filename d.__file__ = filename
try: try:
execfile(filename, d.__dict__) exec(compile(open(filename).read(), filename, 'exec'), d.__dict__)
except IOError as e: except IOError as e:
if silent and e.errno in (errno.ENOENT, errno.EISDIR): if silent and e.errno in (errno.ENOENT, errno.EISDIR):
return False return False