[pypy-commit] pypy py3k: hg merge default

[antocuni]

Author: Antonio Cuni <anto.cuni at gmail.com>
Branch: py3k
Changeset: r53066:c695ec2a520d
Date: 2012-03-01 17:20 +0100
http://bitbucket.org/pypy/pypy/changeset/c695ec2a520d/

Log:	hg merge default

diff --git a/pypy/interpreter/typedef.py b/pypy/interpreter/typedef.py
--- a/pypy/interpreter/typedef.py
+++ b/pypy/interpreter/typedef.py
@@ -66,12 +66,11 @@
 
 @interp2app
 def auto__le__(space, w_self, w_other):
-    return space.or_(space.lt(w_self, w_other),
-                     space.eq(w_self, w_other))
+    return space.not_(space.gt(w_self, w_other))
 
 @interp2app
 def auto__gt__(space, w_self, w_other):
-    return space.not_(space.le(w_self, w_other))
+    return space.lt(w_other, w_self)
 
 @interp2app
 def auto__ge__(space, w_self, w_other):