[pypy-commit] pypy py3k: Remove more L suffixes and long() calls
amauryfa
noreply at buildbot.pypy.org
Tue Jan 17 20:27:29 CET 2012
Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3k
Changeset: r51415:d682184291a6
Date: 2012-01-17 20:25 +0100
http://bitbucket.org/pypy/pypy/changeset/d682184291a6/
Log: Remove more L suffixes and long() calls
diff --git a/lib_pypy/_md5.py b/lib_pypy/_md5.py
--- a/lib_pypy/_md5.py
+++ b/lib_pypy/_md5.py
@@ -48,7 +48,7 @@
"Transform a list of characters into a list of longs."
imax = len(list) // 4
- hl = [0L] * imax
+ hl = [0] * imax
j = 0
i = 0
@@ -100,16 +100,16 @@
(now summed-up in one function).
"""
- res = 0L
+ res = 0
res = res + a + func(b, c, d)
res = res + x
res = res + ac
- res = res & 0xffffffffL
+ res = res & 0xffffffff
res = _rotateLeft(res, s)
- res = res & 0xffffffffL
+ res = res & 0xffffffff
res = res + b
- return res & 0xffffffffL
+ return res & 0xffffffff
class md5:
@@ -122,7 +122,7 @@
"Initialisation."
# Initial message length in bits(!).
- self.length = 0L
+ self.length = 0
self.count = [0, 0]
# Initial empty message as a sequence of bytes (8 bit characters).
@@ -139,15 +139,15 @@
def init(self):
"Initialize the message-digest and set all fields to zero."
- self.length = 0L
+ self.length = 0
self.count = [0, 0]
self.input = []
# Load magic initialization constants.
- self.A = 0x67452301L
- self.B = 0xefcdab89L
- self.C = 0x98badcfeL
- self.D = 0x10325476L
+ self.A = 0x67452301
+ self.B = 0xefcdab89
+ self.C = 0x98badcfe
+ self.D = 0x10325476
def _transform(self, inp):
@@ -164,90 +164,90 @@
S11, S12, S13, S14 = 7, 12, 17, 22
- a = XX(F, a, b, c, d, inp[ 0], S11, 0xD76AA478L) # 1
- d = XX(F, d, a, b, c, inp[ 1], S12, 0xE8C7B756L) # 2
- c = XX(F, c, d, a, b, inp[ 2], S13, 0x242070DBL) # 3
- b = XX(F, b, c, d, a, inp[ 3], S14, 0xC1BDCEEEL) # 4
- a = XX(F, a, b, c, d, inp[ 4], S11, 0xF57C0FAFL) # 5
- d = XX(F, d, a, b, c, inp[ 5], S12, 0x4787C62AL) # 6
- c = XX(F, c, d, a, b, inp[ 6], S13, 0xA8304613L) # 7
- b = XX(F, b, c, d, a, inp[ 7], S14, 0xFD469501L) # 8
- a = XX(F, a, b, c, d, inp[ 8], S11, 0x698098D8L) # 9
- d = XX(F, d, a, b, c, inp[ 9], S12, 0x8B44F7AFL) # 10
- c = XX(F, c, d, a, b, inp[10], S13, 0xFFFF5BB1L) # 11
- b = XX(F, b, c, d, a, inp[11], S14, 0x895CD7BEL) # 12
- a = XX(F, a, b, c, d, inp[12], S11, 0x6B901122L) # 13
- d = XX(F, d, a, b, c, inp[13], S12, 0xFD987193L) # 14
- c = XX(F, c, d, a, b, inp[14], S13, 0xA679438EL) # 15
- b = XX(F, b, c, d, a, inp[15], S14, 0x49B40821L) # 16
+ a = XX(F, a, b, c, d, inp[ 0], S11, 0xD76AA478) # 1
+ d = XX(F, d, a, b, c, inp[ 1], S12, 0xE8C7B756) # 2
+ c = XX(F, c, d, a, b, inp[ 2], S13, 0x242070DB) # 3
+ b = XX(F, b, c, d, a, inp[ 3], S14, 0xC1BDCEEE) # 4
+ a = XX(F, a, b, c, d, inp[ 4], S11, 0xF57C0FAF) # 5
+ d = XX(F, d, a, b, c, inp[ 5], S12, 0x4787C62A) # 6
+ c = XX(F, c, d, a, b, inp[ 6], S13, 0xA8304613) # 7
+ b = XX(F, b, c, d, a, inp[ 7], S14, 0xFD469501) # 8
+ a = XX(F, a, b, c, d, inp[ 8], S11, 0x698098D8) # 9
+ d = XX(F, d, a, b, c, inp[ 9], S12, 0x8B44F7AF) # 10
+ c = XX(F, c, d, a, b, inp[10], S13, 0xFFFF5BB1) # 11
+ b = XX(F, b, c, d, a, inp[11], S14, 0x895CD7BE) # 12
+ a = XX(F, a, b, c, d, inp[12], S11, 0x6B901122) # 13
+ d = XX(F, d, a, b, c, inp[13], S12, 0xFD987193) # 14
+ c = XX(F, c, d, a, b, inp[14], S13, 0xA679438E) # 15
+ b = XX(F, b, c, d, a, inp[15], S14, 0x49B40821) # 16
# Round 2.
S21, S22, S23, S24 = 5, 9, 14, 20
- a = XX(G, a, b, c, d, inp[ 1], S21, 0xF61E2562L) # 17
- d = XX(G, d, a, b, c, inp[ 6], S22, 0xC040B340L) # 18
- c = XX(G, c, d, a, b, inp[11], S23, 0x265E5A51L) # 19
- b = XX(G, b, c, d, a, inp[ 0], S24, 0xE9B6C7AAL) # 20
- a = XX(G, a, b, c, d, inp[ 5], S21, 0xD62F105DL) # 21
- d = XX(G, d, a, b, c, inp[10], S22, 0x02441453L) # 22
- c = XX(G, c, d, a, b, inp[15], S23, 0xD8A1E681L) # 23
- b = XX(G, b, c, d, a, inp[ 4], S24, 0xE7D3FBC8L) # 24
- a = XX(G, a, b, c, d, inp[ 9], S21, 0x21E1CDE6L) # 25
- d = XX(G, d, a, b, c, inp[14], S22, 0xC33707D6L) # 26
- c = XX(G, c, d, a, b, inp[ 3], S23, 0xF4D50D87L) # 27
- b = XX(G, b, c, d, a, inp[ 8], S24, 0x455A14EDL) # 28
- a = XX(G, a, b, c, d, inp[13], S21, 0xA9E3E905L) # 29
- d = XX(G, d, a, b, c, inp[ 2], S22, 0xFCEFA3F8L) # 30
- c = XX(G, c, d, a, b, inp[ 7], S23, 0x676F02D9L) # 31
- b = XX(G, b, c, d, a, inp[12], S24, 0x8D2A4C8AL) # 32
+ a = XX(G, a, b, c, d, inp[ 1], S21, 0xF61E2562) # 17
+ d = XX(G, d, a, b, c, inp[ 6], S22, 0xC040B340) # 18
+ c = XX(G, c, d, a, b, inp[11], S23, 0x265E5A51) # 19
+ b = XX(G, b, c, d, a, inp[ 0], S24, 0xE9B6C7AA) # 20
+ a = XX(G, a, b, c, d, inp[ 5], S21, 0xD62F105D) # 21
+ d = XX(G, d, a, b, c, inp[10], S22, 0x02441453) # 22
+ c = XX(G, c, d, a, b, inp[15], S23, 0xD8A1E681) # 23
+ b = XX(G, b, c, d, a, inp[ 4], S24, 0xE7D3FBC8) # 24
+ a = XX(G, a, b, c, d, inp[ 9], S21, 0x21E1CDE6) # 25
+ d = XX(G, d, a, b, c, inp[14], S22, 0xC33707D6) # 26
+ c = XX(G, c, d, a, b, inp[ 3], S23, 0xF4D50D87) # 27
+ b = XX(G, b, c, d, a, inp[ 8], S24, 0x455A14ED) # 28
+ a = XX(G, a, b, c, d, inp[13], S21, 0xA9E3E905) # 29
+ d = XX(G, d, a, b, c, inp[ 2], S22, 0xFCEFA3F8) # 30
+ c = XX(G, c, d, a, b, inp[ 7], S23, 0x676F02D9) # 31
+ b = XX(G, b, c, d, a, inp[12], S24, 0x8D2A4C8A) # 32
# Round 3.
S31, S32, S33, S34 = 4, 11, 16, 23
- a = XX(H, a, b, c, d, inp[ 5], S31, 0xFFFA3942L) # 33
- d = XX(H, d, a, b, c, inp[ 8], S32, 0x8771F681L) # 34
- c = XX(H, c, d, a, b, inp[11], S33, 0x6D9D6122L) # 35
- b = XX(H, b, c, d, a, inp[14], S34, 0xFDE5380CL) # 36
- a = XX(H, a, b, c, d, inp[ 1], S31, 0xA4BEEA44L) # 37
- d = XX(H, d, a, b, c, inp[ 4], S32, 0x4BDECFA9L) # 38
- c = XX(H, c, d, a, b, inp[ 7], S33, 0xF6BB4B60L) # 39
- b = XX(H, b, c, d, a, inp[10], S34, 0xBEBFBC70L) # 40
- a = XX(H, a, b, c, d, inp[13], S31, 0x289B7EC6L) # 41
- d = XX(H, d, a, b, c, inp[ 0], S32, 0xEAA127FAL) # 42
- c = XX(H, c, d, a, b, inp[ 3], S33, 0xD4EF3085L) # 43
- b = XX(H, b, c, d, a, inp[ 6], S34, 0x04881D05L) # 44
- a = XX(H, a, b, c, d, inp[ 9], S31, 0xD9D4D039L) # 45
- d = XX(H, d, a, b, c, inp[12], S32, 0xE6DB99E5L) # 46
- c = XX(H, c, d, a, b, inp[15], S33, 0x1FA27CF8L) # 47
- b = XX(H, b, c, d, a, inp[ 2], S34, 0xC4AC5665L) # 48
+ a = XX(H, a, b, c, d, inp[ 5], S31, 0xFFFA3942) # 33
+ d = XX(H, d, a, b, c, inp[ 8], S32, 0x8771F681) # 34
+ c = XX(H, c, d, a, b, inp[11], S33, 0x6D9D6122) # 35
+ b = XX(H, b, c, d, a, inp[14], S34, 0xFDE5380C) # 36
+ a = XX(H, a, b, c, d, inp[ 1], S31, 0xA4BEEA44) # 37
+ d = XX(H, d, a, b, c, inp[ 4], S32, 0x4BDECFA9) # 38
+ c = XX(H, c, d, a, b, inp[ 7], S33, 0xF6BB4B60) # 39
+ b = XX(H, b, c, d, a, inp[10], S34, 0xBEBFBC70) # 40
+ a = XX(H, a, b, c, d, inp[13], S31, 0x289B7EC6) # 41
+ d = XX(H, d, a, b, c, inp[ 0], S32, 0xEAA127FA) # 42
+ c = XX(H, c, d, a, b, inp[ 3], S33, 0xD4EF3085) # 43
+ b = XX(H, b, c, d, a, inp[ 6], S34, 0x04881D05) # 44
+ a = XX(H, a, b, c, d, inp[ 9], S31, 0xD9D4D039) # 45
+ d = XX(H, d, a, b, c, inp[12], S32, 0xE6DB99E5) # 46
+ c = XX(H, c, d, a, b, inp[15], S33, 0x1FA27CF8) # 47
+ b = XX(H, b, c, d, a, inp[ 2], S34, 0xC4AC5665) # 48
# Round 4.
S41, S42, S43, S44 = 6, 10, 15, 21
- a = XX(I, a, b, c, d, inp[ 0], S41, 0xF4292244L) # 49
- d = XX(I, d, a, b, c, inp[ 7], S42, 0x432AFF97L) # 50
- c = XX(I, c, d, a, b, inp[14], S43, 0xAB9423A7L) # 51
- b = XX(I, b, c, d, a, inp[ 5], S44, 0xFC93A039L) # 52
- a = XX(I, a, b, c, d, inp[12], S41, 0x655B59C3L) # 53
- d = XX(I, d, a, b, c, inp[ 3], S42, 0x8F0CCC92L) # 54
- c = XX(I, c, d, a, b, inp[10], S43, 0xFFEFF47DL) # 55
- b = XX(I, b, c, d, a, inp[ 1], S44, 0x85845DD1L) # 56
- a = XX(I, a, b, c, d, inp[ 8], S41, 0x6FA87E4FL) # 57
- d = XX(I, d, a, b, c, inp[15], S42, 0xFE2CE6E0L) # 58
- c = XX(I, c, d, a, b, inp[ 6], S43, 0xA3014314L) # 59
- b = XX(I, b, c, d, a, inp[13], S44, 0x4E0811A1L) # 60
- a = XX(I, a, b, c, d, inp[ 4], S41, 0xF7537E82L) # 61
- d = XX(I, d, a, b, c, inp[11], S42, 0xBD3AF235L) # 62
- c = XX(I, c, d, a, b, inp[ 2], S43, 0x2AD7D2BBL) # 63
- b = XX(I, b, c, d, a, inp[ 9], S44, 0xEB86D391L) # 64
+ a = XX(I, a, b, c, d, inp[ 0], S41, 0xF4292244) # 49
+ d = XX(I, d, a, b, c, inp[ 7], S42, 0x432AFF97) # 50
+ c = XX(I, c, d, a, b, inp[14], S43, 0xAB9423A7) # 51
+ b = XX(I, b, c, d, a, inp[ 5], S44, 0xFC93A039) # 52
+ a = XX(I, a, b, c, d, inp[12], S41, 0x655B59C3) # 53
+ d = XX(I, d, a, b, c, inp[ 3], S42, 0x8F0CCC92) # 54
+ c = XX(I, c, d, a, b, inp[10], S43, 0xFFEFF47D) # 55
+ b = XX(I, b, c, d, a, inp[ 1], S44, 0x85845DD1) # 56
+ a = XX(I, a, b, c, d, inp[ 8], S41, 0x6FA87E4F) # 57
+ d = XX(I, d, a, b, c, inp[15], S42, 0xFE2CE6E0) # 58
+ c = XX(I, c, d, a, b, inp[ 6], S43, 0xA3014314) # 59
+ b = XX(I, b, c, d, a, inp[13], S44, 0x4E0811A1) # 60
+ a = XX(I, a, b, c, d, inp[ 4], S41, 0xF7537E82) # 61
+ d = XX(I, d, a, b, c, inp[11], S42, 0xBD3AF235) # 62
+ c = XX(I, c, d, a, b, inp[ 2], S43, 0x2AD7D2BB) # 63
+ b = XX(I, b, c, d, a, inp[ 9], S44, 0xEB86D391) # 64
- A = (A + a) & 0xffffffffL
- B = (B + b) & 0xffffffffL
- C = (C + c) & 0xffffffffL
- D = (D + d) & 0xffffffffL
+ A = (A + a) & 0xffffffff
+ B = (B + b) & 0xffffffff
+ C = (C + c) & 0xffffffff
+ D = (D + d) & 0xffffffff
self.A, self.B, self.C, self.D = A, B, C, D
@@ -273,7 +273,7 @@
leninBuf = long(len(inBuf))
# Compute number of bytes mod 64.
- index = (self.count[0] >> 3) & 0x3FL
+ index = (self.count[0] >> 3) & 0x3F
# Update number of bits.
self.count[0] = self.count[0] + (leninBuf << 3)
@@ -312,7 +312,7 @@
input = [] + self.input
count = [] + self.count
- index = (self.count[0] >> 3) & 0x3fL
+ index = (self.count[0] >> 3) & 0x3f
if index < 56:
padLen = 56 - index
diff --git a/lib_pypy/_sha1.py b/lib_pypy/_sha1.py
--- a/lib_pypy/_sha1.py
+++ b/lib_pypy/_sha1.py
@@ -38,7 +38,7 @@
s = b''
pack = struct.pack
while n > 0:
- s = pack('>I', n & 0xffffffffL) + s
+ s = pack('>I', n & 0xffffffff) + s
n = n >> 32
# Strip off leading zeros.
@@ -64,7 +64,7 @@
"Transform a list of characters into a list of longs."
imax = len(list) // 4
- hl = [0L] * imax
+ hl = [0] * imax
j = 0
i = 0
@@ -108,10 +108,10 @@
# Constants to be used
K = [
- 0x5A827999L, # ( 0 <= t <= 19)
- 0x6ED9EBA1L, # (20 <= t <= 39)
- 0x8F1BBCDCL, # (40 <= t <= 59)
- 0xCA62C1D6L # (60 <= t <= 79)
+ 0x5A827999, # ( 0 <= t <= 19)
+ 0x6ED9EBA1, # (20 <= t <= 39)
+ 0x8F1BBCDC, # (40 <= t <= 59)
+ 0xCA62C1D6 # (60 <= t <= 79)
]
class sha:
@@ -124,7 +124,7 @@
"Initialisation."
# Initial message length in bits(!).
- self.length = 0L
+ self.length = 0
self.count = [0, 0]
# Initial empty message as a sequence of bytes (8 bit characters).
@@ -138,21 +138,21 @@
def init(self):
"Initialize the message-digest and set all fields to zero."
- self.length = 0L
+ self.length = 0
self.input = []
# Initial 160 bit message digest (5 times 32 bit).
- self.H0 = 0x67452301L
- self.H1 = 0xEFCDAB89L
- self.H2 = 0x98BADCFEL
- self.H3 = 0x10325476L
- self.H4 = 0xC3D2E1F0L
+ self.H0 = 0x67452301
+ self.H1 = 0xEFCDAB89
+ self.H2 = 0x98BADCFE
+ self.H3 = 0x10325476
+ self.H4 = 0xC3D2E1F0
def _transform(self, W):
for t in range(16, 80):
W.append(_rotateLeft(
- W[t-3] ^ W[t-8] ^ W[t-14] ^ W[t-16], 1) & 0xffffffffL)
+ W[t-3] ^ W[t-8] ^ W[t-14] ^ W[t-16], 1) & 0xffffffff)
A = self.H0
B = self.H1
@@ -166,49 +166,49 @@
TEMP = _rotateLeft(A, 5) + f[t/20] + E + W[t] + K[t/20]
E = D
D = C
- C = _rotateLeft(B, 30) & 0xffffffffL
+ C = _rotateLeft(B, 30) & 0xffffffff
B = A
- A = TEMP & 0xffffffffL
+ A = TEMP & 0xffffffff
"""
for t in range(0, 20):
TEMP = _rotateLeft(A, 5) + ((B & C) | ((~ B) & D)) + E + W[t] + K[0]
E = D
D = C
- C = _rotateLeft(B, 30) & 0xffffffffL
+ C = _rotateLeft(B, 30) & 0xffffffff
B = A
- A = TEMP & 0xffffffffL
+ A = TEMP & 0xffffffff
for t in range(20, 40):
TEMP = _rotateLeft(A, 5) + (B ^ C ^ D) + E + W[t] + K[1]
E = D
D = C
- C = _rotateLeft(B, 30) & 0xffffffffL
+ C = _rotateLeft(B, 30) & 0xffffffff
B = A
- A = TEMP & 0xffffffffL
+ A = TEMP & 0xffffffff
for t in range(40, 60):
TEMP = _rotateLeft(A, 5) + ((B & C) | (B & D) | (C & D)) + E + W[t] + K[2]
E = D
D = C
- C = _rotateLeft(B, 30) & 0xffffffffL
+ C = _rotateLeft(B, 30) & 0xffffffff
B = A
- A = TEMP & 0xffffffffL
+ A = TEMP & 0xffffffff
for t in range(60, 80):
TEMP = _rotateLeft(A, 5) + (B ^ C ^ D) + E + W[t] + K[3]
E = D
D = C
- C = _rotateLeft(B, 30) & 0xffffffffL
+ C = _rotateLeft(B, 30) & 0xffffffff
B = A
- A = TEMP & 0xffffffffL
+ A = TEMP & 0xffffffff
- self.H0 = (self.H0 + A) & 0xffffffffL
- self.H1 = (self.H1 + B) & 0xffffffffL
- self.H2 = (self.H2 + C) & 0xffffffffL
- self.H3 = (self.H3 + D) & 0xffffffffL
- self.H4 = (self.H4 + E) & 0xffffffffL
+ self.H0 = (self.H0 + A) & 0xffffffff
+ self.H1 = (self.H1 + B) & 0xffffffff
+ self.H2 = (self.H2 + C) & 0xffffffff
+ self.H3 = (self.H3 + D) & 0xffffffff
+ self.H4 = (self.H4 + E) & 0xffffffff
# Down from here all methods follow the Python Standard Library
@@ -230,10 +230,10 @@
to the hashed string.
"""
- leninBuf = long(len(inBuf))
+ leninBuf = len(inBuf)
# Compute number of bytes mod 64.
- index = (self.count[1] >> 3) & 0x3FL
+ index = (self.count[1] >> 3) & 0x3F
# Update number of bits.
self.count[1] = self.count[1] + (leninBuf << 3)
@@ -273,7 +273,7 @@
input = [] + self.input
count = [] + self.count
- index = (self.count[1] >> 3) & 0x3fL
+ index = (self.count[1] >> 3) & 0x3f
if index < 56:
padLen = 56 - index
diff --git a/lib_pypy/_sha512.py b/lib_pypy/_sha512.py
--- a/lib_pypy/_sha512.py
+++ b/lib_pypy/_sha512.py
@@ -10,7 +10,7 @@
def new_shaobject():
return {
- 'digest': [0L]*8,
+ 'digest': [0]*8,
'count_lo': 0,
'count_hi': 0,
'data': [0]* SHA_BLOCKSIZE,
More information about the pypy-commit
mailing list