[Zope-Checkins] CVS: Zope2 - DT_In.py:1.43.4.6 DT_Util.py:1.71.8.3

[fred@digicool.com]

Update of /cvs-repository/Zope2/lib/python/DocumentTemplate
In directory korak.digicool.com:/tmp/cvs-serv15471

Modified Files:
      Tag: zope-2_3-branch
	DT_In.py DT_Util.py 
Log Message:

Martijn Pieters caught me using Python 2.1 with the Zope 2.3.x branch,
and kindly informed me that we don't need to worry about Python 2.x
on the branch.  (Sorry!)

So I'm removing the magical import finagling from the branch that
makes no difference with Python 1.5.2.



--- Updated File DT_In.py in package Zope2 --
--- DT_In.py	2001/06/06 16:54:22	1.43.4.5
+++ DT_In.py	2001/06/07 13:30:28	1.43.4.6
@@ -393,11 +393,6 @@
 from DT_Util import render_blocks, InstanceDict, ValidationError, VSEval, expr_globals
 from string import find, atoi, join, split
 
-try:
-    from strop import join
-except ImportError:
-    pass
-
 import ts_regex
 from DT_InSV import sequence_variables, opt
 StringType=type('')

--- Updated File DT_Util.py in package Zope2 --
--- DT_Util.py	2001/06/06 17:18:29	1.71.8.2
+++ DT_Util.py	2001/06/07 13:30:28	1.71.8.3
@@ -92,13 +92,6 @@
 from __builtin__ import str  # XXX needed for pickling (legacy)
 from string import strip, atoi, lower, replace
 
-# strop.replace() is faster than string.replace() (when they aren't
-# the same), so use it if possible.
-try:
-    from strop import replace
-except ImportError:
-    pass
-
 
 ListType=type([])
 StringType=type('')