Merge lp:~cosmos-door/byobu/lp1843729 into lp:byobu

[Mitsuya Shibata]

* debian/rules
  - use autoreconf addon to make call dh_auto_configure.
* usr/lib/byobu/include/config.py.in,
  usr/lib/byobu/include/select-session.py:
  - fix ftbfs: LP: #1843729
  - during pep8 verification due to the newly
    introduced E117 - ie. hard tab as over-indented spaces.

Fix FTBFS for LP: #1843729

- make call dh_auto_configure
- replace hard-tab to soft-tab to fix PEP8 E117 (over-indented)

[Dustin Kirkland  (kirkland)]

Nack on the hardtab to whitespace changes. That's not my style. Add E117 to pep8 ignore. Thanks.

Unmerged revisions

2624. By Mitsuya Shibata on 2019-09-29

* debian/rules
  - use autoreconf addon to make call dh_auto_configure.
* usr/lib/byobu/include/config.py.in,
  usr/lib/byobu/include/select-session.py:
  - fix ftbfs: LP: #1843729
  - during pep8 verification due to the newly
    introduced E117 - ie. hard tab as over-indented spaces.

=== modified file 'debian/changelog'
--- debian/changelog	2019-06-12 23:41:10 +0000
+++ debian/changelog	2019-10-06 07:04:52 +0000
@@ -2,6 +2,15 @@
 
   * UNRELEASED
 
+  [ Mitsuya Shibata ]
+  * debian/rules
+    - use autoreconf addon to make call dh_auto_configure.
+  * usr/lib/byobu/include/config.py.in,
+    usr/lib/byobu/include/select-session.py:
+    - fix ftbfs: LP: #1843729
+    - during pep8 verification due to the newly
+      introduced E117 - ie. hard tab as over-indented spaces.
+
  -- Dustin Kirkland <[e-mail]>  Wed, 12 Jun 2019 18:41:09 -0500
 
 byobu (5.129-0ubuntu1) eoan; urgency=medium

=== modified file 'debian/rules'
--- debian/rules	2017-12-04 13:44:47 +0000
+++ debian/rules	2019-10-06 07:04:52 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 %:
-	dh $@ --with python3
+	dh $@ --with autoreconf,python3
 
 override_dh_auto_build:
 	# Check python syntax

=== modified file 'usr/lib/byobu/include/config.py.in'
--- usr/lib/byobu/include/config.py.in	2019-03-19 02:26:57 +0000
+++ usr/lib/byobu/include/config.py.in	2019-10-06 07:04:52 +0000
@@ -35,15 +35,15 @@
 
 
 def error(msg):
-	print("ERROR: %s" % msg)
-	sys.exit(1)
+    print("ERROR: %s" % msg)
+    sys.exit(1)
 
 
 try:
-	import snack
-	from snack import *
+    import snack
+    from snack import *
 except Exception:
-	error("Could not import the python snack module")
+    error("Could not import the python snack module")
 
 
 PKG = "byobu"
@@ -57,11 +57,11 @@
 SHARE = BYOBU_PREFIX + '/share/' + PKG
 DOC = BYOBU_PREFIX + '/share/doc/' + PKG
 if not os.path.exists(SHARE):
-	SHARE = BYOBU_CONFIG_DIR + "/" + SHARE
-if not os.path.exists(DOC):
-	DOC = BYOBU_PREFIX + '/share/doc/packages/' + PKG
-if not os.path.exists(DOC):
-	DOC = BYOBU_CONFIG_DIR + "/" + DOC
+    SHARE = BYOBU_CONFIG_DIR + "/" + SHARE
+if not os.path.exists(DOC):
+    DOC = BYOBU_PREFIX + '/share/doc/packages/' + PKG
+if not os.path.exists(DOC):
+    DOC = BYOBU_CONFIG_DIR + "/" + DOC
 DEF_ESC = "A"
 RELOAD = "If you are using the default set of keybindings, press\n<F5> or <ctrl-a-R> to activate these changes.\n\nOtherwise, exit this session and start a new one."
 RELOAD_FLAG = "%s/reload-required" % (BYOBU_RUN_DIR)
@@ -74,324 +74,324 @@
 
 
 def ioctl_GWINSZ(fd):
-	# Discover terminal width
-	try:
-		import fcntl
-		import termios
-		import struct
-		import os
-		cr = struct.unpack('hh', fcntl.ioctl(fd, termios.TIOCGWINSZ, '1234'))
-	except Exception:
-		return None
-	return cr
+    # Discover terminal width
+    try:
+        import fcntl
+        import termios
+        import struct
+        import os
+        cr = struct.unpack('hh', fcntl.ioctl(fd, termios.TIOCGWINSZ, '1234'))
+    except Exception:
+        return None
+    return cr
 
 
 def reload_required():
-	try:
-		if not os.path.exists(BYOBU_CONFIG_DIR):
-			# 493 (decimal) is 0755 (octal)
-			# Use decimal for portability across all python versions
-			os.makedirs(BYOBU_CONFIG_DIR, 493)
-		f = open(RELOAD_FLAG, 'w')
-		f.close()
-		if BYOBU_BACKEND == "screen":
-			subprocess.call([BYOBU_BACKEND, "-X", "at", "0", "source", "%s/profile" % BYOBU_CONFIG_DIR])
-	except Exception:
-		True
+    try:
+        if not os.path.exists(BYOBU_CONFIG_DIR):
+            # 493 (decimal) is 0755 (octal)
+            # Use decimal for portability across all python versions
+            os.makedirs(BYOBU_CONFIG_DIR, 493)
+        f = open(RELOAD_FLAG, 'w')
+        f.close()
+        if BYOBU_BACKEND == "screen":
+            subprocess.call([BYOBU_BACKEND, "-X", "at", "0", "source", "%s/profile" % BYOBU_CONFIG_DIR])
+    except Exception:
+        True
 
 
 def terminal_size():
-	# decide on some terminal size
-	cr = ioctl_GWINSZ(0) or ioctl_GWINSZ(1) or ioctl_GWINSZ(2)
-	# try open fds
-	if not cr:
-		# ...then ctty
-		try:
-			fd = os.open(os.ctermid(), os.O_RDONLY)
-			cr = ioctl_GWINSZ(fd)
-			os.close(fd)
-		except Exception:
-			pass
-	if not cr:
-		# env vars or finally defaults
-		try:
-			cr = (env['LINES'], env['COLUMNS'])
-		except Exception:
-			cr = (25, 80)
-	# reverse rows, cols
-	return int(cr[1] - 5), int(cr[0] - 5)
+    # decide on some terminal size
+    cr = ioctl_GWINSZ(0) or ioctl_GWINSZ(1) or ioctl_GWINSZ(2)
+    # try open fds
+    if not cr:
+        # ...then ctty
+        try:
+            fd = os.open(os.ctermid(), os.O_RDONLY)
+            cr = ioctl_GWINSZ(fd)
+            os.close(fd)
+        except Exception:
+            pass
+    if not cr:
+        # env vars or finally defaults
+        try:
+            cr = (env['LINES'], env['COLUMNS'])
+        except Exception:
+            cr = (25, 80)
+    # reverse rows, cols
+    return int(cr[1] - 5), int(cr[0] - 5)
 
 
 def menu(snackScreen, size, isInstalled):
-	if isInstalled:
-		installtext = _("Byobu currently launches at login (toggle off)")
-	else:
-		installtext = _("Byobu currently does not launch at login (toggle on)")
-	li = Listbox(height=6, width=60, returnExit=1)
-	li.append(_("Help -- Quick Start Guide"), 1)
-	li.append(_("Toggle status notifications"), 2)
-	li.append(_("Change escape sequence"), 3)
-	li.append(installtext, 4)
-	bb = ButtonBar(snackScreen, (("Exit", "exit", ESC),), compact=1)
-	g = GridForm(snackScreen, _(" Byobu Configuration Menu"), 1, 2)
-	g.add(li, 0, 0, padding=(4, 2, 4, 2))
-	g.add(bb, 0, 1, padding=(1, 1, 0, 0))
-	if bb.buttonPressed(g.runOnce()) == "exit":
-		return 0
-	else:
-		return li.current()
+    if isInstalled:
+        installtext = _("Byobu currently launches at login (toggle off)")
+    else:
+        installtext = _("Byobu currently does not launch at login (toggle on)")
+    li = Listbox(height=6, width=60, returnExit=1)
+    li.append(_("Help -- Quick Start Guide"), 1)
+    li.append(_("Toggle status notifications"), 2)
+    li.append(_("Change escape sequence"), 3)
+    li.append(installtext, 4)
+    bb = ButtonBar(snackScreen, (("Exit", "exit", ESC),), compact=1)
+    g = GridForm(snackScreen, _(" Byobu Configuration Menu"), 1, 2)
+    g.add(li, 0, 0, padding=(4, 2, 4, 2))
+    g.add(bb, 0, 1, padding=(1, 1, 0, 0))
+    if bb.buttonPressed(g.runOnce()) == "exit":
+        return 0
+    else:
+        return li.current()
 
 
 def messagebox(snackScreen, width, height, title, text, scroll=0, buttons=((_("Okay"), "okay"), (_("Cancel"), "cancel", ESC))):
-	t = Textbox(width, height, text, scroll=scroll)
-	bb = ButtonBar(snackScreen, buttons, compact=1)
-	g = GridForm(snackScreen, title, 1, 2)
-	g.add(t, 0, 0, padding=(0, 0, 0, 0))
-	g.add(bb, 0, 1, padding=(1, 1, 0, 0))
-	return bb.buttonPressed(g.runOnce())
+    t = Textbox(width, height, text, scroll=scroll)
+    bb = ButtonBar(snackScreen, buttons, compact=1)
+    g = GridForm(snackScreen, title, 1, 2)
+    g.add(t, 0, 0, padding=(0, 0, 0, 0))
+    g.add(bb, 0, 1, padding=(1, 1, 0, 0))
+    return bb.buttonPressed(g.runOnce())
 
 
 def help(snackScreen, size):
-	f = open(DOC + '/help.' + BYOBU_BACKEND + '.txt')
-	text = f.read()
-	f.close()
-	text = text.replace("<esckey>", getesckey(), 1)
-	t = Textbox(67, 16, text, scroll=1, wrap=1)
-	bb = ButtonBar(snackScreen, ((_("Menu"), "menu", ESC),), compact=1)
-	g = GridForm(snackScreen, _("Byobu Help"), 2, 4)
-	g.add(t, 1, 0)
-	g.add(bb, 1, 1, padding=(1, 1, 0, 0))
-	button = bb.buttonPressed(g.runOnce())
-	return 100
+    f = open(DOC + '/help.' + BYOBU_BACKEND + '.txt')
+    text = f.read()
+    f.close()
+    text = text.replace("<esckey>", getesckey(), 1)
+    t = Textbox(67, 16, text, scroll=1, wrap=1)
+    bb = ButtonBar(snackScreen, ((_("Menu"), "menu", ESC),), compact=1)
+    g = GridForm(snackScreen, _("Byobu Help"), 2, 4)
+    g.add(t, 1, 0)
+    g.add(bb, 1, 1, padding=(1, 1, 0, 0))
+    button = bb.buttonPressed(g.runOnce())
+    return 100
 
 
 def readstatus():
-	status = {}
-	glo = {}
-	loc = {}
-	for f in [SHARE + '/status/status', BYOBU_CONFIG_DIR + '/status']:
-		if os.path.exists(f):
-			try:
-				exec(open(f).read(), glo, loc)
-			except Exception:
-				error("Invalid configuration [%s]" % f)
-			if BYOBU_BACKEND == "tmux":
-				items = "%s %s" % (loc["tmux_left"], loc["tmux_right"])
-			else:
-				items = "%s %s %s %s" % (loc["screen_upper_left"], loc["screen_upper_right"], loc["screen_lower_left"], loc["screen_lower_right"])
-			for i in items.split():
-				if i.startswith("#"):
-					i = i.replace("#", "")
-					status[i] = "0"
-				else:
-					status[i] = "1"
-	li = []
-	keys = list(status.keys())
-	for i in sorted(keys):
-		window = [int(status[i]), i]
-		li.append(window)
-	return li
+    status = {}
+    glo = {}
+    loc = {}
+    for f in [SHARE + '/status/status', BYOBU_CONFIG_DIR + '/status']:
+        if os.path.exists(f):
+            try:
+                exec(open(f).read(), glo, loc)
+            except Exception:
+                error("Invalid configuration [%s]" % f)
+            if BYOBU_BACKEND == "tmux":
+                items = "%s %s" % (loc["tmux_left"], loc["tmux_right"])
+            else:
+                items = "%s %s %s %s" % (loc["screen_upper_left"], loc["screen_upper_right"], loc["screen_lower_left"], loc["screen_lower_right"])
+            for i in items.split():
+                if i.startswith("#"):
+                    i = i.replace("#", "")
+                    status[i] = "0"
+                else:
+                    status[i] = "1"
+    li = []
+    keys = list(status.keys())
+    for i in sorted(keys):
+        window = [int(status[i]), i]
+        li.append(window)
+    return li
 
 
 def genstatusstring(s, status):
-	new = ""
-	glo = {}
-	loc = {}
-	exec(open(SHARE + '/status/status').read(), glo, loc)
-	for i in loc[s].split():
-		if i.startswith("#"):
-			i = i.replace("#", "")
-		if status[i] == 1:
-			new += " " + i
-		else:
-			new += " #" + i
-	return new
+    new = ""
+    glo = {}
+    loc = {}
+    exec(open(SHARE + '/status/status').read(), glo, loc)
+    for i in loc[s].split():
+        if i.startswith("#"):
+            i = i.replace("#", "")
+        if status[i] == 1:
+            new += " " + i
+        else:
+            new += " #" + i
+    return new
 
 
 def writestatus(items):
