Author: Antonio Cuni <[email protected]>
Branch: py3k
Changeset: r55229:fee1266a36e1
Date: 2012-05-31 15:29 +0200
http://bitbucket.org/pypy/pypy/changeset/fee1266a36e1/
Log: py3k-ify. Some tests fail for other reasons though (e.g., missing
_socket.dup)
diff --git a/pypy/module/_multiprocessing/interp_connection.py
b/pypy/module/_multiprocessing/interp_connection.py
--- a/pypy/module/_multiprocessing/interp_connection.py
+++ b/pypy/module/_multiprocessing/interp_connection.py
@@ -16,7 +16,7 @@
PY_SSIZE_T_MIN = -sys.maxint - 1
def BufferTooShort(space, w_data):
- w_builtins = space.getbuiltinmodule('__builtin__')
+ w_builtins = space.getbuiltinmodule('builtins')
w_module = space.call_method(
w_builtins, '__import__', space.wrap("multiprocessing"))
w_BufferTooShort = space.getattr(w_module, space.wrap("BufferTooShort"))
@@ -130,7 +130,7 @@
def send(self, space, w_obj):
self._check_writable(space)
- w_builtins = space.getbuiltinmodule('__builtin__')
+ w_builtins = space.getbuiltinmodule('builtins')
w_picklemodule = space.call_method(
w_builtins, '__import__', space.wrap("pickle"))
w_protocol = space.getattr(
@@ -155,7 +155,7 @@
if newbuf:
rffi.free_charp(newbuf)
- w_builtins = space.getbuiltinmodule('__builtin__')
+ w_builtins = space.getbuiltinmodule('builtins')
w_picklemodule = space.call_method(
w_builtins, '__import__', space.wrap("pickle"))
w_unpickled = space.call_method(
diff --git a/pypy/module/_multiprocessing/test/test_connection.py
b/pypy/module/_multiprocessing/test/test_connection.py
--- a/pypy/module/_multiprocessing/test/test_connection.py
+++ b/pypy/module/_multiprocessing/test/test_connection.py
@@ -29,7 +29,7 @@
import multiprocessing
try:
self.raiseBufferTooShort("data")
- except multiprocessing.BufferTooShort, e:
+ except multiprocessing.BufferTooShort as e:
assert isinstance(e, multiprocessing.ProcessError)
assert e.args == ("data",)
@@ -164,12 +164,12 @@
# order) is important for interoperation with others
# implementations.
rhandle, whandle = self.make_pair()
- whandle.send_bytes("abc")
- whandle.send_bytes("defg")
+ whandle.send_bytes(b"abc")
+ whandle.send_bytes(b"defg")
sock = socket.fromfd(rhandle.fileno(),
socket.AF_INET, socket.SOCK_STREAM)
data1 = sock.recv(7)
- assert data1 == '\x00\x00\x00\x03abc'
+ assert data1 == b'\x00\x00\x00\x03abc'
data2 = sock.recv(8)
- assert data2 == '\x00\x00\x00\x04defg'
+ assert data2 == b'\x00\x00\x00\x04defg'
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
