bpo-38840: Incorrect __all__ in multiprocessing.managers (pythonGH-18034)

ZackerySpytz · xdegaye · ambv · web-flow · commit d09787611188 · 2021-08-09T18:44:55.000+02:00
This was causing test___all__ to fail on platforms lacking a shared
memory implementation.

Co-Authored-By: Xavier de Gaye &lt;xdegaye@gmail.com&gt;
Co-authored-by: Łukasz Langa &lt;lukasz@langa.pl&gt;
diff --git 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 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
@@ -0,0 +1 @@
+Fix ``test___all__`` on platforms lacking a shared memory implementation.

Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,7 @@`
`8`	`8`	`# Licensed to PSF under a Contributor Agreement.`
`9`	`9`	`#`
`10`	`10`
`11`		`-__all__ = [ 'BaseManager', 'SyncManager', 'BaseProxy', 'Token',`
`12`		`- 'SharedMemoryManager' ]`
	`11`	`+__all__ = [ 'BaseManager', 'SyncManager', 'BaseProxy', 'Token' ]`
`13`	`12`
`14`	`13`	`#`
`15`	`14`	`# Imports`
`@@ -35,9 +34,11 @@`
`35`	`34`	`from . import get_context`
`36`	`35`	`try:`
`37`	`36`	`from . import shared_memory`
`38`		`- HAS_SHMEM = True`
`39`	`37`	`except ImportError:`
`40`	`38`	`HAS_SHMEM = False`
	`39`	`+else:`
	`40`	`+ HAS_SHMEM = True`
	`41`	`+ __all__.append('SharedMemoryManager')`
`41`	`42`
`42`	`43`	`#`
`43`	`44`	`# Register some things for pickling`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Fix ``test___all__`` on platforms lacking a shared memory implementation.