diff -Nru byobu-5.121/debian/changelog byobu-5.121/debian/changelog --- byobu-5.121/debian/changelog 2017-08-09 21:52:21.000000000 +0000 +++ byobu-5.121/debian/changelog 2017-08-17 15:18:22.000000000 +0000 @@ -1,3 +1,10 @@ +byobu (5.121-0ubuntu2) artful; urgency=medium + + * debian/patches/001-pep8-E722-fix.patch: + - fix pep8 check failing due to E722 (bare 'except:'). LP: #1711026. + + -- Tiago Stürmer Daitx Thu, 17 Aug 2017 15:18:22 +0000 + byobu (5.121-0ubuntu1) artful; urgency=medium [ Dustin Kirkland ] diff -Nru byobu-5.121/debian/patches/001-pep8-E722-fix.patch byobu-5.121/debian/patches/001-pep8-E722-fix.patch --- byobu-5.121/debian/patches/001-pep8-E722-fix.patch 1970-01-01 00:00:00.000000000 +0000 +++ byobu-5.121/debian/patches/001-pep8-E722-fix.patch 2017-08-17 15:18:13.000000000 +0000 @@ -0,0 +1,134 @@ +Description: Byobu fails pep8 check with error E722 + Error E722 has been recently introduced in pep8 to warn about 'bare except' - any + block of 'try:/except:' should be replaced by 'try:/except Exception:'. +Author: Tiago Stürmer Daitx +Bug: https://bugs.launchpad.net/byobu/+bug/1711026 +Forwarded: https://code.launchpad.net/~tdaitx/byobu/lp-1711026-fix-pep8-E722/+merge/329168 +Last-Update: 2017-08-17 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- byobu-5.121.orig/usr/lib/byobu/include/config.py.in ++++ byobu-5.121/usr/lib/byobu/include/config.py.in +@@ -42,7 +42,7 @@ def error(msg): + try: + import snack + from snack import * +-except: ++except Exception: + error("Could not import the python snack module") + + +@@ -81,7 +81,7 @@ def ioctl_GWINSZ(fd): + import struct + import os + cr = struct.unpack('hh', fcntl.ioctl(fd, termios.TIOCGWINSZ, '1234')) +- except: ++ except Exception: + return None + return cr + +@@ -96,7 +96,7 @@ def reload_required(): + f.close() + if BYOBU_BACKEND == "screen": + subprocess.call([BYOBU_BACKEND, "-X", "at", "0", "source", "%s/profile" % BYOBU_CONFIG_DIR]) +- except: ++ except Exception: + True + + +@@ -110,13 +110,13 @@ def terminal_size(): + fd = os.open(os.ctermid(), os.O_RDONLY) + cr = ioctl_GWINSZ(fd) + os.close(fd) +- except: ++ except Exception: + pass + if not cr: + # env vars or finally defaults + try: + cr = (env['LINES'], env['COLUMNS']) +- except: ++ except Exception: + cr = (25, 80) + # reverse rows, cols + return int(cr[1] - 5), int(cr[0] - 5) +@@ -173,7 +173,7 @@ def readstatus(): + if os.path.exists(f): + try: + exec(open(f).read(), glo, loc) +- except: ++ except Exception: + error("Invalid configuration [%s]" % f) + if BYOBU_BACKEND == "tmux": + items = "%s %s" % (loc["tmux_left"], loc["tmux_right"]) +@@ -217,13 +217,13 @@ def writestatus(items): + if key.startswith(BYOBU_BACKEND): + try: + f = open(path, "r") +- except: ++ except Exception: + f = open(SHARE + '/status/status', "r") + lines = f.readlines() + f.close() + try: + f = open(path, "w") +- except: ++ except Exception: + f = open(path, "a+") + for l in lines: + if l.startswith("%s=" % key): +@@ -341,7 +341,7 @@ def chgesc(snackScreen, size): + try: + dummy = int(esc.value()) + esc.set(DEF_ESC) +- except: ++ except Exception: + # do nothing + dummy = "foo" + else: +@@ -363,7 +363,7 @@ def autolaunch(): + for line in open("%s/.profile" % HOME): + if "byobu-launch" in line: + return 1 +- except: ++ except Exception: + return 0 + if os.path.exists("/etc/profile.d/Z97-%s.sh" % PKG): + return 1 +--- byobu-5.121.orig/usr/lib/byobu/include/select-session.py ++++ byobu-5.121/usr/lib/byobu/include/select-session.py +@@ -27,7 +27,7 @@ import subprocess + try: + # For Python3, try and import input from builtins + from builtins import input +-except: ++except Exception: + # But fall back to using the default input + True + +@@ -156,14 +156,14 @@ if len(sessions) > 1: + try: + try: + user_input = input("\nChoose 1-%d [1]: " % (i - 1)) +- except: ++ except Exception: + user_input = "" + if not user_input or user_input == "": + choice = 1 + break + try: + choice = int(user_input) +- except: ++ except Exception: + choice = int(eval(user_input)) + if choice >= 1 and choice < i: + break +@@ -174,7 +174,7 @@ if len(sessions) > 1: + except KeyboardInterrupt: + sys.stdout.write("\n") + sys.exit(0) +- except: ++ except Exception: + if choice == "" or choice == -1: + choice = 1 + break diff -Nru byobu-5.121/debian/patches/series byobu-5.121/debian/patches/series --- byobu-5.121/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ byobu-5.121/debian/patches/series 2017-08-16 02:52:35.000000000 +0000 @@ -0,0 +1 @@ +001-pep8-E722-fix.patch