[Python-checkins] cpython (merge 3.4 -> default): merge 3.4

[benjamin.peterson]

http://hg.python.org/cpython/rev/99db0ca554d9
changeset:   90274:99db0ca554d9
parent:      90272:2c9af09ba7b8
parent:      90273:0d64a930e846
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Apr 14 13:13:01 2014 -0400
summary:
  merge 3.4

files:
  Lib/multiprocessing/connection.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/multiprocessing/connection.py b/Lib/multiprocessing/connection.py
--- a/Lib/multiprocessing/connection.py
+++ b/Lib/multiprocessing/connection.py
@@ -76,7 +76,7 @@
         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')
 

-- 
Repository URL: http://hg.python.org/cpython