summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-04-14 17:13:01 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-04-14 17:13:01 (GMT)
commitc7fee85319cff60a1cbf0371b23c24915f4b1279 (patch)
tree8b02ff04d725eeb2aca9fed52c11fe408378a6c8
parent166214c344202d269887ea06d219e6b121bd0927 (diff)
parent40470e00b539095ee576513f7a98cfda020583c3 (diff)
downloadcpython-c7fee85319cff60a1cbf0371b23c24915f4b1279.zip
cpython-c7fee85319cff60a1cbf0371b23c24915f4b1279.tar.gz
cpython-c7fee85319cff60a1cbf0371b23c24915f4b1279.tar.bz2
merge 3.4
-rw-r--r--Lib/multiprocessing/connection.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/multiprocessing/connection.py b/Lib/multiprocessing/connection.py
index b4f81ba..3bc716f 100644
--- a/Lib/multiprocessing/connection.py
+++ b/Lib/multiprocessing/connection.py
@@ -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')