Author: Alexander Hesse <webmas...@aquanasoft.de>
Branch: split-rpython
Changeset: r59946:af4c9ae740c1
Date: 2013-01-11 08:48 +0100
http://bitbucket.org/pypy/pypy/changeset/af4c9ae740c1/
Log: Fixed a few more typos regarding sockets
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
@@ -133,7 +133,7 @@
from rpython.rlib.rsocket import makeipaddr
host = space.str_w(space.getitem(w_sockaddr, space.wrap(0)))
addr = makeipaddr(host)
- addr_fill_from_object(addr, space, w_sockaddr)
+ fill_from_object(addr, space, w_sockaddr)
return addr
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
@@ -236,7 +236,7 @@
# XXX what size to pass here? for the purpose of this test it has
# to be short enough so we have some data, 1 sounds good enough
# + sizeof USHORT
- w_obj = addr_as_object(rsocket.Address(c_addr, 1 + 2), t(-1, space))
+ w_obj = addr_as_object(rsocket.Address(c_addr, 1 + 2), -1, space)
assert space.is_true(space.isinstance(w_obj, space.w_tuple))
assert space.int_w(space.getitem(w_obj, space.wrap(0))) == 15
assert space.str_w(space.getitem(w_obj, space.wrap(1))) == 'c'
@@ -267,7 +267,7 @@
# fd needs to be somehow valid
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
fd = s.fileno()
- w_obj = addr_as_object(rsocket.make_address(c_addr, addrlen), (fd, space))
+ w_obj = addr_as_object(rsocket.make_address(c_addr, addrlen), fd, space)
lltype.free(c_addr_ll, flavor='raw')
assert space.is_true(space.eq(w_obj, space.newtuple([
space.wrap('lo'),
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
