diff options
author | Guido van Rossum <guido@python.org> | 2007-08-16 23:48:43 (GMT) |
---|---|---|
committer | Guido van Rossum <guido@python.org> | 2007-08-16 23:48:43 (GMT) |
commit | af554a0e17ceb0e6a3cc0c07e9cf6db2f80c1ad9 (patch) | |
tree | 7719b2787d82dd1cc7afad76ad989fc9b1f1504f /Lib/decimal.py | |
parent | 10c17ba299513184e39c85fc5c3ecaf2fd13187e (diff) | |
download | cpython-af554a0e17ceb0e6a3cc0c07e9cf6db2f80c1ad9.zip cpython-af554a0e17ceb0e6a3cc0c07e9cf6db2f80c1ad9.tar.gz cpython-af554a0e17ceb0e6a3cc0c07e9cf6db2f80c1ad9.tar.bz2 |
First merge from the trunk straight into the py3k branch. I'm not
using the message generated by svnmerge, because it contains a lot of
stuff about the Doc tree, which I'm not merging this time due to the
way the Doc tree was initially added. I am however adding roman.py
which was added later to Doc/tools. I'll try to diff the two Doc
trees separately to see if there's stuff I missed.
Diffstat (limited to 'Lib/decimal.py')
-rw-r--r-- | Lib/decimal.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/decimal.py b/Lib/decimal.py index 17d67d5..cca0a44 100644 --- a/Lib/decimal.py +++ b/Lib/decimal.py @@ -612,7 +612,8 @@ class Decimal(object): except ValueError: self._is_special = True self._sign, self._int, self._exp = \ - context._raise_error(ConversionSyntax) + context._raise_error(ConversionSyntax, + "Invalid literal for Decimal: %r" % value) return self raise TypeError("Cannot convert %r to Decimal" % value) |