merge 3.4

This commit is contained in:
Benjamin Peterson 2014-04-14 13:13:01 -04:00
commit c7fee85319
1 changed files with 1 additions and 1 deletions

View File

@ -76,7 +76,7 @@ def arbitrary_address(family):
return tempfile.mktemp(prefix='listener-', dir=util.get_temp_dir())
elif family == 'AF_PIPE':
return tempfile.mktemp(prefix=r'\\.\pipe\pyc-%d-%d-' %
(os.getpid(), next(_mmap_counter)))
(os.getpid(), next(_mmap_counter)), dir="")
else:
raise ValueError('unrecognized family')