[Zope3-checkins] CVS: Zope3/src/zope/schema - vocabulary.py:1.18 accessors.py:1.6

[Jeremy Hylton]

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

Modified Files:
	vocabulary.py accessors.py 
Log Message:
Remove code that isn't needed now that we require Python 2.3.

Cases include future statements for generators, special case
definitions of builtins like basestring and enumerate, a few uses of
types that are unnecessary.


=== Zope3/src/zope/schema/vocabulary.py 1.17 => 1.18 ===
--- Zope3/src/zope/schema/vocabulary.py:1.17	Mon Jun 16 14:54:31 2003
+++ Zope3/src/zope/schema/vocabulary.py	Tue Nov  4 22:08:11 2003
@@ -30,12 +30,6 @@
 from zope.schema.interfaces import IVocabulary, IVocabularyTokenized
 from zope.schema.interfaces import ITokenizedTerm
 
-try:
-    basestring  # new in Python 2.3
-except NameError:
-    from types import StringTypes as basestring
-
-
 class ContainerValidatedProperty(ValidatedProperty):
 
     def __get__(self, inst, type=None):


=== Zope3/src/zope/schema/accessors.py 1.5 => 1.6 ===
--- Zope3/src/zope/schema/accessors.py:1.5	Thu Sep 25 04:36:32 2003
+++ Zope3/src/zope/schema/accessors.py	Tue Nov  4 22:08:11 2003
@@ -35,9 +35,6 @@
 
 $Id$
 """
-
-from __future__ import generators
-
 from zope.interface import providedBy
 from zope.interface.interface import Method