[pypy-commit] pypy py3.5-newtext: hg merge 0292533aef1d

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: py3.5-newtext
Changeset: r90122:9482cbbe738a
Date: 2017-02-14 18:10 +0100
http://bitbucket.org/pypy/pypy/changeset/9482cbbe738a/

Log:	hg merge 0292533aef1d

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
@@ -26,8 +26,8 @@
     elif isinstance(addr, rsocket.INET6Address):
         return space.newtuple([space.newtext(addr.get_host()),
                                space.newint(addr.get_port()),
-                               space.newint(addr.get_flowinfo()), # YYY
-                               space.newint(addr.get_scope_id())]) # YYY
+                               space.newint(addr.get_flowinfo()),
+                               space.newint(addr.get_scope_id())])
     elif rsocket.HAS_AF_PACKET and isinstance(addr, rsocket.PacketAddress):
         return space.newtuple([space.newtext(addr.get_ifname(fd)),
                                space.newint(addr.get_protocol()),
@@ -638,7 +638,7 @@
                 if value_ptr:
                     lltype.free(value_ptr, flavor='raw')
 
-            return space.newint(recv_ptr[0]) # YYY
+            return space.newint(recv_ptr[0])
         finally:
             lltype.free(recv_ptr, flavor='raw')