fix import of multiprocessing by juggling imports

diff --git a/Lib/multiprocessing/__init__.py b/Lib/multiprocessing/__init__.py
index 5352be041ace35a88841ee264e6e50131473d2bd..1cb3222e300be422a5eebccb18c41b520cd1775d 100644 (file)
--- a/Lib/multiprocessing/__init__.py
+++ b/Lib/multiprocessing/__init__.py
@@ -60,7 +60,6 @@ __author__ = 'R. Oudkerk (r.m.oudkerk@gmail.com)'
 import os\r
 import sys\r
 \r
-import _multiprocessing\r
 from multiprocessing.process import Process, current_process, active_children\r
 \r
 #\r
@@ -79,6 +78,9 @@ class TimeoutError(ProcessError):
 class AuthenticationError(ProcessError):\r
     pass\r
 \r
+# This is down here because _multiprocessing uses BufferTooShort\r
+import _multiprocessing\r
+\r
 #\r
 # Definitions not depending on native semaphores\r
 #\r

diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py
index 523809b59c821f9e2397cf1eeef28238d17870b8..a67c2960e4052b13ad4c3abd9714750b99b6732f 100644 (file)
--- a/Lib/test/test_multiprocessing.py
+++ b/Lib/test/test_multiprocessing.py
@@ -16,13 +16,13 @@ import socket
 import random\r
 import logging\r
 \r
-import _multiprocessing\r
 import multiprocessing.dummy\r
 import multiprocessing.connection\r
 import multiprocessing.managers\r
 import multiprocessing.heap\r
 import multiprocessing.managers\r
 import multiprocessing.pool\r
+import _multiprocessing\r
 \r
 from multiprocessing import util\r
 \r