Merge pull request #1130 from daredevil0905/master

fix: ask user again for valid column input in connect_four instead of throwing error
sukeesh · Aug 28, 2023 · e13af5c · e13af5c
2 parents 369a0e0 + e2af2ee
commit e13af5c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/jarviscli/plugins/connect_four.py b/jarviscli/plugins/connect_four.py
@@ -228,7 +228,15 @@ def game(jarvis, s):
 
         printBoard()
         while True:
-            column = int(input('Pick a column (1-7):\n'))
+
+            # Make sure column is numeric. If not then ask user for numeric input again instead of throwing error.
+            notNumericInputFlag = True
+            while notNumericInputFlag == True:
+                try:
+                    column = int(input('Pick a column (1-7):\n'))
+                    notNumericInputFlag = False
+                except ValueError:
+                    print("Enter a valid numeric input.")
             column -= 1
 
             # Make sure column is inbounds

diff --git a/jarviscli/plugins/evaluator.py b/jarviscli/plugins/evaluator.py
@@ -262,7 +262,7 @@ def calc(jarvis, s, calculator=sympy.sympify, formatter=None, do_evalf=True):
     s = format_expression(s)
 
     try:
-        result = calculator(jarvis, s)
+        result = calculator(s)
     except sympy.SympifyError:
         jarvis.say("Error: Something is wrong with your expression", Fore.RED)
         return