[Zope-Checkins] CVS: Zope/lib/python/Shared/DC/ZRDB - sqltest.py:1.14.16.3
Matthew T. Kromer
matt@zope.com
Fri, 22 Feb 2002 11:20:02 -0500
Update of /cvs-repository/Zope/lib/python/Shared/DC/ZRDB
In directory cvs.zope.org:/tmp/cvs-serv6425/lib/python/Shared/DC/ZRDB
Modified Files:
Tag: Zope-2_5-branch
sqltest.py
Log Message:
Remove more tabs
=== Zope/lib/python/Shared/DC/ZRDB/sqltest.py 1.14.16.2 => 1.14.16.3 ===
self.args=args
if not args.has_key('type'):
- raise ParseError, ('the type attribute is required', 'sqltest')
+ raise ParseError, ('the type attribute is required', 'sqltest')
self.type=t=args['type']
if not valid_type(t):
@@ -103,9 +103,9 @@
elif self.__name__ is None:
err = ' the column attribute is required if an expression is used'
raise ParseError, (err, 'sqltest')
- else:
+ else:
self.column=self.__name__
-
+
# Deal with optional operator specification
op = '=' # Default
if args.has_key('op'):
@@ -116,19 +116,19 @@
def render(self, md):
- name=self.__name__
-
+ name=self.__name__
+
t=self.type
args=self.args
try:
- expr=self.expr
- if type(expr) is type(''):
- v=md[expr]
- else:
- v=expr(md)
- except KeyError:
- if args.has_key('optional') and args['optional']:
- return ''
+ expr=self.expr
+ if type(expr) is type(''):
+ v=md[expr]
+ else:
+ v=expr(md)
+ except KeyError:
+ if args.has_key('optional') and args['optional']:
+ return ''
raise 'Missing Input', 'Missing input variable, <em>%s</em>' % name
if type(v) in (ListType, TupleType):
@@ -144,9 +144,9 @@
if t=='int':
try:
if type(v) is StringType:
- if v[-1:]=='L':
- v=v[:-1]
- atoi(v)
+ if v[-1:]=='L':
+ v=v[:-1]
+ atoi(v)
else: v=str(int(v))
except ValueError:
raise ValueError, (
@@ -166,10 +166,10 @@
#v="'%s'" % v
vs.append(v)
- if not vs and t=='nb':
- if args.has_key('optional') and args['optional']:
- return ''
- else:
+ if not vs and t=='nb':
+ if args.has_key('optional') and args['optional']:
+ return ''
+ else:
err = 'Invalid empty string value for <em>%s</em>' % name
raise ValueError, err