Skip to content

Commit 2823031

Browse files
committed
Merged ianstalter123:py
2 parents e463caa + 8cca21e commit 2823031

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

calculator.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ def add(x, y):
66

77
return x + y
88

9-
def subtract(x, y)
9+
def subtract(x, y):
1010
"""This function subtracts two numbers"""
1111

1212
return x - y
@@ -33,13 +33,16 @@ def divide(x, y):
3333
num1 = int(input("Enter first number: "))
3434
num2 = int(input("Enter second number: "))
3535

36-
if choice == '1':
36+
if choice == 1:
3737
print(num1,"+",num2,"=", add(num1,num2))
38-
elif choice == '2':
38+
39+
elif choice == 2:
3940
print(num1,"-",num2,"=", subtract(num1,num2))
40-
elif choice == '5':
41-
print(num1,"*",num2,"=", multiply(num1,num2)
42-
elif choice == '4':
41+
42+
elif choice == 3:
43+
print(num1,"*",num2,"=", multiply(num1,num2))
44+
45+
elif choice == 4:
4346
print(num1,"/",num2,"=", divide(num1,num2))
4447
else:
4548
print("Invalid input")

0 commit comments

Comments
 (0)