[Zope3-checkins] CVS: Zope3/src/zope/schema - _bootstrapfields.py:1.13 _field.py:1.11

[Fred L. Drake, Jr.]

Update of /cvs-repository/Zope3/src/zope/schema
In directory cvs.zope.org:/tmp/cvs-serv10331/src/zope/schema

Modified Files:
	_bootstrapfields.py _field.py 
Log Message:
(Try to) Avoid problems with changes in the MRO validation for Python 2.3.
Basically, we should not derive from the same mixin class twice.


=== Zope3/src/zope/schema/_bootstrapfields.py 1.12 => 1.13 ===
--- Zope3/src/zope/schema/_bootstrapfields.py:1.12	Mon Apr 14 15:24:38 2003
+++ Zope3/src/zope/schema/_bootstrapfields.py	Mon Apr 14 16:02:31 2003
@@ -290,7 +290,7 @@
     def constraint(self, value):
         return '\n' not in value and '\r' not in value
 
-class EnumeratedTextLine(Enumerated, TextLine):
+class EnumeratedTextLine(TextLine):
     """TextLine with a value from a list of allowed values."""
 
 class Password(TextLine):
@@ -313,5 +313,5 @@
                           DeprecationWarning, stacklevel=2)
         super(Int, self).__init__(*args, **kw)
 
-class EnumeratedInt(Enumerated, Int):
+class EnumeratedInt(Int):
     """A field representing one of a selected set of Integers."""


=== Zope3/src/zope/schema/_field.py 1.10 => 1.11 ===
--- Zope3/src/zope/schema/_field.py:1.10	Mon Apr 14 15:24:38 2003
+++ Zope3/src/zope/schema/_field.py	Mon Apr 14 16:02:31 2003
@@ -93,7 +93,7 @@
                           DeprecationWarning, stacklevel=2)
         super(Float, self).__init__(*args, **kw)
 
-class EnumeratedFloat(Enumerated, Float):
+class EnumeratedFloat(Float):
     __doc__ = IEnumeratedFloat.__doc__
     __implements__ = IEnumeratedFloat
 
@@ -111,7 +111,7 @@
                           DeprecationWarning, stacklevel=2)
         super(Datetime, self).__init__(*args, **kw)
 
-class EnumeratedDatetime(Enumerated, Datetime):
+class EnumeratedDatetime(Datetime):
     __doc__ = IEnumeratedDatetime.__doc__
     __implements__ = IEnumeratedDatetime