mirror of
				https://git.proxmox.com/git/mirror_zfs.git
				synced 2025-10-26 18:05:04 +03:00 
			
		
		
		
	Correct flake8 errors after STYLE builder update
Fix new flake8 errors related to bare excepts and ambiguous variable names due to a STYLE builder update. Reviewed-by: George Melikov <mail@gmelikov.ru> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Giuseppe Di Natale <dinatale2@llnl.gov> Closes #6776
This commit is contained in:
		
							parent
							
								
									d9daa7abcf
								
							
						
					
					
						commit
						63e5e960ba
					
				@ -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
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -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):
 | 
			
		||||
        """
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user