Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPablo Astigarraga <poteland@gmail.com>2010-04-05 19:57:15 (GMT)
committer Pablo Astigarraga <poteland@gmail.com>2010-04-05 19:57:15 (GMT)
commit808906e9af681573f19ddcc9247b7548ddb1290f (patch)
tree5d72bd0c162ac0a9e7d62fdf6deb399e54189a66
parent56ac758cd2c79416eff8e0a348eb05cce4c45eb9 (diff)
minor change in reduce method
-rw-r--r--fracciones.activity/fractionlogic.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/fracciones.activity/fractionlogic.py b/fracciones.activity/fractionlogic.py
index 5140936..86c5a3c 100644
--- a/fracciones.activity/fractionlogic.py
+++ b/fracciones.activity/fractionlogic.py
@@ -82,7 +82,7 @@ class FractionLogic(object):
#<--Math methods for the Fraction object begin here-->
-def calculate(fraction_1,fraction_2,operator,reduce=False):
+def calculate(fraction_1,fraction_2,operator,reduced_output=False):
"""Calls appropiate method depending on the operator received as an argument"""
"""Requires 2 fraction objects and a one character string with the operator (+,-,*,/)"""
result = ( )
@@ -94,7 +94,7 @@ def calculate(fraction_1,fraction_2,operator,reduce=False):
result = multiply(fraction_1,fraction_2)
elif operator == "/" :
result = divide(fraction_1,fraction_2)
- if reduce = False:
+ if reduced_output = False:
return result
else:
return reduce(result)