Fix bug so that None does not equal 0.

alanfidler · Aug 26, 2013 · 9e6523f · 9e6523f
1 parent 755721f
commit 9e6523f
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 4 deletions.
diff --git a/src/long.js b/src/long.js
@@ -523,11 +523,11 @@ Sk.builtin.lng.prototype.longCompare = function(other)
 }
 
 Sk.builtin.lng.prototype.__eq__ = function(me, other) {
-	return me.longCompare(other) == 0;
+	return me.longCompare(other) == 0 && !(other instanceof Sk.builtin.none);
 };
 
 Sk.builtin.lng.prototype.__ne__ = function(me, other) {
-	return me.longCompare(other) != 0;
+	return me.longCompare(other) != 0 || (other instanceof Sk.builtin.none);
 };
 
 Sk.builtin.lng.prototype.__lt__ = function(me, other) {

diff --git a/src/number.js b/src/number.js
@@ -644,11 +644,11 @@ Sk.builtin.nmber.prototype.numberCompare = function(other)
 }
 
 Sk.builtin.nmber.prototype.__eq__ = function(me, other) {
-	return me.numberCompare(other) == 0;
+	return (me.numberCompare(other) == 0) && !(other instanceof Sk.builtin.none);
 };
 
 Sk.builtin.nmber.prototype.__ne__ = function(me, other) {
-	return me.numberCompare(other) != 0;
+	return (me.numberCompare(other) != 0) || (other instanceof Sk.builtin.none);
 };
 
 Sk.builtin.nmber.prototype.__lt__ = function(me, other) {

diff --git a/test/run/t511.py b/test/run/t511.py
@@ -0,0 +1,14 @@
+print 0 == None
+print 0.0 == None
+print 0L == None
+print None == 0
+print None == 0.0
+print None == 0L
+
+print
+print 0 != None
+print 0.0 != None
+print 0L != None
+print None != 0
+print None != 0.0
+print None != 0L
diff --git a/test/run/t511.py.real b/test/run/t511.py.real
@@ -0,0 +1,13 @@
+False
+False
+False
+False
+False
+False
+
+True
+True
+True
+True
+True
+True
-Original file line number
+Diff line change
@@ -0,0 +1,13 @@
+    False
+    False
+    False
+    False
+    False
+    False
+    True
+    True
+    True
+    True
+    True
+    True