[pypy-commit] pypy py3k: socket.inet_aton() should return bytes

[amauryfa]

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3k
Changeset: r50236:fc9f0d9b77db
Date: 2011-12-05 22:08 +0100
http://bitbucket.org/pypy/pypy/changeset/fc9f0d9b77db/

Log:	socket.inet_aton() should return bytes

diff --git a/pypy/module/_socket/interp_func.py b/pypy/module/_socket/interp_func.py
--- a/pypy/module/_socket/interp_func.py
+++ b/pypy/module/_socket/interp_func.py
@@ -202,9 +202,9 @@
         buf = rsocket.inet_aton(ip)
     except SocketError, e:
         raise converted_error(space, e)
-    return space.wrap(buf)
+    return space.wrapbytes(buf)
 
- at unwrap_spec(packed=str)
+ at unwrap_spec(packed="bufferstr")
 def inet_ntoa(space, packed):
     """inet_ntoa(packed_ip) -> ip_address_string
 
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
@@ -147,10 +147,10 @@
     packed = socket.inet_aton(ip)
     w_p = space.appexec([w_socket, space.wrap(ip)],
                         "(_socket, ip): return _socket.inet_aton(ip)")
-    assert space.unwrap(w_p) == packed
-    w_ip = space.appexec([w_socket, space.wrap(packed)],
+    assert space.bytes_w(w_p) == packed
+    w_ip = space.appexec([w_socket, w_p],
                          "(_socket, p): return _socket.inet_ntoa(p)")
-    assert space.unwrap(w_ip) == ip
+    assert space.unicode_w(w_ip) == ip
 
 def test_pton_ntop_ipv4():
     if not hasattr(socket, 'inet_pton'):