[Python-checkins] cpython (merge 3.3 -> default): Merge.

[richard.oudkerk]

http://hg.python.org/cpython/rev/521d88a1a63f
changeset:   85852:521d88a1a63f
parent:      85849:815780593826
parent:      85851:74752bfa6357
user:        Richard Oudkerk <shibturn at gmail.com>
date:        Sun Sep 29 17:33:04 2013 +0100
summary:
  Merge.

files:
  Lib/test/_test_multiprocessing.py |  17 +++++++++--------
  1 files changed, 9 insertions(+), 8 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
@@ -3038,12 +3038,19 @@
 # Verifies os.close(sys.stdin.fileno) vs. sys.stdin.close() behavior
 #
 
-def _ThisSubProcess(q):
+def _this_sub_process(q):
     try:
         item = q.get(block=False)
     except pyqueue.Empty:
         pass
 
+def _test_process(q):
+    queue = multiprocessing.Queue()
+    subProc = multiprocessing.Process(target=_this_sub_process, args=(queue,))
+    subProc.daemon = True
+    subProc.start()
+    subProc.join()
+
 def _afunc(x):
     return x*x
 
@@ -3077,14 +3084,8 @@
 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 = multiprocessing.Process(target=_test_process, args=(queue,))
         proc.start()
         proc.join()
 

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