summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorThomas Wouters <thomas@python.org>2006-04-21 11:30:52 (GMT)
committerThomas Wouters <thomas@python.org>2006-04-21 11:30:52 (GMT)
commitdcc6d32ee4b9e7517da2af4975dbd273b8cf556b (patch)
tree0e45174da07b52f10ff3d1a31ed99ed02e56cced /Lib
parent3fc2ca3884bec42d9b68336183bb07a83311ea56 (diff)
downloadcpython-dcc6d32ee4b9e7517da2af4975dbd273b8cf556b.zip
cpython-dcc6d32ee4b9e7517da2af4975dbd273b8cf556b.tar.gz
cpython-dcc6d32ee4b9e7517da2af4975dbd273b8cf556b.tar.bz2
Fix merge glitch.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_decimal.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_decimal.py b/Lib/test/test_decimal.py
index 341ad6d..40c4466 100644
--- a/Lib/test/test_decimal.py
+++ b/Lib/test/test_decimal.py
@@ -511,7 +511,7 @@ class DecimalImplicitConstructionTest(unittest.TestCase):
('+', '__add__', '__radd__'),
('-', '__sub__', '__rsub__'),
('*', '__mul__', '__rmul__'),
- ('/', '__truediv__', '__rtruediv__')
+ ('/', '__truediv__', '__rtruediv__'),
('%', '__mod__', '__rmod__'),
('//', '__floordiv__', '__rfloordiv__'),
('**', '__pow__', '__rpow__')