-	status = {}
-	path = BYOBU_CONFIG_DIR + '/status'
-	for i in items:
-		status[i[1]] = i[0]
-	for key in ["tmux_left", "tmux_right", "screen_upper_left", "screen_upper_right", "screen_lower_left", "screen_lower_right"]:
-		if key.startswith(BYOBU_BACKEND):
-			try:
-				f = open(path, "r")
-			except Exception:
-				f = open(SHARE + '/status/status', "r")
-			lines = f.readlines()
-			f.close()
-			try:
-				f = open(path, "w")
-			except Exception:
-				f = open(path, "a+")
-			for l in lines:
-				if l.startswith("%s=" % key):
-					val = genstatusstring(key, status)
-					f.write("%s=\"%s\"\n" % (key, val))
-				else:
-					f.write(l)
-			f.close
+    status = {}
+    path = BYOBU_CONFIG_DIR + '/status'
+    for i in items:
+        status[i[1]] = i[0]
+    for key in ["tmux_left", "tmux_right", "screen_upper_left", "screen_upper_right", "screen_lower_left", "screen_lower_right"]:
+        if key.startswith(BYOBU_BACKEND):
+            try:
+                f = open(path, "r")
+            except Exception:
+                f = open(SHARE + '/status/status', "r")
+            lines = f.readlines()
+            f.close()
+            try:
+                f = open(path, "w")
+            except Exception:
+                f = open(path, "a+")
+            for l in lines:
+                if l.startswith("%s=" % key):
+                    val = genstatusstring(key, status)
+                    f.write("%s=\"%s\"\n" % (key, val))
+                else:
+                    f.write(l)
+            f.close
 
 
 def togglestatus(snackScreen, size):
-	itemlist = readstatus()
-	rl = Label("")
-	r = CheckboxTree(12, scroll=1)
-	count = 0
-	for item in itemlist:
-		if item[0] != -1:
-			r.append(item[1], count, selected=item[0])
-		count = count + 1
-	bb = ButtonBar(snackScreen, ((_("Apply"), "apply"), (_("Cancel"), "cancel", ESC)), compact=1)
-	g = GridForm(snackScreen, _("Toggle status notifications"), 2, 4)
-	g.add(rl, 0, 0, anchorLeft=1, anchorTop=1, padding=(4, 0, 0, 1))
-	g.add(r, 1, 0)
-	g.add(bb, 1, 1, padding=(4, 1, 0, 0))
-	if bb.buttonPressed(g.runOnce()) != "cancel":
-		count = 0
-		for item in itemlist:
-			if item[0] != -1:
-				item[0] = r.getEntryValue(count)[1]
-			count = count + 1
-		writestatus(itemlist)
-		reload_required()
-	return 100
+    itemlist = readstatus()
+    rl = Label("")
+    r = CheckboxTree(12, scroll=1)
+    count = 0
+    for item in itemlist:
+        if item[0] != -1:
+            r.append(item[1], count, selected=item[0])
+        count = count + 1
+    bb = ButtonBar(snackScreen, ((_("Apply"), "apply"), (_("Cancel"), "cancel", ESC)), compact=1)
+    g = GridForm(snackScreen, _("Toggle status notifications"), 2, 4)
+    g.add(rl, 0, 0, anchorLeft=1, anchorTop=1, padding=(4, 0, 0, 1))
+    g.add(r, 1, 0)
+    g.add(bb, 1, 1, padding=(4, 1, 0, 0))
+    if bb.buttonPressed(g.runOnce()) != "cancel":
+        count = 0
+        for item in itemlist:
+            if item[0] != -1:
+                item[0] = r.getEntryValue(count)[1]
+            count = count + 1
+        writestatus(itemlist)
+        reload_required()
+    return 100
 
 
 def install(snackScreen, size, isInstalled):
-	out = ""
-	if isInstalled:
-		if subprocess.call(["byobu-launcher-uninstall"]) == 0:
-			out = _("Byobu will not be launched next time you login.")
-		button = messagebox(snackScreen, 60, 2, _("Message"), out, buttons=((_("Menu"), )))
-		return 101
-	else:
-		if subprocess.call(["byobu-launcher-install"]) == 0:
-			out = _("Byobu will be launched automatically next time you login.")
-		button = messagebox(snackScreen, 60, 2, "Message", out, buttons=((_("Menu"), )))
-		return 100
+    out = ""
+    if isInstalled:
+        if subprocess.call(["byobu-launcher-uninstall"]) == 0:
+            out = _("Byobu will not be launched next time you login.")
+        button = messagebox(snackScreen, 60, 2, _("Message"), out, buttons=((_("Menu"), )))
+        return 101
+    else:
+        if subprocess.call(["byobu-launcher-install"]) == 0:
+            out = _("Byobu will be launched automatically next time you login.")
+        button = messagebox(snackScreen, 60, 2, "Message", out, buttons=((_("Menu"), )))
+        return 100
 
 
 def appendtofile(p, s):
-	f = open(p, 'a')
-	try:
-		f.write(s)
-	except IOError:
-		f.close()
-		return
-	f.close()
-	return
+    f = open(p, 'a')
+    try:
+        f.write(s)
+    except IOError:
+        f.close()
+        return
+    f.close()
+    return
 
 
 def getesckey():
