[Python-checkins] cpython (merge 3.3 -> default): merge 3.3 (#19112)

[benjamin.peterson]

http://hg.python.org/cpython/rev/ea54a55a21a1
changeset:   85843:ea54a55a21a1
parent:      85840:971965daadfb
parent:      85841:414ccf20d182
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Sep 29 11:11:10 2013 -0400
summary:
  merge 3.3 (#19112)

files:
  Lib/test/_test_multiprocessing.py |  13 ++++++-------
  1 files changed, 6 insertions(+), 7 deletions(-)


diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py
--- a/Lib/test/_test_multiprocessing.py
+++ b/Lib/test/_test_multiprocessing.py
@@ -3044,13 +3044,6 @@
     except pyqueue.Empty:
         pass
 
-def _TestProcess(q):
-    queue = multiprocessing.Queue()
-    subProc = multiprocessing.Process(target=_ThisSubProcess, args=(queue,))
-    subProc.daemon = True
-    subProc.start()
-    subProc.join()
-
 def _afunc(x):
     return x*x
 
@@ -3084,6 +3077,12 @@
 class TestStdinBadfiledescriptor(unittest.TestCase):
 
     def test_queue_in_process(self):
+        def _TestProcess(q):
+            queue = multiprocessing.Queue()
+            subProc = multiprocessing.Process(target=_ThisSubProcess, args=(queue,))
+            subProc.daemon = True
+            subProc.start()
+            subProc.join()
         queue = multiprocessing.Queue()
         proc = multiprocessing.Process(target=_TestProcess, args=(queue,))
         proc.start()

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