bitbake: prserv/serv: Use with while reading pidfile
PATCH 1/2 bitbake: prserv/serv: Use with while reading pidfile
Signed-off-by Ola x Nilsson <[email protected]>
--- lib/prserv/serv.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
lib/prserv/serv.py +2 -3
@@ -379,9 +379,8 @@ def stop_daemon(host, port): ip = socket.gethostbyname(host) pidfile = PIDPREFIX % (ip, port) try: - pf = open(pidfile,'r') - pid = int(pf.readline().strip()) - pf.close() + with open(pidfile) as pf: + pid = int(pf.readline().strip()) except IOError: pid = None
Signature · 1 line
2.11.0
PATCH 2/2 bitbake: ConfHandler: Use with to manage filehandle lifetime
Signed-off-by Ola x Nilsson <[email protected]>
--- lib/bb/parse/parse_py/ConfHandler.py | 44 ++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 22 deletions(-)
lib/bb/parse/parse_py/ConfHandler.py +22 -22
@@ -119,30 +119,30 @@ def handle(fn, data, include): oldfile = data.getVar('FILE', False) abs_fn = resolve_file(fn, data) - f = open(abs_fn, 'r') + with open(abs_fn, 'r') as f: - statements = ast.StatementGroup() - lineno = 0 - while True: - lineno = lineno + 1 - s = f.readline() - if not s: - break - w = s.strip() - # skip empty lines - if not w: - continue - s = s.rstrip() - while s[-1] == '\\': - s2 = f.readline().rstrip() + statements = ast.StatementGroup() + lineno = 0 + while True: lineno = lineno + 1 - if (not s2 or s2 and s2[0] != "#") and s[0] == "#" : - bb.fatal("There is a confusing multiline, partially commented expression on line %s of file %s (%s).\nPlease clarify whether this is all a comment or should be parsed." % (lineno, fn, s)) - s = s[:-1] + s2 - # skip comments - if s[0] == '#': - continue - feeder(lineno, s, abs_fn, statements) + s = f.readline() + if not s: + break + w = s.strip() + # skip empty lines + if not w: + continue + s = s.rstrip() + while s[-1] == '\\': + s2 = f.readline().rstrip() + lineno = lineno + 1 + if (not s2 or s2 and s2[0] != "#") and s[0] == "#" : + bb.fatal("There is a confusing multiline, partially commented expression on line %s of file %s (%s).\nPlease clarify whether this is all a comment or should be parsed." % (lineno, fn, s)) + s = s[:-1] + s2 + # skip comments + if s[0] == '#': + continue + feeder(lineno, s, abs_fn, statements) # DONE WITH PARSING... time to evaluate data.setVar('FILE', abs_fn)
Signature · 1 line
2.11.0