-	line = ""
-	if BYOBU_BACKEND == "tmux":
-		path = BYOBU_CONFIG_DIR + '/keybindings.tmux'
-		if os.path.exists(path):
-			for l in open(path):
-				if l.startswith("set -g prefix "):
-					line = l
-		else:
-			return DEF_ESC
-	else:
-		path = BYOBU_CONFIG_DIR + '/keybindings'
-		if os.path.exists(path):
-			for l in open(path):
-				if l.startswith("escape "):
-					line = l
-		else:
-			return DEF_ESC
-	if line == "":
-		return DEF_ESC
-	esc = line[line.find('^') + 1]
-	if esc == "`":
-		esc = " "
-	return esc
+    line = ""
+    if BYOBU_BACKEND == "tmux":
+        path = BYOBU_CONFIG_DIR + '/keybindings.tmux'
+        if os.path.exists(path):
+            for l in open(path):
+                if l.startswith("set -g prefix "):
+                    line = l
+        else:
+            return DEF_ESC
+    else:
+        path = BYOBU_CONFIG_DIR + '/keybindings'
+        if os.path.exists(path):
+            for l in open(path):
+                if l.startswith("escape "):
+                    line = l
+        else:
+            return DEF_ESC
+    if line == "":
+        return DEF_ESC
+    esc = line[line.find('^') + 1]
+    if esc == "`":
+        esc = " "
+    return esc
 
 
 def setesckey(key):
-	if key.isalpha():
-		# throw away outputs in order that the view isn't broken
-		nullf = open(os.devnull, "w")
-		subprocess.call(["byobu-ctrl-a", "screen", key], stdout=nullf)
-		nullf.close()
+    if key.isalpha():
+        # throw away outputs in order that the view isn't broken
+        nullf = open(os.devnull, "w")
+        subprocess.call(["byobu-ctrl-a", "screen", key], stdout=nullf)
+        nullf.close()
 
 
 def chgesc(snackScreen, size):
-	esc = Entry(2, text=getesckey(), returnExit=1)
-	escl = Label(_("Escape key: ctrl-"))
-	bb = ButtonBar(snackScreen, ((_("Apply"), "apply"), (_("Cancel"), "cancel", ESC)), compact=1)
-	g = GridForm(snackScreen, _("Change escape sequence"), 2, 4)
-	g.add(escl, 0, 0, anchorLeft=1, padding=(1, 0, 0, 1))
-	g.add(esc, 1, 0, anchorLeft=1)
-	g.add(bb, 1, 1)
-	g.setTimer(100)
-	loop = 1
-	while loop:
-		which = g.run()
-		if which == "TIMER":
-			val = esc.value()
-			if len(val) > 1:
-				esc.set(val[1])
-			# Ensure that escape sequence is not \ or /
-			if val == '/' or val == '\\':
-				esc.set(DEF_ESC)
-			# Ensure that the escape sequence is not set to a number
-			try:
-				dummy = int(esc.value())
-				esc.set(DEF_ESC)
-			except Exception:
-				# do nothing
-				dummy = "foo"
-		else:
-			loop = 0
-	snackScreen.popWindow()
-	button = bb.buttonPressed(which)
-	if button != "cancel":
-		setesckey(esc.value())
-		reload_required()
-		if button == "exit":
-			return 0
-	return 100
+    esc = Entry(2, text=getesckey(), returnExit=1)
+    escl = Label(_("Escape key: ctrl-"))
+    bb = ButtonBar(snackScreen, ((_("Apply"), "apply"), (_("Cancel"), "cancel", ESC)), compact=1)
+    g = GridForm(snackScreen, _("Change escape sequence"), 2, 4)
+    g.add(escl, 0, 0, anchorLeft=1, padding=(1, 0, 0, 1))
+    g.add(esc, 1, 0, anchorLeft=1)
+    g.add(bb, 1, 1)
+    g.setTimer(100)
+    loop = 1
+    while loop:
+        which = g.run()
+        if which == "TIMER":
+            val = esc.value()
+            if len(val) > 1:
+                esc.set(val[1])
+            # Ensure that escape sequence is not \ or /
+            if val == '/' or val == '\\':
+                esc.set(DEF_ESC)
+            # Ensure that the escape sequence is not set to a number
+            try:
+                dummy = int(esc.value())
+                esc.set(DEF_ESC)
+            except Exception:
+                # do nothing
+                dummy = "foo"
+        else:
+            loop = 0
+    snackScreen.popWindow()
+    button = bb.buttonPressed(which)
+    if button != "cancel":
+        setesckey(esc.value())
+        reload_required()
+        if button == "exit":
+            return 0
+    return 100
 
 
 def autolaunch():
