From e605e4f09a691aa68ddd6642f52afde221085e25 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 11 Jun 2008 12:26:31 +0000
Subject: fix import of multiprocessing by juggling imports
---
Lib/multiprocessing/__init__.py | 4 +++-
Lib/test/test_multiprocessing.py | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Lib/multiprocessing/__init__.py b/Lib/multiprocessing/__init__.py
index 5352be0..1cb3222 100644
--- a/Lib/multiprocessing/__init__.py
+++ b/Lib/multiprocessing/__init__.py
@@ -60,7 +60,6 @@ __author__ = 'R. Oudkerk (r.m.oudkerk@gmail.com)'
import os
import sys
-import _multiprocessing
from multiprocessing.process import Process, current_process, active_children
#
@@ -79,6 +78,9 @@ class TimeoutError(ProcessError):
class AuthenticationError(ProcessError):
pass
+# This is down here because _multiprocessing uses BufferTooShort
+import _multiprocessing
+
#
# Definitions not depending on native semaphores
#
diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py
index 523809b..a67c296 100644
--- a/Lib/test/test_multiprocessing.py
+++ b/Lib/test/test_multiprocessing.py
@@ -16,13 +16,13 @@ import socket
import random
import logging
-import _multiprocessing
import multiprocessing.dummy
import multiprocessing.connection
import multiprocessing.managers
import multiprocessing.heap
import multiprocessing.managers
import multiprocessing.pool
+import _multiprocessing
from multiprocessing import util
--
cgit v0.12