From 1f8b795e9a03d4bf1fd758965582b28e38ac271e Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Mon, 13 May 2019 20:08:31 -0600 Subject: [PATCH] Pylint cleanup for ddrescue-tui part 2 --- .bin/Scripts/functions/ddrescue.py | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/.bin/Scripts/functions/ddrescue.py b/.bin/Scripts/functions/ddrescue.py index 8fca251b..80bffa2f 100644 --- a/.bin/Scripts/functions/ddrescue.py +++ b/.bin/Scripts/functions/ddrescue.py @@ -361,28 +361,29 @@ class RecoveryState(): return min_percent def fix_tmux_panes(self, forced=False): + # pylint: disable=too-many-branches,too-many-locals """Fix pane sizes if the winodw has been resized.""" needs_fixed = False # Check layout - for k, v in TMUX_LAYOUT.items(): - if not v.get('Check'): + for pane, pane_data in TMUX_LAYOUT.items(): + if not pane_data.get('Check'): # Not concerned with the size of this pane continue # Get target target = None - if k != 'Current': - if k not in self.panes: + if pane != 'Current': + if pane not in self.panes: # Skip missing panes continue else: - target = self.panes[k] + target = self.panes[pane] # Check pane size - x, y = tmux_get_pane_size(pane_id=target) - if v.get('x', False) and v['x'] != x: + size_x, size_y = tmux_get_pane_size(pane_id=target) + if pane_data.get('x', False) and pane_data['x'] != size_x: needs_fixed = True - if v.get('y', False) and v['y'] != y: + if pane_data.get('y', False) and pane_data['y'] != size_y: needs_fixed = True # Bail? @@ -393,18 +394,18 @@ class RecoveryState(): tmux_kill_pane(self.panes['Destination']) # Update layout - for k, v in TMUX_LAYOUT.items(): + for pane, pane_data in TMUX_LAYOUT.items(): # Get target target = None - if k != 'Current': - if k not in self.panes: + if pane != 'Current': + if pane not in self.panes: # Skip missing panes continue else: - target = self.panes[k] + target = self.panes[pane] # Resize pane - tmux_resize_pane(pane_id=target, **v) + tmux_resize_pane(pane_id=target, **pane_data) # Calc Source/Destination pane sizes width, height = tmux_get_pane_size()