pySim-shell: Use iteration when unregistering command sets
This makes it more easy to extend in the future
Change-Id: I53ecf03d330fe1eb80ee920e6f9c8185f9be48fd
diff --git a/pySim-shell.py b/pySim-shell.py
index ff12396..1fc09ef 100755
--- a/pySim-shell.py
+++ b/pySim-shell.py
@@ -138,12 +138,10 @@
# Unequip everything from pySim-shell that would not work in unequipped state
if self.rs:
self.rs.unregister_cmds(self)
- cmd_set = self.find_commandsets(Iso7816Commands)
- if cmd_set:
- self.unregister_command_set(cmd_set[0])
- cmd_set = self.find_commandsets(PySimCommands)
- if cmd_set:
- self.unregister_command_set(cmd_set[0])
+ for cmds in [Iso7816Commands, PySimCommands]:
+ cmd_set = self.find_commandsets(cmds)
+ if cmd_set:
+ self.unregister_command_set(cmd_set[0])
self.card = card
self.rs = rs