Merge pull request #126 from olcf/ngin_improve_interpreter

keyboard interrupt issues
olcf · Oct 2, 2019 · 772d5cd · 772d5cd
2 parents 6fd8e9e + 6ab7b03
commit 772d5cd
Showing 1 changed file with 19 additions and 1 deletion.
diff --git a/libpkpass/commands/interpreter.py b/libpkpass/commands/interpreter.py
@@ -43,7 +43,7 @@ class Interpreter(Command):
     def _run_command_execution(self):
         """ Run function for class. """
     ####################################################################
-        Interactive(self.args, self.identities).cmdloop()
+        Interactive(self.args, self.identities).cmdloop_with_keyboard_interrupt()
 
     ####################################################################
     def _validate_args(self):
@@ -105,6 +105,24 @@ def __init__(self, args, recipients_database):
         # We basically need to grab the first argument and ditch it
         self.parsedargs = {}
 
+
+    ####################################################################
+    def cmdloop_with_keyboard_interrupt(self):
+        """handle keyboard interrupts"""
+    ####################################################################
+        breaker = False
+        first = True
+        while breaker is not True:
+            try:
+                if first:
+                    self.cmdloop()
+                else:
+                    self.cmdloop(intro='')
+                breaker = True
+            except KeyboardInterrupt:
+                first = False
+                sys.stdout.write('\n')
+
     ####################################################################
     def _change_pwstore(self):
         """Change directory"""