Author: Antonio Cuni <[email protected]>
Branch: py3k
Changeset: r53094:7e9798e88c4b
Date: 2012-03-02 10:34 +0100
http://bitbucket.org/pypy/pypy/changeset/7e9798e88c4b/
Log: hg merge default
diff --git a/pypy/module/_md5/test/test_md5.py
b/pypy/module/_md5/test/test_md5.py
--- a/pypy/module/_md5/test/test_md5.py
+++ b/pypy/module/_md5/test/test_md5.py
@@ -26,7 +26,7 @@
"""
import sys
assert self.md5.md5().digest_size == 16
- if sys.version >= (2, 5):
+ if sys.version_info >= (2, 5):
assert self.md5.blocksize == 1
assert self.md5.md5().digestsize == 16
diff --git a/pypy/module/array/test/test_array.py
b/pypy/module/array/test/test_array.py
--- a/pypy/module/array/test/test_array.py
+++ b/pypy/module/array/test/test_array.py
@@ -504,12 +504,6 @@
assert (a >= c) is False
assert (c >= a) is True
- assert a == a
- assert a == b
- assert a < c
- assert b == a
- assert c > a
-
def test_reduce(self):
import pickle
a = self.array('i', [1, 2, 3])
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
