Skip to content

Commit 5a8d65f

Browse files
committed
python2 compatible
1 parent 0898393 commit 5a8d65f

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

calculator.py

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
"""
1919

2020
import math
21+
import sys
22+
2123

2224
def main():
2325

@@ -33,26 +35,28 @@ def calc(k):
3335
try:
3436
k = eval(k)
3537
except ZeroDivisionError:
36-
print ("Can't divide by 0")
38+
print("Can't divide by 0")
3739
exit()
3840
except NameError:
39-
print ("Invalid input")
41+
print('Invalid input')
4042
exit()
4143

4244
return k
4345

46+
print("\nScientific Calculator\nEg: pi * sin(90) - sqrt(81)")
4447

45-
print ("\nScientific Calculator\nEg: pi * sin(90) - sqrt(81)")
46-
47-
k = raw_input("\nWhat is ") # Using input() function is causing NameError. Changing it to raw_input() fixes this.
48+
if sys.version_info.major >= 3:
49+
k = input("\nWhat is ")
50+
else:
51+
k = raw_input("\nWhat is ")
4852

4953
k = k.replace(' ', '')
5054
k = k.replace('^', '**')
5155
k = k.replace('=', '')
5256
k = k.replace('?', '')
5357
k = k.replace('%', '/100')
5458

55-
print ("\n" + str(calc(k)))
59+
print("\n" + str(calc(k)))
5660

57-
if __name__ == "__main__":
61+
if __name__ == '__main__':
5862
main()

0 commit comments

Comments
 (0)