-	if os.path.exists(BYOBU_CONFIG_DIR + "/disable-autolaunch"):
-		return 0
-	try:
-		for line in open("%s/.profile" % HOME):
-			if "byobu-launch" in line:
-				return 1
-	except Exception:
-		return 0
-	if os.path.exists("/etc/profile.d/Z97-%s.sh" % PKG):
-		return 1
-	return 0
+    if os.path.exists(BYOBU_CONFIG_DIR + "/disable-autolaunch"):
+        return 0
+    try:
+        for line in open("%s/.profile" % HOME):
+            if "byobu-launch" in line:
+                return 1
+    except Exception:
+        return 0
+    if os.path.exists("/etc/profile.d/Z97-%s.sh" % PKG):
+        return 1
+    return 0
 
 
 def main():
-	"""This is the main loop of our utility"""
-	size = terminal_size()
-	snackScreen = SnackScreen()
-	snackScreen.drawRootText(1, 0, _('Byobu Configuration Menu'))
-	snackScreen.pushHelpLine(_('<Tab> between elements | <Enter> selects | <Esc> exits'))
-	isInstalled = autolaunch()
-	tag = 100
-	while tag > 0:
-		tag = menu(snackScreen, size, isInstalled)
-		if tag == 1:
-			tag = help(snackScreen, size)
-		elif tag == 2:
-			tag = togglestatus(snackScreen, size)
-		elif tag == 3:
-			tag = chgesc(snackScreen, size)
-		elif tag == 4:
-			tag = install(snackScreen, size, isInstalled)
-			isInstalled = autolaunch()
-	snackScreen.finish()
-	sys.exit(0)
+    """This is the main loop of our utility"""
+    size = terminal_size()
+    snackScreen = SnackScreen()
+    snackScreen.drawRootText(1, 0, _('Byobu Configuration Menu'))
+    snackScreen.pushHelpLine(_('<Tab> between elements | <Enter> selects | <Esc> exits'))
+    isInstalled = autolaunch()
+    tag = 100
+    while tag > 0:
+        tag = menu(snackScreen, size, isInstalled)
+        if tag == 1:
+            tag = help(snackScreen, size)
+        elif tag == 2:
+            tag = togglestatus(snackScreen, size)
+        elif tag == 3:
+            tag = chgesc(snackScreen, size)
+        elif tag == 4:
+            tag = install(snackScreen, size, isInstalled)
+            isInstalled = autolaunch()
+    snackScreen.finish()
+    sys.exit(0)
 
 
 if __name__ == "__main__":
-	main()
+    main()

=== modified file 'usr/lib/byobu/include/select-session.py'
--- usr/lib/byobu/include/select-session.py	2019-06-12 00:31:00 +0000
+++ usr/lib/byobu/include/select-session.py	2019-10-06 07:04:52 +0000
@@ -25,11 +25,11 @@
 import sys
 import subprocess
 try:
-	# For Python3, try and import input from builtins
-	from builtins import input
+    # For Python3, try and import input from builtins
+    from builtins import input
 except Exception:
-	# But fall back to using the default input
-	True
+    # But fall back to using the default input
+    True
 
 
 PKG = "byobu"
@@ -46,161 +46,161 @@
 
 
 def get_sessions():
-	sessions = []
-	i = 0
-	output = False
-	if BYOBU_BACKEND == "screen":
-		try:
-			output = subprocess.Popen(["screen", "-ls"], stdout=subprocess.PIPE).communicate()[0]
-		except subprocess.CalledProcessError as cpe:
-			# screen -ls seems to always return 1
-			if cpe.returncode != 1:
-				raise
-			else:
-				output = cpe.output
-		if sys.stdout.encoding is None:
-			output = output.decode("UTF-8")
-		else:
-			output = output.decode(sys.stdout.encoding)
-		if output:
-			for s in output.splitlines():
-				s = re.sub(r'\s+', ' ', s)
-				# Ignore hidden sessions (named sessions that start with a "." or a "_")
-				if s and s != " " and (s.find(" ") == 0 and len(s) > 1 and s.count("..") == 0 and s.count("._") == 0):
-					text.append("screen: %s" % s.strip())
-					items = s.split(" ")
-					sessions.append("screen____%s" % items[1])
-					i += 1
-	if BYOBU_BACKEND == "tmux":
-		output = subprocess.Popen(["tmux", "list-sessions"], stdout=subprocess.PIPE).communicate()[0]
-		if sys.stdout.encoding is None:
-			output = output.decode("UTF-8")
-		else:
-			output = output.decode(sys.stdout.encoding)
-		if output:
-			for s in output.splitlines():
-				# Ignore hidden sessions (named sessions that start with a "_")
-				if s and not s.startswith("_"):
-					text.append("tmux: %s" % s.strip())
-					sessions.append("tmux____%s" % s.split(":")[0])
-					i += 1
-	return sessions
+    sessions = []
+    i = 0
+    output = False
+    if BYOBU_BACKEND == "screen":
+        try:
+            output = subprocess.Popen(["screen", "-ls"], stdout=subprocess.PIPE).communicate()[0]
+        except subprocess.CalledProcessError as cpe:
+            # screen -ls seems to always return 1
+            if cpe.returncode != 1:
+                raise
+            else:
+                output = cpe.output
+        if sys.stdout.encoding is None:
+            output = output.decode("UTF-8")
+        else:
+            output = output.decode(sys.stdout.encoding)
+        if output:
+            for s in output.splitlines():
+                s = re.sub(r'\s+', ' ', s)
+                # Ignore hidden sessions (named sessions that start with a "." or a "_")
+                if s and s != " " and (s.find(" ") == 0 and len(s) > 1 and s.count("..") == 0 and s.count("._") == 0):
+                    text.append("screen: %s" % s.strip())
+                    items = s.split(" ")
+                    sessions.append("screen____%s" % items[1])
+                    i += 1
+    if BYOBU_BACKEND == "tmux":
+        output = subprocess.Popen(["tmux", "list-sessions"], stdout=subprocess.PIPE).communicate()[0]
+        if sys.stdout.encoding is None:
+            output = output.decode("UTF-8")
+        else:
+            output = output.decode(sys.stdout.encoding)
+        if output:
+            for s in output.splitlines():
+                # Ignore hidden sessions (named sessions that start with a "_")
+                if s and not s.startswith("_"):
+                    text.append("tmux: %s" % s.strip())
+                    sessions.append("tmux____%s" % s.split(":")[0])
+                    i += 1
+    return sessions
 
 
 def cull_zombies(session_name):
