Author: Richard Plangger <[email protected]>
Branch: py3.5
Changeset: r88967:db81d034b514
Date: 2016-12-08 14:02 +0100
http://bitbucket.org/pypy/pypy/changeset/db81d034b514/
Log: remove pdb and call right method
diff --git a/pypy/module/_socket/interp_socket.py
b/pypy/module/_socket/interp_socket.py
--- a/pypy/module/_socket/interp_socket.py
+++ b/pypy/module/_socket/interp_socket.py
@@ -112,10 +112,9 @@
return rsocket.INET6Address(host, port, flowinfo, scope_id)
if rsocket.HAS_AF_UNIX and family == rsocket.AF_UNIX:
# Not using space.fsencode_w since Linux allows embedded NULs.
- import pdb; pdb.set_trace()
if space.isinstance_w(w_address, space.w_unicode):
w_address = space.fsencode(w_address)
- bytelike = space.arg_w('y*', w_address)
+ bytelike = space.getarg_w('y*', w_address)
return rsocket.UNIXAddress(bytelike)
if rsocket.HAS_AF_NETLINK and family == rsocket.AF_NETLINK:
w_pid, w_groups = space.unpackiterable(w_address, 2)
@@ -459,7 +458,7 @@
Like send(data, flags) but allows specifying the destination address.
For IP sockets, the address is a pair (hostaddr, port).
"""
- data = space.arg_w('y*', w_data)
+ data = space.getarg_w('y*', w_data)
if w_param3 is None:
# 2 args version
flags = 0
diff --git a/pypy/module/_socket/test/test_sock_app.py
b/pypy/module/_socket/test/test_sock_app.py
--- a/pypy/module/_socket/test/test_sock_app.py
+++ b/pypy/module/_socket/test/test_sock_app.py
@@ -886,7 +886,7 @@
def test_bytearray_name(self):
import _socket as socket
- s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+ s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
s.bind(bytearray(b"\x00python\x00test\x00"))
assert s.getsockname() == b"\x00python\x00test\x00"
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
