(bytes vs. string)

>>> import socket 
>>> s = socket.socket(socket.AF_UNIX)
>>> s.getsockname()
b''
>>> s.bind(('/tmp/temp'))
>>> s.getsockname()
'/tmp/temp'
>>>

Here's a patch.

> Here's a patch.

Your patch returns an empty string in case of Linux abstract namespace: this is wrong, because even though the first char in sun_path is NIL, the path is non-null, there can be other non-NIL char following.

Example (the output returns a str because it's a Python 2.6 version):

>>> import socket
>>> s = socket.socket(socket.AF_UNIX)
>>> s.bind(b'\x00hello')
>>> s.getsockname()
'\x00hello'

That's why it returns bytes.

Well, couldn't we simply return a string in that case? We just have to be more careful than in the patch :-)

> Well, couldn't we simply return a string in that case? We just have to be more careful than in the patch :-)

Probably, provided that:

- s.bind(<addr>).getsockname() == <addr>
- it doesn't break existing code :-)

Apparently the current code is a result of Guido's changeset 980308fbda29 which changed normal Unix sockets to use unicode objects, but Linux abstract namespace sockets to use bytes objects.

I don't know if a lot of thought was given to the issue in that changeset; I would favour using PyUnicode_DecodeFSDefaultAndSize for Linux abstract namespace sockets too.

Sorry, I don't think I have anything to add.

Note that if we pass bytes to bind(), getsockname() will return str anyway:

>>> s = socket.socket(socket.AF_UNIX)
>>> s.bind(b'hello')
>>> s.getsockname()
'hello'

That said, it seems more consistent to me to return str also in case of abstract namespace. 
As per:
http://blog.eduardofleury.com/archives/2007/09/13
...one is supposed to set only the first byte to null, and the rest of the path is supposed to be a 'plain' string.

Here's a patch.
Note that I had to adapt test_socket (which was passing bytes).

Looks fine to me :-)

New changeset c0f2b038fc12 by Charles-François Natali in branch 'default':
Issue #17683: socket module: return AF_UNIX addresses in Linux abstract
http://hg.python.org/cpython/rev/c0f2b038fc12

Antoine, I need your help :-)

http://buildbot.python.org/all/builders/x86 Gentoo Non-Debug
3.x/builds/4311/steps/test/logs/stdio
"""
======================================================================
ERROR: testLinuxAbstractNamespace (test.test_socket.TestLinuxAbstractNamespace)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/var/lib/buildslave/3.x.murray-gentoo-wide/build/Lib/test/test_socket.py",
line 4456, in testLinuxAbstractNamespace
    s1.bind(address)
UnicodeEncodeError: 'ascii' codec can't encode character '\xff' in
position 19: ordinal not in range(128)
"""

I don't know jack s*** about encoding, but from what I understand, the
problem is that the test is passing an invalid ordinal, now that test
is passing a string. Should I revert this part of the test (i.e. make
the passed address a bytes again)?

Hum, IIUC, basically what happens is that the user could - and still
can - pass arbitrary bytes as address (which is legtit), but depending
on the encoding, getsockaddr() and friends might blow up when decoding
it.
If that's correct, that's bad, and that would be a good reason to keep bytes.

> Hum, IIUC, basically what happens is that the user could - and still
> can - pass arbitrary bytes as address (which is legtit), but depending
> on the encoding, getsockaddr() and friends might blow up when decoding
> it.

Shouldn't the surrogateescape error handler (PEP 383) prevent this?

> Shouldn't the surrogateescape error handler (PEP 383) prevent this?

Yes, it shoud (I just read PEP 383, I told you I didn't know anything
about encoding :-).

So basically, for the test failure, the issue is simply that the
platform's default encoding can't encode character '\xff'.

Should I simply remove the offending character from this test address?

Also, let's say I wanted to test that it can be passed and returned
properly, so I add '\0xff' to the adress passed to testBytesName:

s.bind(b"\x00python\x00test\xff")

How should I check the string returned by getsockname()?

self.assertEquals(s.getsockname(), ???)