py3 compatibility: Fix for exec

buildbot · Nov 13, 2015 · e65760b · e65760b
1 parent e6e9396
commit e65760b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/master/buildbot/config.py b/master/buildbot/config.py
@@ -194,7 +194,7 @@ def loadConfig(cls, basedir, filename):
         sys.path.append(basedir)
         try:
             try:
-                exec f in localDict
+                exec(f, localDict)
             except ConfigErrors as e:
                 for err in e.errors:
                     error(err)

diff --git a/master/buildbot/scripts/base.py b/master/buildbot/scripts/base.py
@@ -211,7 +211,7 @@ def loadOptionsFile(self, _here=None):
                     try:
                         with open(optfile, "r") as f:
                             options = f.read()
-                        exec options in localDict
+                        exec(options, localDict)
                     except Exception:
                         print("error while reading %s" % optfile)
                         raise