mirror of
https://git.yoctoproject.org/poky
synced 2026-01-29 21:08:42 +01:00
classes/lib: Complete transition to python3
This patch contains all the other misc pieces of the transition to python3 which didn't make sense to be broken into individual patches. (From OE-Core rev: fcd6b38bab8517d83e1ed48eef1bca9a9a190f57) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -25,9 +25,7 @@ class Registry(oe.classutils.ClassRegistry):
|
||||
return bool(cls.command)
|
||||
|
||||
|
||||
class Terminal(Popen):
|
||||
__metaclass__ = Registry
|
||||
|
||||
class Terminal(Popen, metaclass=Registry):
|
||||
def __init__(self, sh_cmd, title=None, env=None, d=None):
|
||||
fmt_sh_cmd = self.format_command(sh_cmd, title)
|
||||
try:
|
||||
@@ -41,7 +39,7 @@ class Terminal(Popen):
|
||||
|
||||
def format_command(self, sh_cmd, title):
|
||||
fmt = {'title': title or 'Terminal', 'command': sh_cmd}
|
||||
if isinstance(self.command, basestring):
|
||||
if isinstance(self.command, str):
|
||||
return shlex.split(self.command.format(**fmt))
|
||||
else:
|
||||
return [element.format(**fmt) for element in self.command]
|
||||
|
||||
Reference in New Issue
Block a user