My solution for the INE Introduction to Programming with Python project: Simple Calculator

README.md

@@ -6,11 +6,12 @@ Your job is to implement the code under `calculator.py`; note that we've left on
 
 ### Step 1:
 
-* Add
-* Subtract
-* Multiply
+- Add
+- Subtract
+- Multiply
 
 We've set up 3 functions here that you need to finish. These are fairly straight-forward and shouldn't give you too much trouble, think back to your lesson on operators!
+
 ##### To run tests, use these commands in the command line:
 
 ```bash
@@ -26,9 +27,9 @@ $ py.test test_multiply.py
 
 ### Step 2
 
-* Divide
+- Divide
 
-You'll notice here that divide is the only function that has two tests for it - that's because you'll need to program some exceptional behavior in case the user tries to divide by 0! 
+You'll notice here that divide is the only function that has two tests for it - that's because you'll need to program some exceptional behavior in case the user tries to divide by 0!
 
 If 0 is passed as a denominator when using this function, instead of an integer, return a string warning the user not to divide by 0. You can chose any message you want, for example `return "Invalid value for denominator, cant't divide by 0!"`
 
@@ -38,14 +39,14 @@ $ py.test test_divide.py
 
 ### Step 3
 
-* Square
-* Power
-* Square Root
+- Square
+- Power
+- Square Root
 
 Rounding out the last three tests are functions dealing with powers. They can be kind of tricky (especially finding the square root!) but you shouldn't have any problem if you review your lesson on operators.
 
 ```bash
 $ py.test test_square.py
 $ py.test test_power.py
-$ py.test test_sqrt.py
+$ py.test tests_sqrt.py
 ```

calculator.py

@@ -3,24 +3,29 @@ def add(x, y):
 
 
 def subtract(x, y):
-    pass
+    return x - y
 
 
 def divide(x, y):
-    pass
+    if y != 0:
+        return x / y
+    else:
+        return "Please ensure the denominator is a non-zero integer, as division by zero is not allowed."
+
 
 
 def multiply(x, y):
-    pass
+    return x * y
 
 
 def square(x):
-    pass
+    return x * x
+
 
 
 def power(x, y):
-    pass
+    return x ** y
 
 
 def sqrt(x):
-    pass
+    return x ** 0.5