[Zope-Checkins] CVS: Zope/lib/python/DocumentTemplate - DT_In.py:1.61 DT_Var.py:1.60

[Tres Seaver]

Update of /cvs-repository/Zope/lib/python/DocumentTemplate
In directory cvs.zope.org:/tmp/cvs-serv30559/lib/python/DocumentTemplate

Modified Files:
	DT_In.py DT_Var.py 
Log Message:
 - Merge tseaver-strexp_delenda-branch to the head.


=== Zope/lib/python/DocumentTemplate/DT_In.py 1.60 => 1.61 ===
--- Zope/lib/python/DocumentTemplate/DT_In.py:1.60	Wed Aug 14 18:29:52 2002
+++ Zope/lib/python/DocumentTemplate/DT_In.py	Tue Nov 18 08:17:00 2003
@@ -450,7 +450,7 @@
             return ''
 
         if type(sequence) is type(''):
-            raise 'InError', (
+            raise ValueError, (
                 'Strings are not allowed as input to the in tag.')
 
 
@@ -633,7 +633,7 @@
             return ''
 
         if type(sequence) is type(''):
-            raise 'InError', (
+            raise ValueError, (
                 'Strings are not allowed as input to the in tag.')
 
         section=self.section


=== Zope/lib/python/DocumentTemplate/DT_Var.py 1.59 => 1.60 ===
--- Zope/lib/python/DocumentTemplate/DT_Var.py:1.59	Sat Feb  1 04:25:58 2003
+++ Zope/lib/python/DocumentTemplate/DT_Var.py	Tue Nov 18 08:17:00 2003
@@ -303,7 +303,7 @@
         if have_arg('size'):
             size=args['size']
             try: size=int(size)
-            except: raise 'Document Error',(
+            except: raise ValueError,(
                 '''a <code>size</code> attribute was used in a <code>var</code>
                 tag with a non-integer value.''')
             if len(val) > size: