[Checkins] SVN: Products.MIMETools/trunk/src/Products/MIMETools/ Cleanup
Hanno Schlichting
hannosch at hannosch.eu
Sat Jul 10 04:45:15 EDT 2010
Log message for revision 114466:
Cleanup
Changed:
U Products.MIMETools/trunk/src/Products/MIMETools/MIMETag.py
U Products.MIMETools/trunk/src/Products/MIMETools/__init__.py
-=-
Modified: Products.MIMETools/trunk/src/Products/MIMETools/MIMETag.py
===================================================================
--- Products.MIMETools/trunk/src/Products/MIMETools/MIMETag.py 2010-07-10 08:27:43 UTC (rev 114465)
+++ Products.MIMETools/trunk/src/Products/MIMETools/MIMETag.py 2010-07-10 08:45:14 UTC (rev 114466)
@@ -10,22 +10,30 @@
# FOR A PARTICULAR PURPOSE
#
##############################################################################
-__rcs_id__='$Id$'
-__version__='$Revision: 1.12 $'[11:-2]
-from DocumentTemplate.DT_Util import *
-from DocumentTemplate.DT_String import String
from cStringIO import StringIO
import mimetools
-MIMEError = "MIME Tag Error"
+from DocumentTemplate.DT_Util import _tm
+from DocumentTemplate.DT_Util import Eval
+from DocumentTemplate.DT_Util import parse_params
+from DocumentTemplate.DT_Util import ParseError
+from DocumentTemplate.DT_Util import render_blocks
+from DocumentTemplate.DT_String import String
+
+class MIMEError(Exception):
+ """MIME Tag Error"""
+
+ENCODINGS = ('base64', 'quoted-printable', 'uuencode', 'x-uuencode', 'uue',
+ 'x-uue', '7bit')
+
+
class MIMETag:
- '''
- '''
+ ''''''
name='mime'
- blockContinuations=('boundary',)
+ blockContinuations=('boundary', )
encode=None
def __init__(self, blocks):
@@ -33,138 +41,138 @@
for tname, args, section in blocks:
if tname == 'mime':
- args = parse_params( args
- , type=None, type_expr=None
- , disposition=None, disposition_expr=None
- , encode=None, encode_expr=None
- , name=None, name_expr=None
- , filename=None, filename_expr=None
- , cid=None, cid_expr=None
- , charset=None, charset_expr=None
- , skip_expr=None
- , multipart=None
- )
+ args = parse_params(args, type=None, type_expr=None,
+ disposition=None, disposition_expr=None,
+ encode=None, encode_expr=None, name=None,
+ name_expr=None, filename=None,
+ filename_expr=None, cid=None,
+ cid_expr=None, charset=None,
+ charset_expr=None, skip_expr=None,
+ multipart=None)
self.multipart = args.get('multipart', 'mixed')
else:
- args = parse_params( args
- , type=None, type_expr=None
- , disposition=None, disposition_expr=None
- , encode=None, encode_expr=None
- , name=None, name_expr=None
- , filename=None, filename_expr=None
- , cid=None, cid_expr=None
- , charset=None, charset_expr=None
- , skip_expr=None
- )
+ args = parse_params(args, type=None, type_expr=None,
+ disposition=None, disposition_expr=None,
+ encode=None, encode_expr=None, name=None,
+ name_expr=None, filename=None,
+ filename_expr=None, cid=None,
+ cid_expr=None, charset=None,
+ charset_expr=None, skip_expr=None)
- has_key=args.has_key
-
- if has_key('type'):
- type = args['type']
- else:
- type = 'application/octet-stream'
-
- if has_key('type_expr'):
- if has_key('type'):
- raise ParseError, _tm('type and type_expr given', 'mime')
- args['type_expr']=Eval(args['type_expr'])
- elif not has_key('type'):
+ if 'type_expr' in args:
+ if 'type' in args:
+ raise ParseError(_tm('type and type_expr given', 'mime'))
+ args['type_expr'] = Eval(args['type_expr'])
+ elif 'type' not in args:
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']=Eval(args['disposition_expr'])
- elif not has_key('disposition'):
- args['disposition']=''
+ if 'disposition_expr' in args:
+ if 'disposition' in args:
+ raise ParseError(
+ _tm('disposition and disposition_expr given', 'mime'))
+ args['disposition_expr'] = Eval(args['disposition_expr'])
+ elif 'disposition' not in args:
+ args['disposition'] = ''
- if has_key('encode_expr'):
- if has_key('encode'):
- raise ParseError, _tm('encode and encode_expr given', 'mime')
- args['encode_expr']=Eval(args['encode_expr'])
- elif not has_key('encode'):
- args['encode']='base64'
+ if 'encode_expr' in args:
+ if 'encode' in args:
+ raise ParseError(
+ _tm('encode and encode_expr given', 'mime'))
+ args['encode_expr'] = Eval(args['encode_expr'])
+ elif 'encode' not in args:
+ args['encode'] = 'base64'
- if has_key('name_expr'):
- if has_key('name'):
- raise ParseError, _tm('name and name_expr given', 'mime')
- args['name_expr']=Eval(args['name_expr'])
- elif not has_key('name'):
- args['name']=''
+ if 'name_expr' in args:
+ if 'name' in args:
+ raise ParseError(_tm('name and name_expr given', 'mime'))
+ args['name_expr'] = Eval(args['name_expr'])
+ elif 'name' not in args:
+ args['name'] = ''
- if has_key('filename_expr'):
- if has_key('filename'):
- raise ParseError, _tm('filename and filename_expr given', 'mime')
- args['filename_expr']=Eval(args['filename_expr'])
- elif not has_key('filename'):
- args['filename']=''
+ if 'filename_expr' in args:
+ if 'filename' in args:
+ raise ParseError(
+ _tm('filename and filename_expr given', 'mime'))
+ args['filename_expr'] = Eval(args['filename_expr'])
+ elif 'filename' not in args:
+ args['filename'] = ''
- if has_key('cid_expr'):
- if has_key('cid'):
- raise ParseError, _tm('cid and cid_expr given', 'mime')
- args['cid_expr']=Eval(args['cid_expr'])
- elif not has_key('cid'):
- args['cid']=''
+ if 'cid_expr' in args:
+ if 'cid' in args:
+ raise ParseError(_tm('cid and cid_expr given', 'mime'))
+ args['cid_expr'] = Eval(args['cid_expr'])
+ elif 'cid' not in args:
+ args['cid'] = ''
- if has_key('charset_expr'):
- if has_key('charset'):
- raise ParseError, _tm('charset and charset_expr given', 'mime')
- args['charset_expr']=Eval(args['charset_expr'])
- elif not has_key('charset'):
- args['charset']=''
+ if 'charset_expr' in args:
+ if 'charset' in args:
+ raise ParseError(
+ _tm('charset and charset_expr given', 'mime'))
+ args['charset_expr'] = Eval(args['charset_expr'])
+ elif 'charset' not in args:
+ args['charset'] = ''
- if has_key('skip_expr'):
- args['skip_expr']=Eval(args['skip_expr'])
+ if 'skip_expr' in args:
+ args['skip_expr'] = Eval(args['skip_expr'])
- if args['encode'] not in \
- ('base64', 'quoted-printable', 'uuencode', 'x-uuencode',
- 'uue', 'x-uue', '7bit'):
- raise MIMEError, (
- 'An unsupported encoding was specified in tag')
+ if args['encode'] not in ENCODINGS:
+ raise MIMEError('An unsupported encoding was specified in tag')
self.sections.append((args, section.blocks))
-
def render(self, md):
from MimeWriter import MimeWriter # deprecated since Python 2.3!
- contents=[]
IO = StringIO()
IO.write("Mime-Version: 1.0\n")
mw = MimeWriter(IO)
outer = mw.startmultipartbody(self.multipart)
+
for x in self.sections:
a, b = x
- has_key=a.has_key
-
- if has_key('skip_expr') and a['skip_expr'].eval(md):
+ if 'skip_expr' in a and a['skip_expr'].eval(md):
continue
inner = mw.nextpart()
- if has_key('type_expr'): t=a['type_expr'].eval(md)
- else: t=a['type']
+ if 'type_expr' in a:
+ t = a['type_expr'].eval(md)
+ else:
+ t = a['type']
- if has_key('disposition_expr'): d=a['disposition_expr'].eval(md)
- else: d=a['disposition']
+ if 'disposition_expr' in a:
+ d = a['disposition_expr'].eval(md)
+ else:
+ d = a['disposition']
- if has_key('encode_expr'): e=a['encode_expr'].eval(md)
- else: e=a['encode']
+ if 'encode_expr' in a:
+ e = a['encode_expr'].eval(md)
+ else:
+ e = a['encode']
- if has_key('name_expr'): n=a['name_expr'].eval(md)
- else: n=a['name']
+ if 'name_expr' in a:
+ n = a['name_expr'].eval(md)
+ else:
+ n = a['name']
- if has_key('filename_expr'): f=a['filename_expr'].eval(md)
- else: f=a['filename']
+ if 'filename_expr' in a:
+ f = a['filename_expr'].eval(md)
+ else:
+ f = a['filename']
- if has_key('cid_expr'): cid=a['cid_expr'].eval(md)
- else: cid=a['cid']
+ if 'cid_expr' in a:
+ cid = a['cid_expr'].eval(md)
+ else:
+ cid = a['cid']
- if has_key('charset_expr'): charset=a['charset_expr'].eval(md)
- else: charset=a['charset']
+ if 'charset_expr' in a:
+ charset = a['charset_expr'].eval(md)
+ else:
+ charset = a['charset']
if d:
if f:
- inner.addheader('Content-Disposition', '%s;\n filename="%s"' % (d, f))
+ inner.addheader('Content-Disposition',
+ '%s;\n filename="%s"' % (d, f))
else:
inner.addheader('Content-Disposition', d)
@@ -192,17 +200,15 @@
output.seek(0)
innerfile.write(output.read())
- # XXX what if self.sections is empty ??? does it matter that mw.lastpart() is called
- # right after mw.startmultipartbody() ?
+ # XXX what if self.sections is empty ??? does it matter that
+ # mw.lastpart() is called right after mw.startmultipartbody() ?
if x is self.sections[-1]:
mw.lastpart()
outer.seek(0)
return outer.read()
+ __call__ = render
- __call__=render
-
-
String.commands['mime'] = MIMETag
Modified: Products.MIMETools/trunk/src/Products/MIMETools/__init__.py
===================================================================
--- Products.MIMETools/trunk/src/Products/MIMETools/__init__.py 2010-07-10 08:27:43 UTC (rev 114465)
+++ Products.MIMETools/trunk/src/Products/MIMETools/__init__.py 2010-07-10 08:45:14 UTC (rev 114466)
@@ -10,8 +10,5 @@
# FOR A PARTICULAR PURPOSE
#
##############################################################################
-__doc__='''MIMETools Product Initialization
-$Id$'''
-__version__='$Revision: 1.3 $'[11:-2]
import MIMETag
More information about the checkins
mailing list