jython
diff --git a/‎Lib/test/test_math_jy.py‎
Lines changed: 11 additions & 0 deletions b/‎Lib/test/test_math_jy.py‎
Lines changed: 11 additions & 0 deletions
diff --git a/‎src/org/python/compiler/Module.java‎
Lines changed: 9 additions & 4 deletions b/‎src/org/python/compiler/Module.java‎
Lines changed: 9 additions & 4 deletions
@@ -7,6 +7,7 @@
 from test import test_support
 
 inf = float('inf')
+ninf = float('-inf')
 nan = float('nan')
 
 class MathTestCase(unittest.TestCase):
@@ -17,6 +18,16 @@ def test_frexp(self):
         self.assertNotEqual(mantissa, mantissa)
         self.assertEqual(exponent, 0)
 
+    def test_fmod(self):
+        self.assertEqual(-1e-100, math.fmod(-1e-100, 1e100))
+
+    def test_hypot(self):
+        self.assert_(math.isnan(math.hypot(nan, nan)))
+        self.assertEqual(inf, math.hypot(inf, 4))
+        self.assertEqual(inf, math.hypot(4, inf))
+        self.assertEqual(inf, math.hypot(ninf, 4))
+        self.assertEqual(inf, math.hypot(4, ninf))
+
 
 def test_main():
     test_support.run_unittest(MathTestCase)
 
@@ -72,7 +72,8 @@ public boolean equals(Object o) {
 }
 
 class PyFloatConstant extends Constant implements ClassConstants, Opcodes {
-
+    private static final double ZERO = 0.0;
+    
     final double value;
 
     PyFloatConstant(double value) {
@@ -98,10 +99,14 @@ public int hashCode() {
     @Override
     public boolean equals(Object o) {
         if (o instanceof PyFloatConstant) {
-            return ((PyFloatConstant) o).value == value;
-        } else {
-            return false;
+            double oVal = ((PyFloatConstant)o).value;
+            if (ZERO == value) {
+                // math.copysign() needs to distinguish signs of zeroes
+                return oVal == value && Double.toString(oVal).equals(Double.toString(value));
+            }
+            return oVal == value;
         }
+        return false;
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,8 @@ public boolean equals(Object o) {`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`class PyFloatConstant extends Constant implements ClassConstants, Opcodes {`
`75`		`-`
	`75`	`+ private static final double ZERO = 0.0;`
	`76`	`+`
`76`	`77`	`final double value;`
`77`	`78`
`78`	`79`	`PyFloatConstant(double value) {`
`@@ -98,10 +99,14 @@ public int hashCode() {`
`98`	`99`	`@Override`
`99`	`100`	`public boolean equals(Object o) {`
`100`	`101`	`if (o instanceof PyFloatConstant) {`
`101`		`- return ((PyFloatConstant) o).value == value;`
`102`		`- } else {`
`103`		`- return false;`
	`102`	`+ double oVal = ((PyFloatConstant)o).value;`
	`103`	`+ if (ZERO == value) {`
	`104`	`+ // math.copysign() needs to distinguish signs of zeroes`
	`105`	`+ return oVal == value && Double.toString(oVal).equals(Double.toString(value));`
	`106`	`+ }`
	`107`	`+ return oVal == value;`
`104`	`108`	`}`
	`109`	`+ return false;`
`105`	`110`	`}`
`106`	`111`	`}`
`107`	`112`