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
........
This commit is contained in:
Mark Dickinson 2009-01-04 21:30:17 +00:00
parent 2e15999773
commit c95c6f1a04
2 changed files with 6 additions and 4 deletions

View File

@ -1515,13 +1515,13 @@ class Decimal(object):
__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 @@ class Decimal(object):
(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 @@ class Decimal(object):
(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):

View File

@ -158,6 +158,8 @@ Core and Builtins
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.