Avoid cycles when shadowing Choice._resolve_vocabulary.

zopefoundation · Sep 4, 2018 · 00f6e0d · 00f6e0d
1 parent 2213d48
commit 00f6e0d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/zope/schema/_field.py b/src/zope/schema/_field.py
@@ -420,8 +420,8 @@ def bind(self, context):
         clone = super(Choice, self).bind(context)
         # Eagerly get registered vocabulary if needed;
         # once that's done, just return it
-        clone.vocabulary = clone._resolve_vocabulary(None)
-        clone._resolve_vocabulary = lambda value: clone.vocabulary
+        vocabulary = clone.vocabulary = clone._resolve_vocabulary(None)
+        clone._resolve_vocabulary = lambda value: vocabulary
         return clone
 
     def fromUnicode(self, str):