summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Noller <jnoller@gmail.com>2010-07-03 12:26:02 +0000
committerJesse Noller <jnoller@gmail.com>2010-07-03 12:26:02 +0000
commit883d3f1016633e5f1096a4fc8b57a9001851e262 (patch)
treeebfa516a8cf2fb1c78007b27b6d1af04bdace951
parent7aa31c024d02eea80ac729ccd925c634a0842175 (diff)
downloadcpython-883d3f1016633e5f1096a4fc8b57a9001851e262.tar.gz
Submit patch for bug 9144; broken imports due to r81380
-rw-r--r--Lib/multiprocessing/connection.py2
-rw-r--r--Lib/multiprocessing/forking.py2
-rw-r--r--Lib/multiprocessing/heap.py2
-rw-r--r--Lib/multiprocessing/reduction.py2
4 files changed, 4 insertions, 4 deletions
diff --git a/Lib/multiprocessing/connection.py b/Lib/multiprocessing/connection.py
index b1f5acd05e..99b338edb1 100644
--- a/Lib/multiprocessing/connection.py
+++ b/Lib/multiprocessing/connection.py
@@ -173,7 +173,7 @@ if sys.platform != 'win32':
else:
- from ._multiprocessing import win32
+ from _multiprocessing import win32
def Pipe(duplex=True):
'''
diff --git a/Lib/multiprocessing/forking.py b/Lib/multiprocessing/forking.py
index a66f7a0889..5e04725a1e 100644
--- a/Lib/multiprocessing/forking.py
+++ b/Lib/multiprocessing/forking.py
@@ -155,7 +155,7 @@ else:
import _subprocess
import time
- from ._multiprocessing import win32, Connection, PipeConnection
+ from _multiprocessing import win32, Connection, PipeConnection
from .util import Finalize
#try:
diff --git a/Lib/multiprocessing/heap.py b/Lib/multiprocessing/heap.py
index 7e596ca70f..697a5f5516 100644
--- a/Lib/multiprocessing/heap.py
+++ b/Lib/multiprocessing/heap.py
@@ -26,7 +26,7 @@ __all__ = ['BufferWrapper']
if sys.platform == 'win32':
- from ._multiprocessing import win32
+ from _multiprocessing import win32
class Arena(object):
diff --git a/Lib/multiprocessing/reduction.py b/Lib/multiprocessing/reduction.py
index 1813729e64..60e71513e9 100644
--- a/Lib/multiprocessing/reduction.py
+++ b/Lib/multiprocessing/reduction.py
@@ -34,7 +34,7 @@ if not(sys.platform == 'win32' or hasattr(_multiprocessing, 'recvfd')):
if sys.platform == 'win32':
import _subprocess
- from ._multiprocessing import win32
+ from _multiprocessing import win32
def send_handle(conn, handle, destination_pid):
process_handle = win32.OpenProcess(