[Zope-Checkins] CVS: Zope/lib/python/Products/MailHost - MailHost.py:1.74 SendMailTag.py:1.17 __init__.py:1.22
Martijn Pieters
mj@zope.com
Wed, 14 Aug 2002 18:15:22 -0400
Update of /cvs-repository/Zope/lib/python/Products/MailHost
In directory cvs.zope.org:/tmp/cvs-serv22561
Modified Files:
MailHost.py SendMailTag.py __init__.py
Log Message:
Clean up indentation and trailing whitespace.
=== Zope/lib/python/Products/MailHost/MailHost.py 1.73 => 1.74 ===
--- Zope/lib/python/Products/MailHost/MailHost.py:1.73 Mon Aug 12 17:50:31 2002
+++ Zope/lib/python/Products/MailHost/MailHost.py Wed Aug 14 18:14:51 2002
@@ -1,14 +1,14 @@
##############################################################################
#
# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE
-#
+#
##############################################################################
"""SMTP mail objects
$Id$"""
@@ -54,7 +54,7 @@
manage_options=(
(
{'icon':'', 'label':'Edit',
- 'action':'manage_main',
+ 'action':'manage_main',
'help':('MailHost','Mail-Host_Edit.stx')},
)
+RoleManager.manage_options
@@ -93,10 +93,10 @@
, REQUEST
, manage_tabs_message=msg
)
-
+
security.declareProtected( use_mailhost_services, 'sendTemplate' )
- def sendTemplate(trueself, self, messageTemplate,
+ def sendTemplate(trueself, self, messageTemplate,
statusTemplate=None, mto=None, mfrom=None,
encode=None, REQUEST=None):
'render a mail template, then send it...'
@@ -124,7 +124,7 @@
self._send(mfrom, mto, messageText)
- # This is here for backwards compatibility only. Possibly it could
+ # This is here for backwards compatibility only. Possibly it could
# be used to send messages at a scheduled future time, or via a mail queue?
security.declareProtected( use_mailhost_services, 'scheduledSend' )
scheduledSend = send
@@ -144,7 +144,7 @@
smtpserver.sendmail( mfrom, mto, messageText )
smtpserver.quit()
-
+
InitializeClass( MailBase )
class MailHost(Persistent, MailBase):
@@ -155,7 +155,7 @@
return body
mfile=StringIO(body)
mo=mimetools.Message(mfile)
- if mo.getencoding() != '7bit':
+ if mo.getencoding() != '7bit':
raise MailHostError, 'Message already encoded'
newmfile=StringIO()
newmfile.write(''.join(mo.headers))
=== Zope/lib/python/Products/MailHost/SendMailTag.py 1.16 => 1.17 ===
--- Zope/lib/python/Products/MailHost/SendMailTag.py:1.16 Mon Mar 11 10:54:38 2002
+++ Zope/lib/python/Products/MailHost/SendMailTag.py Wed Aug 14 18:14:51 2002
@@ -1,14 +1,14 @@
##############################################################################
#
# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE
-#
+#
##############################################################################
__rcs_id__='$Id$'
__version__='$Revision$'[11:-2]
=== Zope/lib/python/Products/MailHost/__init__.py 1.21 => 1.22 ===
--- Zope/lib/python/Products/MailHost/__init__.py:1.21 Wed Nov 28 10:50:59 2001
+++ Zope/lib/python/Products/MailHost/__init__.py Wed Aug 14 18:14:51 2002
@@ -1,14 +1,14 @@
##############################################################################
#
# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE
-#
+#
##############################################################################
__doc__='''MailHost Product Initialization
$Id$'''