From e65760bc2345a63bc067c283dd578bf71466b024 Mon Sep 17 00:00:00 2001 From: Iblis Lin Date: Fri, 13 Nov 2015 22:48:38 +0800 Subject: [PATCH] py3 compatibility: Fix for `exec` --- master/buildbot/config.py | 2 +- master/buildbot/scripts/base.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/master/buildbot/config.py b/master/buildbot/config.py index 211b7d7f37b..5c1541b225a 100644 --- 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 index 417011912f7..8817caf5d2f 100644 --- 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