-	# When using tmux session groups, closing a client will leave
-	# unattached "zombie" sessions that will never be reattached.
-	# Search for and kill any unattached hidden sessions in the same group
-	if BYOBU_BACKEND == "tmux":
-		output = subprocess.Popen(["tmux", "list-sessions"], stdout=subprocess.PIPE).communicate()[0]
-		if sys.stdout.encoding is None:
-			output = output.decode("UTF-8")
-		else:
-			output = output.decode(sys.stdout.encoding)
-		if not output:
-			return
-
-		# Find the master session to extract the group name. We use
-		# the group number to be extra sure the right session is getting
-		# killed. We don't want to accidentally kill the wrong one
-		pattern = "^%s:.+\\((group [^\\)]+)\\).*$" % session_name
-		master = re.search(pattern, output, re.MULTILINE)
-		if not master:
-			return
-
-		# Kill all the matching hidden & unattached sessions
-		pattern = "^_%s-\\d+:.+\\(%s\\)$" % (session_name, master.group(1))
-		for s in re.findall(pattern, output, re.MULTILINE):
-			subprocess.Popen(["tmux", "kill-session", "-t", s.split(":")[0]])
+    # When using tmux session groups, closing a client will leave
+    # unattached "zombie" sessions that will never be reattached.
+    # Search for and kill any unattached hidden sessions in the same group
+    if BYOBU_BACKEND == "tmux":
+        output = subprocess.Popen(["tmux", "list-sessions"], stdout=subprocess.PIPE).communicate()[0]
+        if sys.stdout.encoding is None:
+            output = output.decode("UTF-8")
+        else:
+            output = output.decode(sys.stdout.encoding)
+        if not output:
+            return
+
+        # Find the master session to extract the group name. We use
+        # the group number to be extra sure the right session is getting
+        # killed. We don't want to accidentally kill the wrong one
+        pattern = "^%s:.+\\((group [^\\)]+)\\).*$" % session_name
+        master = re.search(pattern, output, re.MULTILINE)
+        if not master:
+            return
+
+        # Kill all the matching hidden & unattached sessions
+        pattern = "^_%s-\\d+:.+\\(%s\\)$" % (session_name, master.group(1))
+        for s in re.findall(pattern, output, re.MULTILINE):
+            subprocess.Popen(["tmux", "kill-session", "-t", s.split(":")[0]])
 
 
 def update_environment(session):
-	backend, session_name = session.split("____", 2)
-	for var in BYOBU_UPDATE_ENVVARS:
-		value = os.getenv(var)
-		if value:
-			if backend == "tmux":
-				cmd = ["tmux", "setenv", "-t", session_name, var, value]
-			else:
-				cmd = ["screen", "-S", session_name, "-X", "setenv", var, value]
-			subprocess.call(cmd, stdout=open(os.devnull, "w"))
+    backend, session_name = session.split("____", 2)
+    for var in BYOBU_UPDATE_ENVVARS:
+        value = os.getenv(var)
+        if value:
+            if backend == "tmux":
+                cmd = ["tmux", "setenv", "-t", session_name, var, value]
+            else:
+                cmd = ["screen", "-S", session_name, "-X", "setenv", var, value]
+            subprocess.call(cmd, stdout=open(os.devnull, "w"))
 
 
 def attach_session(session):
