diff options
| -rwxr-xr-x | cmd/arcstat/arcstat.py | 2 | ||||
| -rwxr-xr-x | tests/test-runner/bin/test-runner.py | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/cmd/arcstat/arcstat.py b/cmd/arcstat/arcstat.py index b743fd8bc..d969da8d4 100755 --- a/cmd/arcstat/arcstat.py +++ b/cmd/arcstat/arcstat.py @@ -238,7 +238,7 @@ def get_terminal_lines(): data = fcntl.ioctl(sys.stdout.fileno(), termios.TIOCGWINSZ, '1234') sz = struct.unpack('hh', data) return sz[0] - except: + except Exception: pass diff --git a/tests/test-runner/bin/test-runner.py b/tests/test-runner/bin/test-runner.py index 4c53257df..8ad903c24 100755 --- a/tests/test-runner/bin/test-runner.py +++ b/tests/test-runner/bin/test-runner.py @@ -150,7 +150,7 @@ class Cmd(object): try: kp = Popen(cmd) kp.wait() - except: + except Exception: pass def update_cmd_privs(self, cmd, user): @@ -629,16 +629,16 @@ class TestRun(object): base = self.outputdir while not done: - l = [] + paths = [] components -= 1 for testfile in tmp_dict.keys(): uniq = '/'.join(testfile.split('/')[components:]).lstrip('/') - if uniq not in l: - l.append(uniq) + if uniq not in paths: + paths.append(uniq) tmp_dict[testfile].outputdir = os.path.join(base, uniq) else: break - done = total == len(l) + done = total == len(paths) def setup_logging(self, options): """ |