Commit d53167d2 authored by Jim Fulton's avatar Jim Fulton

Added check for in on string, which now raises an error.

Added check for 'sequence-item' in sort attribute.
parent 250ebe00
...@@ -349,8 +349,8 @@ ...@@ -349,8 +349,8 @@
''' #' ''' #'
__rcs_id__='$Id: DT_In.py,v 1.30 1998/09/14 22:03:32 jim Exp $' __rcs_id__='$Id: DT_In.py,v 1.31 1998/10/21 14:58:12 jim Exp $'
__version__='$Revision: 1.30 $'[11:-2] __version__='$Revision: 1.31 $'[11:-2]
from DT_Util import ParseError, parse_params, name_param, str from DT_Util import ParseError, parse_params, name_param, str
from DT_Util import render_blocks, InstanceDict from DT_Util import render_blocks, InstanceDict
...@@ -384,7 +384,10 @@ class InClass: ...@@ -384,7 +384,10 @@ class InClass:
self.args=args self.args=args
has_key=args.has_key has_key=args.has_key
if has_key('sort'): self.sort=args['sort'] if has_key('sort'):
self.sort=sort=args['sort']
if sort=='sequence-item': self.sort=''
if has_key('mapping'): self.mapping=args['mapping'] if has_key('mapping'): self.mapping=args['mapping']
for n in 'start', 'size', 'end': for n in 'start', 'size', 'end':
if has_key(n): self.batch=1 if has_key(n): self.batch=1
...@@ -439,6 +442,10 @@ class InClass: ...@@ -439,6 +442,10 @@ class InClass:
if self.elses: return render_blocks(self.elses, md) if self.elses: return render_blocks(self.elses, md)
return '' return ''
if type(sequence) is type(''):
raise 'InError', (
'Strings are not allowed as input to the in tag.')
section=self.section section=self.section
params=self.args params=self.args
...@@ -587,6 +594,10 @@ class InClass: ...@@ -587,6 +594,10 @@ class InClass:
if self.elses: return render_blocks(self.elses, md) if self.elses: return render_blocks(self.elses, md)
return '' return ''
if type(sequence) is type(''):
raise 'InError', (
'Strings are not allowed as input to the in tag.')
section=self.section section=self.section
mapping=self.mapping mapping=self.mapping
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment