From 315a20a6f3ae1365b7ab49ce8822a960f9a69733 Mon Sep 17 00:00:00 2001 From: Mark Dickinson Date: Sun, 4 Jan 2009 21:34:18 +0000 Subject: [PATCH] Merged revisions 68317-68318 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r68317 | mark.dickinson | 2009-01-04 21:22:02 +0000 (Sun, 04 Jan 2009) | 2 lines More Python 2.3 compatibility fixes for decimal.py. ........ r68318 | mark.dickinson | 2009-01-04 21:25:40 +0000 (Sun, 04 Jan 2009) | 2 lines Misc/NEWS entry for r68317 ........ --- Lib/decimal.py | 8 ++++---- Misc/NEWS | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Lib/decimal.py b/Lib/decimal.py index baff38bb5a6..b486d36f9ac 100644 --- a/Lib/decimal.py +++ b/Lib/decimal.py @@ -1555,13 +1555,13 @@ def __int__(self): __trunc__ = __int__ - @property def real(self): return self + real = property(real) - @property def imag(self): return Decimal(0) + imag = property(imag) def conjugate(self): return self @@ -3262,7 +3262,7 @@ def logical_or(self, other, context=None): (opa, opb) = self._fill_logical(context, self._int, other._int) # make the operation, and clean starting zeroes - result = "".join(str(int(a)|int(b)) for a,b in zip(opa,opb)) + result = "".join([str(int(a)|int(b)) for a,b in zip(opa,opb)]) return _dec_from_triple(0, result.lstrip('0') or '0', 0) def logical_xor(self, other, context=None): @@ -3276,7 +3276,7 @@ def logical_xor(self, other, context=None): (opa, opb) = self._fill_logical(context, self._int, other._int) # make the operation, and clean starting zeroes - result = "".join(str(int(a)^int(b)) for a,b in zip(opa,opb)) + result = "".join([str(int(a)^int(b)) for a,b in zip(opa,opb)]) return _dec_from_triple(0, result.lstrip('0') or '0', 0) def max_mag(self, other, context=None): diff --git a/Misc/NEWS b/Misc/NEWS index c629722fd05..495dd3e5014 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -82,6 +82,8 @@ Core and Builtins Library ------- +- Restore Python 2.3 compatibility for decimal.py. + - Issue #3638: Remove functions from _tkinter module level that depend on TkappObject to work with multiple threads.