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

[richard.oudkerk]

http://hg.python.org/cpython/rev/e8942abfb829
changeset:   89928:e8942abfb829
branch:      3.4
parent:      89925:df6a6951b2c9
parent:      89927:0b2814fc53ae
user:        Richard Oudkerk <shibturn at gmail.com>
date:        Sun Mar 23 12:52:16 2014 +0000
summary:
  Merge 3.3.

files:
  Lib/multiprocessing/popen_fork.py       |  2 +-
  Lib/multiprocessing/popen_forkserver.py |  2 +-
  Misc/NEWS                               |  2 ++
  3 files changed, 4 insertions(+), 2 deletions(-)


diff --git a/Lib/multiprocessing/popen_fork.py b/Lib/multiprocessing/popen_fork.py
--- a/Lib/multiprocessing/popen_fork.py
+++ b/Lib/multiprocessing/popen_fork.py
@@ -47,7 +47,7 @@
     def wait(self, timeout=None):
         if self.returncode is None:
             if timeout is not None:
-                from .connection import wait
+                from multiprocessing.connection import wait
                 if not wait([self.sentinel], timeout):
                     return None
             # This shouldn't block if wait() returned successfully.
diff --git a/Lib/multiprocessing/popen_forkserver.py b/Lib/multiprocessing/popen_forkserver.py
--- a/Lib/multiprocessing/popen_forkserver.py
+++ b/Lib/multiprocessing/popen_forkserver.py
@@ -57,7 +57,7 @@
 
     def poll(self, flag=os.WNOHANG):
         if self.returncode is None:
-            from .connection import wait
+            from multiprocessing.connection import wait
             timeout = 0 if flag == os.WNOHANG else None
             if not wait([self.sentinel], timeout):
                 return None
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -21,6 +21,8 @@
 Library
 -------
 
+- Issue #20633: Replace relative import by absolute import.
+
 - Issue #20980: Stop wrapping exception when using ThreadPool.
 
 - Issue #20990: Fix issues found by pyflakes for multiprocessing.

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