magical
/
bbj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use tuples for membership tests instead of lists

pull/4/head
Blake DeMarcy 2017-04-22 18:12:39 -05:00
parent d8c3a38f8d
commit 095bbcfe76
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
clients/urwid/main.py
View File

@ -1407,7 +1407,7 @@ class Prompt(urwid.Edit):
if not super(Prompt, self).keypress(size, key): if not super(Prompt, self).keypress(size, key):
return return
elif key[0:4] not in ["meta", "ctrl"]: elif key[0:4] not in ("meta", "ctrl"):
return key return key
column = self.get_cursor_coords((app.loop.screen_size[0],))[0] column = self.get_cursor_coords((app.loop.screen_size[0],))[0]
@ -1453,7 +1453,7 @@ class FootPrompt(Prompt):
app.set_default_footer() app.set_default_footer()
self.callback(self.get_edit_text(), *self.args) self.callback(self.get_edit_text(), *self.args)
elif key.lower() in ["esc", "ctrl g", "ctrl c"]: elif key.lower() in ("esc", "ctrl g", "ctrl c"):
app.loop.widget.focus_position = "body" app.loop.widget.focus_position = "body"
app.set_default_footer() app.set_default_footer()
@ -1614,24 +1614,24 @@ class OptionsMenu(urwid.LineBox):
elif not super(OptionsMenu, self).keypress(size, key): elif not super(OptionsMenu, self).keypress(size, key):
return return
elif key in ["shift down", "J", "N"]: elif key in ("shift down", "J", "N"):
for x in range(app.prefs["shift_multiplier"]): for x in range(app.prefs["shift_multiplier"]):
self.keypress(size, "down") self.keypress(size, "down")
elif key in ["shift up", "K", "P"]: elif key in ("shift up", "K", "P"):
for x in range(app.prefs["shift_multiplier"]): for x in range(app.prefs["shift_multiplier"]):
self.keypress(size, "up") self.keypress(size, "up")
elif key in ["ctrl n", "j", "n"]: elif key in ("ctrl n", "j", "n"):
return self.keypress(size, "down") return self.keypress(size, "down")
elif key in ["ctrl p", "k", "p"]: elif key in ("ctrl p", "k", "p"):
return self.keypress(size, "up") return self.keypress(size, "up")
elif keyl in ["left", "h", "q"]: elif keyl in ("left", "h", "q"):
app.loop.widget = app.loop.widget[0] app.loop.widget = app.loop.widget[0]
elif keyl in ["right", "l"]: elif keyl in ("right", "l"):
return self.keypress(size, "enter") return self.keypress(size, "enter")
elif keyl == "ctrl l": elif keyl == "ctrl l":
@ -1648,24 +1648,24 @@ class ActionBox(urwid.ListBox):
overlay = app.overlay_p() overlay = app.overlay_p()
keyl = key.lower() keyl = key.lower()
if key in ["j", "n", "ctrl n"]: if key in ("j", "n", "ctrl n"):
self._keypress_down(size) self._keypress_down(size)
elif key in ["k", "p", "ctrl p"]: elif key in ("k", "p", "ctrl p"):
self._keypress_up(size) self._keypress_up(size)
elif key in ["shift down", "J", "N"]: elif key in ("shift down", "J", "N"):
for x in range(app.prefs["shift_multiplier"]): for x in range(app.prefs["shift_multiplier"]):
self._keypress_down(size) self._keypress_down(size)
elif key in ["shift up", "K", "P"]: elif key in ("shift up", "K", "P"):
for x in range(app.prefs["shift_multiplier"]): for x in range(app.prefs["shift_multiplier"]):
self._keypress_up(size) self._keypress_up(size)
elif keyl in ["l", "right"]: elif keyl in ("l", "right"):
self.keypress(size, "enter") self.keypress(size, "enter")
elif keyl in ["esc", "h", "left", "q"]: elif keyl in ("esc", "h", "left", "q"):
app.back(keyl == "q") app.back(keyl == "q")
elif keyl == "b": elif keyl == "b":
@ -1705,7 +1705,7 @@ class ActionBox(urwid.ListBox):
elif keyl in "c+" and not overlay: elif keyl in "c+" and not overlay:
app.compose() app.compose()
elif keyl in ["r", "f5"] and not overlay: elif keyl in ("r", "f5") and not overlay:
app.refresh() app.refresh()
elif key == "~": elif key == "~":