Author: Amaury Forgeot d'Arc <[email protected]>
Branch:
Changeset: r54915:573a6cacf459
Date: 2012-05-06 19:20 +0200
http://bitbucket.org/pypy/pypy/changeset/573a6cacf459/
Log: cpyext: Fix tests on 32bit platforms
diff --git a/pypy/module/cpyext/test/test_typeobject.py
b/pypy/module/cpyext/test/test_typeobject.py
--- a/pypy/module/cpyext/test/test_typeobject.py
+++ b/pypy/module/cpyext/test/test_typeobject.py
@@ -107,7 +107,7 @@
obj.double_member = 9.25; assert obj.double_member == 9.25
obj.longlong_member = -2**59; assert obj.longlong_member == -2**59
obj.ulonglong_member = 2**63; assert obj.ulonglong_member == 2**63
- obj.ssizet_member = 2**31; assert obj.ssizet_member == 2**31
+ obj.ssizet_member = sys.maxint;assert obj.ssizet_member == sys.maxint
#
def test_staticmethod(self):
diff --git a/pypy/rlib/runicode.py b/pypy/rlib/runicode.py
--- a/pypy/rlib/runicode.py
+++ b/pypy/rlib/runicode.py
@@ -505,8 +505,9 @@
pos = 0
if byteorder == 'native':
if size >= 4:
- bom = ((ord(s[iorder[3]]) << 24) | (ord(s[iorder[2]]) << 16) |
- (ord(s[iorder[1]]) << 8) | ord(s[iorder[0]]))
+ bom = intmask(
+ (ord(s[iorder[3]]) << 24) | (ord(s[iorder[2]]) << 16) |
+ (ord(s[iorder[1]]) << 8) | ord(s[iorder[0]]))
if BYTEORDER == 'little':
if bom == BOM32_DIRECT:
pos += 4
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
