Issue #14151: Raise a ValueError, not a NameError, when trying to create

a multiprocessing Client or Listener with an AF_PIPE type address under
non-Windows platforms.  Patch by Popa Claudiu.
This commit is contained in:
Antoine Pitrou 2012-04-01 17:19:09 +02:00
parent 58bb82e7b4
commit 709176f10c
3 changed files with 26 additions and 1 deletions

View File

@ -94,6 +94,13 @@ def arbitrary_address(family):
else: else:
raise ValueError('unrecognized family') raise ValueError('unrecognized family')
def _validate_family(family):
'''
Checks if the family is valid for the current environment.
'''
if sys.platform != 'win32' and family == 'AF_PIPE':
raise ValueError('Family %s is not recognized.' % family)
def address_type(address): def address_type(address):
''' '''
@ -126,6 +133,7 @@ class Listener(object):
or default_family or default_family
address = address or arbitrary_address(family) address = address or arbitrary_address(family)
_validate_family(family)
if family == 'AF_PIPE': if family == 'AF_PIPE':
self._listener = PipeListener(address, backlog) self._listener = PipeListener(address, backlog)
else: else:
@ -163,6 +171,7 @@ def Client(address, family=None, authkey=None):
Returns a connection to the address of a `Listener` Returns a connection to the address of a `Listener`
''' '''
family = family or address_type(address) family = family or address_type(address)
_validate_family(family)
if family == 'AF_PIPE': if family == 'AF_PIPE':
c = PipeClient(address) c = PipeClient(address)
else: else:

View File

@ -2319,8 +2319,20 @@ class TestStdinBadfiledescriptor(unittest.TestCase):
flike.flush() flike.flush()
assert sio.getvalue() == 'foo' assert sio.getvalue() == 'foo'
#
# Issue 14151: Test invalid family on invalid environment
#
class TestInvalidFamily(unittest.TestCase):
@unittest.skipIf(WIN32, "skipped on Windows")
def test_invalid_family(self):
with self.assertRaises(ValueError):
multiprocessing.connection.Listener(r'\\.\test')
testcases_other = [OtherTest, TestInvalidHandle, TestInitializers, testcases_other = [OtherTest, TestInvalidHandle, TestInitializers,
TestStdinBadfiledescriptor] TestStdinBadfiledescriptor, TestInvalidFamily]
# #
# #

View File

@ -34,6 +34,10 @@ Core and Builtins
Library Library
------- -------
- Issue #14151: Raise a ValueError, not a NameError, when trying to create
a multiprocessing Client or Listener with an AF_PIPE type address under
non-Windows platforms. Patch by Popa Claudiu.
- Issue #13872: socket.detach() now marks the socket closed (as mirrored - Issue #13872: socket.detach() now marks the socket closed (as mirrored
in the socket repr()). Patch by Matt Joiner. in the socket repr()). Patch by Matt Joiner.