summaryrefslogtreecommitdiff
path: root/poezio/core/commands.py
diff options
context:
space:
mode:
authormathieui <mathieui@mathieui.net>2016-08-28 16:51:24 +0200
committermathieui <mathieui@mathieui.net>2016-08-28 16:51:24 +0200
commit2252f2779c3568923d677491ee7df394abeadb6d (patch)
treeee6ff7b1eecb07e6c262f4de5a6475719b35ac0f /poezio/core/commands.py
parent50d6edc30b13dc70c4970773dbae4305263b641f (diff)
downloadpoezio-2252f2779c3568923d677491ee7df394abeadb6d.tar.gz
poezio-2252f2779c3568923d677491ee7df394abeadb6d.tar.bz2
poezio-2252f2779c3568923d677491ee7df394abeadb6d.tar.xz
poezio-2252f2779c3568923d677491ee7df394abeadb6d.zip
Fix some type inconsistencies
(pylint)
Diffstat (limited to 'poezio/core/commands.py')
-rw-r--r--poezio/core/commands.py28
1 files changed, 14 insertions, 14 deletions
diff --git a/poezio/core/commands.py b/poezio/core/commands.py
index dbee556f..1790cd89 100644
--- a/poezio/core/commands.py
+++ b/poezio/core/commands.py
@@ -188,32 +188,32 @@ class CommandCore:
@command_args_parser.quoted(1)
def win(self, args):
"""
- /win <number>
+ /win <number or name>
"""
if args is None:
return self.help('win')
- nb = args[0]
+ name = args[0]
try:
- nb = int(nb)
+ number = int(name)
except ValueError:
- pass
- if self.core.current_tab_nb == nb:
+ number = -1
+ if number != -1 and self.core.current_tab_nb == number:
return
+ prev_nb = self.core.previous_tab_nb
self.core.previous_tab_nb = self.core.current_tab_nb
old_tab = self.core.current_tab()
- if isinstance(nb, int):
- if 0 <= nb < len(self.core.tabs):
- if not self.core.tabs[nb]:
- return
- self.core.current_tab_nb = nb
+ if 0 <= number < len(self.core.tabs):
+ if not self.core.tabs[number]:
+ self.core.previous_tab_nb = prev_nb
+ return
+ self.core.current_tab_nb = number
else:
matchs = []
for tab in self.core.tabs:
- for name in tab.matching_names():
- if nb.lower() in name[1].lower():
- matchs.append((name[0], tab))
- self.core.current_tab_nb = tab.nb
+ for tab_name in tab.matching_names():
+ if name.lower() in tab_name[1].lower():
+ matchs.append((tab_name[0], tab))
if not matchs:
return
tab = min(matchs, key=lambda m: m[0])[1]