-	update_environment(session)
-	backend, session_name = session.split("____", 2)
-	cull_zombies(session_name)
-	# must use the binary, not the wrapper!
-	if backend == "tmux":
-		os.execvp("tmux", ["tmux", "attach", "-t", session_name])
-	else:
-		os.execvp("screen", ["screen", "-AOxRR", session_name])
+    update_environment(session)
+    backend, session_name = session.split("____", 2)
+    cull_zombies(session_name)
+    # must use the binary, not the wrapper!
+    if backend == "tmux":
+        os.execvp("tmux", ["tmux", "attach", "-t", session_name])
+    else:
+        os.execvp("screen", ["screen", "-AOxRR", session_name])
 
 
 sessions = get_sessions()
 
 show_shell = os.path.exists("%s/.always-select" % (BYOBU_CONFIG_DIR))
 if len(sessions) > 1 or show_shell:
-	sessions.append("NEW")
-	text.append("Create a new Byobu session (%s)" % BYOBU_BACKEND)
-	sessions.append("SHELL")
-	text.append("Run a shell without Byobu (%s)" % SHELL)
+    sessions.append("NEW")
+    text.append("Create a new Byobu session (%s)" % BYOBU_BACKEND)
+    sessions.append("SHELL")
+    text.append("Run a shell without Byobu (%s)" % SHELL)
 
 if len(sessions) > 1:
-	sys.stdout.write("\nByobu sessions...\n\n")
-	tries = 0
-	while tries < 3:
-		i = 1
-		for s in text:
-			sys.stdout.write("  %d. %s\n" % (i, s))
-			i += 1
-		try:
-			try:
-				user_input = input("\nChoose 1-%d [1]: " % (i - 1))
-			except Exception:
-				user_input = ""
-			if not user_input or user_input == "":
-				choice = 1
-				break
-			try:
-				choice = int(user_input)
-			except Exception:
-				choice = int(eval(user_input))
-			if choice >= 1 and choice < i:
-				break
-			else:
-				tries += 1
-				choice = -1
-				sys.stderr.write("\nERROR: Invalid input\n")
-		except KeyboardInterrupt:
-			sys.stdout.write("\n")
-			sys.exit(0)
-		except Exception:
-			if choice == "" or choice == -1:
-				choice = 1
-				break
-			tries += 1
-			choice = -1
-			sys.stderr.write("\nERROR: Invalid input\n")
+    sys.stdout.write("\nByobu sessions...\n\n")
+    tries = 0
+    while tries < 3:
+        i = 1
+        for s in text:
+            sys.stdout.write("  %d. %s\n" % (i, s))
+            i += 1
+        try:
+            try:
+                user_input = input("\nChoose 1-%d [1]: " % (i - 1))
+            except Exception:
+                user_input = ""
+            if not user_input or user_input == "":
+                choice = 1
+                break
+            try:
+                choice = int(user_input)
+            except Exception:
+                choice = int(eval(user_input))
+            if choice >= 1 and choice < i:
+                break
+            else:
+                tries += 1
+                choice = -1
+                sys.stderr.write("\nERROR: Invalid input\n")
+        except KeyboardInterrupt:
+            sys.stdout.write("\n")
+            sys.exit(0)
+        except Exception:
+            if choice == "" or choice == -1:
+                choice = 1
+                break
+            tries += 1
+            choice = -1
+            sys.stderr.write("\nERROR: Invalid input\n")
 elif len(sessions) == 1:
-	# Auto-select the only session
-	choice = 1
+    # Auto-select the only session
+    choice = 1
 
 if choice >= 1:
-	if sessions[choice - 1] == "NEW":
-		# Create a new session
-		if BYOBU_BACKEND == "tmux":
-			os.execvp("byobu", ["byobu", "new-session", SHELL])
-		else:
-			os.execvp("byobu", ["byobu", SHELL])
-	elif sessions[choice - 1] == "SHELL":
-		os.execvp(SHELL, [SHELL])
-	else:
-		# Attach to the chosen session; must use the binary, not the wrapper!
-		attach_session(sessions[choice - 1])
+    if sessions[choice - 1] == "NEW":
+        # Create a new session
+        if BYOBU_BACKEND == "tmux":
+            os.execvp("byobu", ["byobu", "new-session", SHELL])
+        else:
+            os.execvp("byobu", ["byobu", SHELL])
+    elif sessions[choice - 1] == "SHELL":
+        os.execvp(SHELL, [SHELL])
+    else:
+        # Attach to the chosen session; must use the binary, not the wrapper!
+        attach_session(sessions[choice - 1])
 
 # No valid selection, default to the youngest session, create if necessary
 if BYOBU_BACKEND == "tmux":
-	os.execvp("tmux", ["tmux"])
+    os.execvp("tmux", ["tmux"])
 else:
-	os.execvp("screen", ["screen", "-AOxRR"])
+    os.execvp("screen", ["screen", "-AOxRR"])