Issue #2482: Make sure that the coefficient of a Decimal instance
is stored as a str instance rather than a unicode instance.
Backported from Python 2.6 (see r61904).
diff --git a/Lib/decimal.py b/Lib/decimal.py
index 8b3e252..591f4de 100644
--- a/Lib/decimal.py
+++ b/Lib/decimal.py
@@ -549,17 +549,17 @@
fracpart = m.group('frac')
exp = int(m.group('exp') or '0')
if fracpart is not None:
- self._int = (intpart+fracpart).lstrip('0') or '0'
+ self._int = str((intpart+fracpart).lstrip('0') or '0')
self._exp = exp - len(fracpart)
else:
- self._int = intpart.lstrip('0') or '0'
+ self._int = str(intpart.lstrip('0') or '0')
self._exp = exp
self._is_special = False
else:
diag = m.group('diag')
if diag is not None:
# NaN
- self._int = diag.lstrip('0')
+ self._int = str(diag.lstrip('0'))
if m.group('signal'):
self._exp = 'N'
else:
diff --git a/Lib/test/test_decimal.py b/Lib/test/test_decimal.py
index efaa174..db55b83 100644
--- a/Lib/test/test_decimal.py
+++ b/Lib/test/test_decimal.py
@@ -429,6 +429,12 @@
#just not a number
self.assertEqual(str(Decimal('ugly')), 'NaN')
+ #unicode strings should be permitted
+ self.assertEqual(str(Decimal(u'0E-017')), '0E-17')
+ self.assertEqual(str(Decimal(u'45')), '45')
+ self.assertEqual(str(Decimal(u'-Inf')), '-Infinity')
+ self.assertEqual(str(Decimal(u'NaN123')), 'NaN123')
+
def test_explicit_from_tuples(self):
#zero
@@ -1032,6 +1038,16 @@
self.assertEqual(str(d), '15.32') # str
self.assertEqual(repr(d), 'Decimal("15.32")') # repr
+ # result type of string methods should be str, not unicode
+ unicode_inputs = [u'123.4', u'0.5E2', u'Infinity', u'sNaN',
+ u'-0.0E100', u'-NaN001', u'-Inf']
+
+ for u in unicode_inputs:
+ d = Decimal(u)
+ self.assertEqual(type(str(d)), str)
+ self.assertEqual(type(repr(d)), str)
+ self.assertEqual(type(d.to_eng_string()), str)
+
def test_tonum_methods(self):
#Test float, int and long methods.