Make sure init is called only once.

zopefoundation · Jun 5, 2012 · 30f54de · 30f54de
1 parent 35f877a
commit 30f54de
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/cipher/configstore/configstore.py b/src/cipher/configstore/configstore.py
@@ -242,9 +242,13 @@ def _add(self, name, item):
     def _applyPostAddConfig(self, item, config, section):
         pass
 
+    def clearContext(self):
+        ctx = removeSecurityProxy(self.context)
+        for key in list(ctx):
+            del ctx[key]
+
     def load(self, config):
-        # Remove all existing items
-        removeSecurityProxy(self.context).__init__()
+        self.clearContext()
         # Load one item at a time.
         for section in config.sections():
             if not section.startswith(self.section_prefix):

diff --git a/src/cipher/configstore/configstore.txt b/src/cipher/configstore/configstore.txt
@@ -200,10 +200,14 @@ Let's say a person has a collection of phone numbers:
 
   >>> class PhoneNumbers(dict):
   ...     zope.interface.implements(IPhoneNumbers)
+  ...     def __init__(self):
+  ...         print "Initializing PhoneNumbers"
+  ...         super(PhoneNumbers, self).__init__()
   ...     def __repr__(self):
   ...         return '<%s %i>' %(self.__class__.__name__, len(self))
 
   >>> numbers = PhoneNumbers()
+  Initializing PhoneNumbers
   >>> numbers['home'] = PhoneNumber(u'home', u'555-111-2222')
   >>> numbers['work'] = PhoneNumber(u'work', u'555-333-4444')