Merge pull request #2613 from rodrigc/exec

Replace first argument to exec() with a string.
buildbot · Jan 20, 2017 · 1c50765 · 1c50765
2 parents 55b30f0 + 0fe636a
commit 1c50765
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/master/buildbot/config.py b/master/buildbot/config.py
@@ -29,6 +29,7 @@
 
 from twisted.python import failure
 from twisted.python import log
+from twisted.python.compat import execfile
 from zope.interface import implementer
 
 from buildbot import interfaces
@@ -103,7 +104,8 @@ def loadConfigDict(basedir, configFileName):
         ])
 
     try:
-        f = open(filename, "r")
+        with open(filename, "r"):
+            pass
     except IOError as e:
         raise ConfigErrors([
             "unable to open configuration file %r: %s" % (filename, e),
@@ -121,7 +123,7 @@ def loadConfigDict(basedir, configFileName):
     sys.path.append(basedir)
     try:
         try:
-            exec(f, localDict)
+            execfile(filename, localDict)
         except ConfigErrors:
             raise
         except SyntaxError:
@@ -136,7 +138,6 @@ def loadConfigDict(basedir, configFileName):
                   always_raise=True,
                   )
     finally:
-        f.close()
         sys.path[:] = old_sys_path
 
     if 'BuildmasterConfig' not in localDict: