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

Conflicts: flask/config.py
2013-05-18 17:32:38 +02:00 · 2013-05-18 17:32:38 +02:00 · 05923f7f2f
commit 05923f7f2f
parent 26a9e90734 b52b7b1f93
1 changed files with 1 additions and 1 deletions
--- a/flask/config.py
+++ b/flask/config.py
@ -126,7 +126,7 @@ class Config(dict):
        d = imp.new_module('config')
        d.__file__ = filename
        try:
-            execfile(filename, d.__dict__)
+            exec(compile(open(filename).read(), filename, 'exec'), d.__dict__)
        except IOError as e:
            if silent and e.errno in (errno.ENOENT, errno.EISDIR):
                return False