[Python-checkins] python/dist/src/Lib decimal.py, 1.31.2.5, 1.31.2.6

Thu Sep 15 19:40:31 CEST 2005

Update of /cvsroot/python/python/dist/src/Lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31585
Modified Files:
 Tag: release24-maint
	decimal.py 
Log Message:
Sync-up with minor changes to the head.
Index: decimal.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/decimal.py,v
retrieving revision 1.31.2.5
retrieving revision 1.31.2.6
diff -u -d -r1.31.2.5 -r1.31.2.6

--- decimal.py	22 Aug 2005 19:35:24 -0000	1.31.2.5
+++ decimal.py	15 Sep 2005 17:40:28 -0000	1.31.2.6
@@ -515,7 +515,7 @@
 if isinstance(value, (list,tuple)):
 if len(value) != 3:
 raise ValueError, 'Invalid arguments'
- if value[0] not in [0,1]:
+ if value[0] not in (0,1):
 raise ValueError, 'Invalid sign'
 for digit in value[1]:
 if not isinstance(digit, (int,long)) or digit < 0:
@@ -760,18 +760,19 @@
 Captures all of the information in the underlying representation.
 """
 
- if self._isnan():
- minus = '-'*self._sign
- if self._int == (0,):
- info = ''
- else:
- info = ''.join(map(str, self._int))
- if self._isnan() == 2:
- return minus + 'sNaN' + info
- return minus + 'NaN' + info
- if self._isinfinity():
- minus = '-'*self._sign
- return minus + 'Infinity'
+ if self._is_special:
+ if self._isnan():
+ minus = '-'*self._sign
+ if self._int == (0,):
+ info = ''
+ else:
+ info = ''.join(map(str, self._int))
+ if self._isnan() == 2:
+ return minus + 'sNaN' + info
+ return minus + 'NaN' + info
+ if self._isinfinity():
+ minus = '-'*self._sign
+ return minus + 'Infinity'
 
 if context is None:
 context = getcontext()
@@ -1446,7 +1447,7 @@
 return float(str(self))
 
 def __int__(self):
- """Converts self to a int, truncating if necessary."""
+ """Converts self to an int, truncating if necessary."""
 if self._is_special:
 if self._isnan():
 context = getcontext()
