[Zope-Checkins] CVS: Zope2 - MIMETag.py:1.6

[shane@digicool.com]

Update of /cvs-repository/Zope2/lib/python/Products/MIMETools
In directory korak:/tmp/cvs-serv17686/lib/python/Products/MIMETools

Modified Files:
	MIMETag.py 
Log Message:
Merged RestrictedPythonBranch!



--- Updated File MIMETag.py in package Zope2 --
--- MIMETag.py	2000/05/10 18:43:34	1.5
+++ MIMETag.py	2001/04/27 20:27:41	1.6
@@ -136,40 +136,40 @@
             if has_key('type_expr'):
                 if has_key('type'):
                     raise ParseError, _tm('type and type_expr given', 'mime')
-                args['type_expr']=VSEval.Eval(args['type_expr'], expr_globals)
+                args['type_expr']=Eval(args['type_expr'])
             elif not has_key('type'):
                 args['type']='application/octet-stream'
 
             if has_key('disposition_expr'):
                 if has_key('disposition'):
                     raise ParseError, _tm('disposition and disposition_expr given', 'mime')
-                args['disposition_expr']=VSEval.Eval(args['disposition_expr'], expr_globals)
+                args['disposition_expr']=Eval(args['disposition_expr'])
             elif not has_key('disposition'):
                 args['disposition']=''
 
             if has_key('encode_expr'):
                 if has_key('encode'):
                     raise ParseError, _tm('encode and encode_expr given', 'mime')
-                args['encode_expr']=VSEval.Eval(args['encode_expr'], expr_globals)
+                args['encode_expr']=Eval(args['encode_expr'])
             elif not has_key('encode'):
                 args['encode']='base64'
 
             if has_key('name_expr'):
                 if has_key('name'):
                     raise ParseError, _tm('name and name_expr given', 'mime')
-                args['name_expr']=VSEval.Eval(args['name_expr'], expr_globals)
+                args['name_expr']=Eval(args['name_expr'])
             elif not has_key('name'):
                 args['name']=''
 
             if has_key('filename_expr'):
                 if has_key('filename'):
                     raise ParseError, _tm('filename and filename_expr given', 'mime')
-                args['filename_expr']=VSEval.Eval(args['filename_expr'], expr_globals)
+                args['filename_expr']=Eval(args['filename_expr'])
             elif not has_key('filename'):
                 args['filename']=''
 
             if has_key('skip_expr'):
-                args['skip_expr']=VSEval.Eval(args['skip_expr'], expr_globals)
+                args['skip_expr']=Eval(args['skip_expr'])
 
             if args['encode'] not in \
             ('base64', 'quoted-printable', 'uuencode', 'x-uuencode',