[Checkins] SVN: zope.schema/trunk/src/zope/schema/fieldproperty.py remove two leading underscores in field: it leads to confusion in getattr

[Jean-Francois Roche]

Log message for revision 112458:
  remove two leading underscores in field: it leads to confusion in getattr

Changed:
  U   zope.schema/trunk/src/zope/schema/fieldproperty.py

-=-
Modified: zope.schema/trunk/src/zope/schema/fieldproperty.py
===================================================================
--- zope.schema/trunk/src/zope/schema/fieldproperty.py	2010-05-18 15:02:56 UTC (rev 112457)
+++ zope.schema/trunk/src/zope/schema/fieldproperty.py	2010-05-18 15:06:37 UTC (rev 112458)
@@ -66,8 +66,8 @@
         if name is None:
             name = field.__name__
 
-        self.__field = copy(field)
-        self.__field.__name__ = "__st_%s_st" % self.__field.__name__
+        self.field = copy(field)
+        self.field.__name__ = "__st_%s_st" % self.field.__name__
         self.__name = name
 
     def setValue(self, inst, field, value):
@@ -80,13 +80,13 @@
         return field.query(inst, default)
 
     def __getattr__(self, name):
-        return getattr(self.__field, name)
+        return getattr(self.field, name)
 
     def __get__(self, inst, klass):
         if inst is None:
             return self
 
-        field = self.__field.bind(inst)
+        field = self.field.bind(inst)
         value = self.getValue(inst, field)
         if value is _marker:
             value = getattr(field, 'default', _marker)
@@ -96,7 +96,7 @@
         return value
 
     def __set__(self, inst, value):
-        field = self.__field.bind(inst)
+        field = self.field.bind(inst)
         field.validate(value)
         if field.readonly:
             if self.queryValue(inst, field, _marker) is _marker: