[Python-checkins] r68320 - in python/branches/release26-maint: Lib/decimal.py Misc/NEWS

[mark.dickinson]

Author: mark.dickinson
Date: Sun Jan  4 22:30:17 2009
New Revision: 68320

Log:
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
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Lib/decimal.py
   python/branches/release26-maint/Misc/NEWS

Modified: python/branches/release26-maint/Lib/decimal.py
==============================================================================
--- python/branches/release26-maint/Lib/decimal.py	(original)
+++ python/branches/release26-maint/Lib/decimal.py	Sun Jan  4 22:30:17 2009
@@ -1515,13 +1515,13 @@
 
     __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
@@ -3133,7 +3133,7 @@
         (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):
@@ -3147,7 +3147,7 @@
         (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):

Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Sun Jan  4 22:30:17 2009
@@ -158,6 +158,8 @@
 Library
 -------
 
+- Restore Python 2.3 compatibility for decimal.py.
+
 - Issue #1702551: distutils sdist was not excluding VCS directories under 
   Windows. Inital solution by Guy Dalberto.