summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2021-08-09 17:39:05 (GMT)
committerGitHub <noreply@github.com>2021-08-09 17:39:05 (GMT)
commit8ece98a7e418c3c68a4c61bc47a2d0931b59a889 (patch)
tree54175faca0d9d518a0ed0af7c50582766fb3f1c2
parentc79aa427c0b0c8a09e5c22a5420baf837054f509 (diff)
downloadcpython-8ece98a7e418c3c68a4c61bc47a2d0931b59a889.zip
cpython-8ece98a7e418c3c68a4c61bc47a2d0931b59a889.tar.gz
cpython-8ece98a7e418c3c68a4c61bc47a2d0931b59a889.tar.bz2
bpo-38840: Incorrect __all__ in multiprocessing.managers (GH-18034)
This was causing test___all__ to fail on platforms lacking a shared memory implementation. Co-Authored-By: Xavier de Gaye <xdegaye@gmail.com> Co-authored-by: Ɓukasz Langa <lukasz@langa.pl> (cherry picked from commit d0978761118856e8ca8ea7b162a6585b8da83df9) Co-authored-by: Zackery Spytz <zspytz@gmail.com>
-rw-r--r--Lib/multiprocessing/managers.py7
-rw-r--r--Misc/NEWS.d/next/Library/2020-01-16-23-41-16.bpo-38840.VzzYZz.rst1
2 files changed, 5 insertions, 3 deletions
diff --git a/Lib/multiprocessing/managers.py b/Lib/multiprocessing/managers.py
index b981b0e..b6b4cdd 100644
--- a/Lib/multiprocessing/managers.py
+++ b/Lib/multiprocessing/managers.py
@@ -8,8 +8,7 @@
# Licensed to PSF under a Contributor Agreement.
#
-__all__ = [ 'BaseManager', 'SyncManager', 'BaseProxy', 'Token',
- 'SharedMemoryManager' ]
+__all__ = [ 'BaseManager', 'SyncManager', 'BaseProxy', 'Token' ]
#
# Imports
@@ -35,9 +34,11 @@ from . import util
from . import get_context
try:
from . import shared_memory
- HAS_SHMEM = True
except ImportError:
HAS_SHMEM = False
+else:
+ HAS_SHMEM = True
+ __all__.append('SharedMemoryManager')
#
# Register some things for pickling
diff --git a/Misc/NEWS.d/next/Library/2020-01-16-23-41-16.bpo-38840.VzzYZz.rst b/Misc/NEWS.d/next/Library/2020-01-16-23-41-16.bpo-38840.VzzYZz.rst
new file mode 100644
index 0000000..727f62b
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2020-01-16-23-41-16.bpo-38840.VzzYZz.rst
@@ -0,0 +1 @@
+Fix ``test___all__`` on platforms lacking a shared memory implementation.