Merge lp:~tdaitx/byobu/lp-1711026-fix-pep8-E722 into lp:byobu

[Tiago Stürmer Daitx]

Byobu currently FTBFS on artful during pep8 verification due to the newly introduced E722 - ie. a 'try:/except:' block with a bare except that should be replaced by a 'try:except Exception:' block.

This patch fixes all bare except: currently in use in byobu.

Log error from build [1]:

# Check python syntax
pep8 --verbose --repeat --ignore W191,E501 usr/lib/byobu/include/config.py usr/lib/byobu/include/select-session.py
checking usr/lib/byobu/include/config.py
usr/lib/byobu/include/config.py:45:1: E722 do not use bare except'
usr/lib/byobu/include/config.py:84:2: E722 do not use bare except'
usr/lib/byobu/include/config.py:99:2: E722 do not use bare except'
usr/lib/byobu/include/config.py:113:3: E722 do not use bare except'
usr/lib/byobu/include/config.py:119:3: E722 do not use bare except'
usr/lib/byobu/include/config.py:176:4: E722 do not use bare except'
usr/lib/byobu/include/config.py:220:4: E722 do not use bare except'
usr/lib/byobu/include/config.py:226:4: E722 do not use bare except'
usr/lib/byobu/include/config.py:344:4: E722 do not use bare except'
usr/lib/byobu/include/config.py:366:2: E722 do not use bare except'
checking usr/lib/byobu/include/select-session.py
usr/lib/byobu/include/select-session.py:30:1: E722 do not use bare except'
usr/lib/byobu/include/select-session.py:159:4: E722 do not use bare except'
usr/lib/byobu/include/select-session.py:166:4: E722 do not use bare except'
usr/lib/byobu/include/select-session.py:177:3: E722 do not use bare except'
debian/rules:6: recipe for target 'override_dh_auto_build' failed
make[1]: *** [override_dh_auto_build] Error 1
make[1]: Leaving directory '/<<PKGBUILDDIR>>'

[1] https://launchpadlibrarian.net/332635385/buildlog_ubuntu-artful-amd64.byobu_5.121-0ubuntu1_BUILDING.txt.gz

=== modified file 'usr/lib/byobu/include/config.py.in'
--- usr/lib/byobu/include/config.py.in	2016-04-07 22:07:52 +0000
+++ usr/lib/byobu/include/config.py.in	2017-08-17 04:13:44 +0000
@@ -42,7 +42,7 @@
 try:
 	import snack
 	from snack import *
-except:
+except Exception:
 	error("Could not import the python snack module")
 
 
@@ -81,7 +81,7 @@
 		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 @@
 		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 @@
 			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 @@
 		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 @@
 		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 @@
 			try:
 				dummy = int(esc.value())
 				esc.set(DEF_ESC)
-			except:
+			except Exception:
 				# do nothing
 				dummy = "foo"
 		else:
@@ -363,7 +363,7 @@
 		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

=== modified file 'usr/lib/byobu/include/select-session.py'
--- usr/lib/byobu/include/select-session.py	2017-01-26 14:39:31 +0000
+++ usr/lib/byobu/include/select-session.py	2017-08-17 04:13:44 +0000
@@ -27,7 +27,7 @@
 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 @@
 		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 @@
 		except KeyboardInterrupt:
 			sys.stdout.write("\n")
 			sys.exit(0)
-		except:
+		except Exception:
 			if choice == "" or choice == -1:
 				choice = 1
 				break