[Jython-checkins] SF.net SVN: jython:[5757] trunk/jython/Lib/decimal.py

[<pj...@us...>]

Revision: 5757
          http://jython.svn.sourceforge.net/jython/?rev=5757&view=rev
Author:   pjenvey
Date:     2008-12-14 01:47:15 +0000 (Sun, 14 Dec 2008)

Log Message:
-----------
merge changes from:
http://svn.python.org/projects/python/branches/release25-maint/Lib/decimal.py -c 67699

Modified Paths:
--------------
    trunk/jython/Lib/decimal.py

Modified: trunk/jython/Lib/decimal.py
===================================================================
--- trunk/jython/Lib/decimal.py	2008-12-13 22:44:55 UTC (rev 5756)
+++ trunk/jython/Lib/decimal.py	2008-12-14 01:47:15 UTC (rev 5757)
@@ -2430,10 +2430,10 @@
             sn = self._isnan()
             on = other._isnan()
             if sn or on:
-                if on == 1 and sn != 2:
-                    return self._fix_nan(context)
-                if sn == 1 and on != 2:
-                    return other._fix_nan(context)
+                if on == 1 and sn == 0:
+                    return self._fix(context)
+                if sn == 1 and on == 0:
+                    return other._fix(context)
                 return self._check_nans(other, context)
 
         c = self.__cmp__(other)
@@ -2472,10 +2472,10 @@
             sn = self._isnan()
             on = other._isnan()
             if sn or on:
-                if on == 1 and sn != 2:
-                    return self._fix_nan(context)
-                if sn == 1 and on != 2:
-                    return other._fix_nan(context)
+                if on == 1 and sn == 0:
+                    return self._fix(context)
+                if sn == 1 and on == 0:
+                    return other._fix(context)
                 return self._check_nans(other, context)
 
         c = self.__cmp__(other)
@@ -3043,10 +3043,10 @@
             sn = self._isnan()
             on = other._isnan()
             if sn or on:
-                if on == 1 and sn != 2:
-                    return self._fix_nan(context)
-                if sn == 1 and on != 2:
-                    return other._fix_nan(context)
+                if on == 1 and sn == 0:
+                    return self._fix(context)
+                if sn == 1 and on == 0:
+                    return other._fix(context)
                 return self._check_nans(other, context)
 
         c = self.copy_abs().__cmp__(other.copy_abs())
@@ -3073,10 +3073,10 @@
             sn = self._isnan()
             on = other._isnan()
             if sn or on:
-                if on == 1 and sn != 2:
-                    return self._fix_nan(context)
-                if sn == 1 and on != 2:
-                    return other._fix_nan(context)
+                if on == 1 and sn == 0:
+                    return self._fix(context)
+                if sn == 1 and on == 0:
+                    return other._fix(context)
                 return self._check_nans(other, context)
 
         c = self.copy_abs().__cmp__(other.copy_abs())


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.