Merge pull request #9 from zopefoundation/race_condition#8

fix race condition
zopefoundation · Aug 2, 2019 · 3bdf3c9 · 3bdf3c9
2 parents 412d94b + 6e1afbf
commit 3bdf3c9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -5,7 +5,8 @@
 4.4 (unreleased)
 ================
 
-- Nothing changed yet.
+- Avoid race condition in ``deferredmodule.ModuleProxy.__getattr__``
+  `#8 <https://github.com/zopefoundation/zope.deferredimport/issues/8>`_.
 
 
 4.3 (2018-10-05)

diff --git a/src/zope/deferredimport/deferredmodule.py b/src/zope/deferredimport/deferredmodule.py
@@ -64,11 +64,15 @@ def __init__(self, module):
 
     def __getattr__(self, name):
         try:
-            get = self.__deferred_definitions__.pop(name)
+            get = self.__deferred_definitions__[name]
         except KeyError:
             raise AttributeError(name)
         v = get.get()
         setattr(self, name, v)
+        try:
+            del self.__deferred_definitions__[name]
+        except KeyError:  # pragma: no cover
+            pass
         return v
 
 def initialize(level=1):