Browse Source

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

Conflicts:
	flask/config.py
pull/736/head
Daniel Neuhäuser 12 years ago
parent
commit
05923f7f2f
  1. 2
      flask/config.py

2
flask/config.py

@ -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

Loading…
Cancel
Save