[Zope3-checkins] CVS: Zope3/src/zope/i18n - locales.py:1.17 _strptime.py:NONE

[Jeremy Hylton]

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

Modified Files:
	locales.py 
Removed Files:
	_strptime.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/i18n/locales.py 1.16 => 1.17 ===
--- Zope3/src/zope/i18n/locales.py:1.16	Tue Sep 16 18:06:42 2003
+++ Zope3/src/zope/i18n/locales.py	Tue Nov  4 22:08:14 2003
@@ -20,14 +20,7 @@
 from xml.dom.minidom import parse as parseXML
 from zope.interface import implements
 
-# time.strptime() isn't available on all platforms before Python 2.3.  When
-# it isn't available, use the implementation from 2.3's _strptime.py, checked
-# into this source tree for convenience.  This workaround can be removed
-# when Python 2.3 (or later) becomes required.
-try:
-    from time import strptime
-except ImportError:
-    from _strptime import strptime
+from time import strptime
 
 from zope.i18n.interfaces import ILocaleProvider, ILocale
 from zope.i18n.interfaces import ILocaleVersion, ILocaleIdentity

=== Removed File Zope3/src/zope/i18n/_strptime.py ===