Changed so exception is raised if a sequence cannot be gotten during

rendering.

lib/python/DocumentTemplate/DT_If.py

@@ -110,10 +110,11 @@ __doc__='''Conditional insertion
 #   (540) 371-6909
 #
 ############################################################################ 
-__rcs_id__='$Id: DT_If.py,v 1.4 1997/09/25 18:56:38 jim Exp $'
-__version__='$Revision: 1.4 $'[11:-2]
+__rcs_id__='$Id: DT_If.py,v 1.5 1997/11/07 17:08:11 jim Exp $'
+__version__='$Revision: 1.5 $'[11:-2]
 
 from DT_Util import *
+import sys
 
 class If:
     blockContinuations='else','elif'
@@ -151,7 +152,9 @@ class If:
 	for name, expr, section in self.sections:
 	    if expr is None:
 		try: v=md[name]
-		except: v=None
+		except KeyError, ev:
+		    if ev is not name: raise KeyError, name, sys.exc_traceback
+		    v=None
 	    else:
 		v=expr.eval(md)
 
@@ -175,8 +178,11 @@ class Else:
 	self.section=section
 
     def render(self,md):
-	try: v=md[self.__name__]
-	except: v=None
+	name=self.__name__
+	try: v=md[name]
+	except KeyError, ev:
+	    if ev is not name: raise KeyError, name, sys.exc_traceback
+	    v=None
 	if not v: return self.section(None,md)
 	return ''
 
@@ -185,6 +191,10 @@ class Else:
 ##########################################################################
 #
 # $Log: DT_If.py,v $
+# Revision 1.5  1997/11/07 17:08:11  jim
+# Changed so exception is raised if a sequence cannot be gotten during
+# rendering.
+#
 # Revision 1.4  1997/09/25 18:56:38  jim
 # fixed problem in reporting errors
 #

lib/python/DocumentTemplate/DT_In.py

@@ -228,9 +228,9 @@
 
       Missing values are either 'None' or the attribute 'Value'
       of the module 'Missing', if present.
-'''
+''' #'
 
-__rcs_id__='$Id: DT_In.py,v 1.8 1997/10/28 16:33:49 paul Exp $'
+__rcs_id__='$Id: DT_In.py,v 1.9 1997/11/07 17:08:33 jim Exp $'
 
 ############################################################################
 #     Copyright 
@@ -284,7 +284,7 @@ __rcs_id__='$Id: DT_In.py,v 1.8 1997/10/28 16:33:49 paul Exp $'
 #   (540) 371-6909
 #
 ############################################################################ 
-__version__='$Revision: 1.8 $'[11:-2]
+__version__='$Revision: 1.9 $'[11:-2]
 
 from DT_Util import *
 from string import find, atoi, join
@@ -332,9 +332,7 @@ class In:
 
     def render(self, md):
 	expr=self.expr
-	if expr is None:
-	    try: sequence=md[self.__name__] or None
-	    except: sequence=None
+	if expr is None: sequence=md[self.__name__]
 	else: sequence=expr.eval(md)
 
 	if not sequence:
@@ -790,6 +788,10 @@ class sequence_variables:
 
 ############################################################################
 # $Log: DT_In.py,v $
+# Revision 1.9  1997/11/07 17:08:33  jim
+# Changed so exception is raised if a sequence cannot be gotten during
+# rendering.
+#
 # Revision 1.8  1997/10/28 16:33:49  paul
 # Small change to docstring.
 #