Author: Brian Kearns <bdkea...@gmail.com>
Branch: py3k
Changeset: r62211:27f49aef77f3
Date: 2013-03-08 00:39 -0500
http://bitbucket.org/pypy/pypy/changeset/27f49aef77f3/
Log: merge default
diff --git a/lib_pypy/_marshal.py b/lib_pypy/_marshal.py
--- a/lib_pypy/_marshal.py
+++ b/lib_pypy/_marshal.py
@@ -8,7 +8,11 @@
import types
from _codecs import utf_8_decode, utf_8_encode
-import sys
+
+try:
+ intern
+except NameError:
+ from sys import intern
try: from __pypy__ import builtinify
except ImportError: builtinify = lambda f: f
@@ -295,10 +299,10 @@
b = ord(self._read(1))
c = ord(self._read(1))
d = ord(self._read(1))
- e = int(ord(self._read(1)))
- f = int(ord(self._read(1)))
- g = int(ord(self._read(1)))
- h = int(ord(self._read(1)))
+ e = ord(self._read(1))
+ f = ord(self._read(1))
+ g = ord(self._read(1))
+ h = ord(self._read(1))
x = a | (b<<8) | (c<<16) | (d<<24)
x = x | (e<<32) | (f<<40) | (g<<48) | (h<<56)
if h & 0x80 and x > 0:
@@ -369,7 +373,7 @@
def load_interned(self):
n = self.r_long()
- ret = sys.intern(self._read(n))
+ ret = intern(self._read(n))
self._stringtable.append(ret)
return ret
dispatch[TYPE_INTERNED] = load_interned
@@ -484,10 +488,10 @@
b = ord(_read1(self))
c = ord(_read1(self))
d = ord(_read1(self))
- e = int(ord(_read1(self)))
- f = int(ord(_read1(self)))
- g = int(ord(_read1(self)))
- h = int(ord(_read1(self)))
+ e = ord(_read1(self))
+ f = ord(_read1(self))
+ g = ord(_read1(self))
+ h = ord(_read1(self))
x = a | (b<<8) | (c<<16) | (d<<24)
x = x | (e<<32) | (f<<40) | (g<<48) | (h<<56)
if h & 0x80 and x > 0:
@@ -585,7 +589,7 @@
def load_interned(self):
n = _r_long(self)
- ret = sys.intern(_read(self, n))
+ ret = intern(_read(self, n))
self._stringtable.append(ret)
return ret
dispatch[TYPE_INTERNED] = load_interned
diff --git a/lib_pypy/_md5.py b/lib_pypy/_md5.py
--- a/lib_pypy/_md5.py
+++ b/lib_pypy/_md5.py
@@ -53,10 +53,10 @@
j = 0
i = 0
while i < imax:
- b0 = list[j]
- b1 = list[j+1] << 8
- b2 = list[j+2] << 16
- b3 = list[j+3] << 24
+ b0 = ord(list[j])
+ b1 = ord(list[j+1]) << 8
+ b2 = ord(list[j+2]) << 16
+ b3 = ord(list[j+3]) << 24
hl[i] = b0 | b1 |b2 | b3
i = i+1
j = j+4
@@ -270,7 +270,7 @@
the hashed string.
"""
- leninBuf = int(len(inBuf))
+ leninBuf = len(inBuf)
# Compute number of bytes mod 64.
index = (self.count[0] >> 3) & 0x3F
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
