[Python-checkins] r64117 - in python/trunk/Lib: multiprocessing/__init__.py test/test_multiprocessing.py

[benjamin.peterson]

Author: benjamin.peterson
Date: Wed Jun 11 14:26:31 2008
New Revision: 64117

Log:
fix import of multiprocessing by juggling imports


Modified:
   python/trunk/Lib/multiprocessing/__init__.py
   python/trunk/Lib/test/test_multiprocessing.py

Modified: python/trunk/Lib/multiprocessing/__init__.py
==============================================================================
--- python/trunk/Lib/multiprocessing/__init__.py	(original)
+++ python/trunk/Lib/multiprocessing/__init__.py	Wed Jun 11 14:26:31 2008
@@ -60,7 +60,6 @@
 import os
 import sys
 
-import _multiprocessing
 from multiprocessing.process import Process, current_process, active_children
 
 #
@@ -79,6 +78,9 @@
 class AuthenticationError(ProcessError):
     pass
 
+# This is down here because _multiprocessing uses BufferTooShort
+import _multiprocessing
+
 #
 # Definitions not depending on native semaphores
 #

Modified: python/trunk/Lib/test/test_multiprocessing.py
==============================================================================
--- python/trunk/Lib/test/test_multiprocessing.py	(original)
+++ python/trunk/Lib/test/test_multiprocessing.py	Wed Jun 11 14:26:31 2008
@@ -16,13 +16,13 @@
 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