[Zope3-checkins] SVN: Zope3/branches/jim-adapter/ Move
zope.app.mail to zope.app.sendmail, provide BBB,
update zpkg metadata
Brian Sutherland
jinty at web.de
Wed Apr 12 19:28:08 EDT 2006
Log message for revision 66922:
Move zope.app.mail to zope.app.sendmail, provide BBB, update zpkg metadata
Changed:
U Zope3/branches/jim-adapter/releases/Zope/DEPENDENCIES.cfg
U Zope3/branches/jim-adapter/src/zope/app/__init__.py
D Zope3/branches/jim-adapter/src/zope/app/mail/
A Zope3/branches/jim-adapter/src/zope/sendmail/
U Zope3/branches/jim-adapter/src/zope/sendmail/configure.zcml
U Zope3/branches/jim-adapter/src/zope/sendmail/delivery.py
U Zope3/branches/jim-adapter/src/zope/sendmail/event.py
U Zope3/branches/jim-adapter/src/zope/sendmail/mail-configure.zcml
U Zope3/branches/jim-adapter/src/zope/sendmail/mail-meta.zcml
U Zope3/branches/jim-adapter/src/zope/sendmail/maildir.py
U Zope3/branches/jim-adapter/src/zope/sendmail/mailer.py
U Zope3/branches/jim-adapter/src/zope/sendmail/metaconfigure.py
U Zope3/branches/jim-adapter/src/zope/sendmail/tests/mail.zcml
U Zope3/branches/jim-adapter/src/zope/sendmail/tests/test_delivery.py
U Zope3/branches/jim-adapter/src/zope/sendmail/tests/test_directives.py
U Zope3/branches/jim-adapter/src/zope/sendmail/tests/test_event.py
U Zope3/branches/jim-adapter/src/zope/sendmail/tests/test_maildir.py
U Zope3/branches/jim-adapter/src/zope/sendmail/tests/test_mailer.py
-=-
Modified: Zope3/branches/jim-adapter/releases/Zope/DEPENDENCIES.cfg
===================================================================
--- Zope3/branches/jim-adapter/releases/Zope/DEPENDENCIES.cfg 2006-04-12 23:08:06 UTC (rev 66921)
+++ Zope3/branches/jim-adapter/releases/Zope/DEPENDENCIES.cfg 2006-04-12 23:28:07 UTC (rev 66922)
@@ -7,6 +7,7 @@
zope.contentprovider
zope.formlib
zope.rdb
+zope.sendmail
zope.testing
zope.viewlet
zope.app
@@ -20,7 +21,6 @@
zope.app.generations
zope.app.i18nfile
zope.app.introspector
-zope.app.mail
zope.app.onlinehelp
zope.app.pluggableauth
zope.app.securitypolicy
Modified: Zope3/branches/jim-adapter/src/zope/app/__init__.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/__init__.py 2006-04-12 23:08:06 UTC (rev 66921)
+++ Zope3/branches/jim-adapter/src/zope/app/__init__.py 2006-04-12 23:28:07 UTC (rev 66922)
@@ -26,6 +26,13 @@
'zope.app.datetimeutils': 'zope.datetime',
'zope.app.timezones': 'zope.datetime.timezones',
+ 'zope.app.mail': 'zope.sendmail',
+ 'zope.app.mail.event': 'zope.sendmail.event',
+ 'zope.app.mail.maildir': 'zope.sendmail.maildir',
+ 'zope.app.mail.delivery': 'zope.sendmail.delivery',
+ 'zope.app.mail.interfaces': 'zope.sendmail.interfaces',
+ 'zope.app.mail.vocabulary': 'zope.sendmail.vocabulary',
+
'zope.app.rdb': 'zope.rdb',
'zope.app.rdb.interfaces': 'zope.rdb.interfaces',
'zope.app.rdb.browser': 'zope.rdb.browser',
Copied: Zope3/branches/jim-adapter/src/zope/sendmail (from rev 66920, Zope3/branches/jim-adapter/src/zope/app/mail)
Modified: Zope3/branches/jim-adapter/src/zope/sendmail/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/mail/configure.zcml 2006-04-12 23:06:03 UTC (rev 66920)
+++ Zope3/branches/jim-adapter/src/zope/sendmail/configure.zcml 2006-04-12 23:28:07 UTC (rev 66922)
@@ -21,7 +21,7 @@
mailer="smtp" />
-->
- <interface interface="zope.app.mail.interfaces.IMailDelivery" />
+ <interface interface="zope.sendmail.interfaces.IMailDelivery" />
<utility
component=".vocabulary.MailDeliveryNames"
Modified: Zope3/branches/jim-adapter/src/zope/sendmail/delivery.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/mail/delivery.py 2006-04-12 23:06:03 UTC (rev 66920)
+++ Zope3/branches/jim-adapter/src/zope/sendmail/delivery.py 2006-04-12 23:28:07 UTC (rev 66922)
@@ -32,8 +32,8 @@
from socket import gethostname
from zope.interface import implements
-from zope.app.mail.interfaces import IDirectMailDelivery, IQueuedMailDelivery
-from zope.app.mail.maildir import Maildir
+from zope.sendmail.interfaces import IDirectMailDelivery, IQueuedMailDelivery
+from zope.sendmail.maildir import Maildir
from transaction.interfaces import IDataManager
import transaction
Modified: Zope3/branches/jim-adapter/src/zope/sendmail/event.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/mail/event.py 2006-04-12 23:06:03 UTC (rev 66920)
+++ Zope3/branches/jim-adapter/src/zope/sendmail/event.py 2006-04-12 23:28:07 UTC (rev 66922)
@@ -19,7 +19,7 @@
from zope.interface import implements
-from zope.app.mail.interfaces import IMailSentEvent, IMailErrorEvent
+from zope.sendmail.interfaces import IMailSentEvent, IMailErrorEvent
class MailSentEvent(object):
Modified: Zope3/branches/jim-adapter/src/zope/sendmail/mail-configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/mail/mail-configure.zcml 2006-04-12 23:06:03 UTC (rev 66920)
+++ Zope3/branches/jim-adapter/src/zope/sendmail/mail-configure.zcml 2006-04-12 23:28:07 UTC (rev 66922)
@@ -1 +1 @@
-<include package="zope.app.mail"/>
+<include package="zope.sendmail"/>
Modified: Zope3/branches/jim-adapter/src/zope/sendmail/mail-meta.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/mail/mail-meta.zcml 2006-04-12 23:06:03 UTC (rev 66920)
+++ Zope3/branches/jim-adapter/src/zope/sendmail/mail-meta.zcml 2006-04-12 23:28:07 UTC (rev 66922)
@@ -1 +1 @@
-<include package="zope.app.mail" file="meta.zcml"/>
+<include package="zope.sendmail" file="meta.zcml"/>
Modified: Zope3/branches/jim-adapter/src/zope/sendmail/maildir.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/mail/maildir.py 2006-04-12 23:06:03 UTC (rev 66920)
+++ Zope3/branches/jim-adapter/src/zope/sendmail/maildir.py 2006-04-12 23:28:07 UTC (rev 66922)
@@ -23,7 +23,7 @@
from zope.interface import implements, classProvides
-from zope.app.mail.interfaces import \
+from zope.sendmail.interfaces import \
IMaildirFactory, IMaildir, IMaildirMessageWriter
class Maildir(object):
Modified: Zope3/branches/jim-adapter/src/zope/sendmail/mailer.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/mail/mailer.py 2006-04-12 23:06:03 UTC (rev 66920)
+++ Zope3/branches/jim-adapter/src/zope/sendmail/mailer.py 2006-04-12 23:28:07 UTC (rev 66922)
@@ -22,7 +22,7 @@
from smtplib import SMTP
from zope.interface import implements
-from zope.app.mail.interfaces import ISMTPMailer
+from zope.sendmail.interfaces import ISMTPMailer
class SMTPMailer(object):
Modified: Zope3/branches/jim-adapter/src/zope/sendmail/metaconfigure.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/mail/metaconfigure.py 2006-04-12 23:06:03 UTC (rev 66920)
+++ Zope3/branches/jim-adapter/src/zope/sendmail/metaconfigure.py 2006-04-12 23:28:07 UTC (rev 66922)
@@ -22,10 +22,10 @@
from zope.configuration.exceptions import ConfigurationError
from zope.security.checker import InterfaceChecker, CheckerPublic
-from zope.app.mail.delivery import QueuedMailDelivery, DirectMailDelivery
-from zope.app.mail.delivery import QueueProcessorThread
-from zope.app.mail.interfaces import IMailer, IMailDelivery
-from zope.app.mail.mailer import SMTPMailer
+from zope.sendmail.delivery import QueuedMailDelivery, DirectMailDelivery
+from zope.sendmail.delivery import QueueProcessorThread
+from zope.sendmail.interfaces import IMailer, IMailDelivery
+from zope.sendmail.mailer import SMTPMailer
def _assertPermission(permission, interfaces, component):
Modified: Zope3/branches/jim-adapter/src/zope/sendmail/tests/mail.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/mail/tests/mail.zcml 2006-04-12 23:06:03 UTC (rev 66920)
+++ Zope3/branches/jim-adapter/src/zope/sendmail/tests/mail.zcml 2006-04-12 23:28:07 UTC (rev 66922)
@@ -1,7 +1,7 @@
<configure xmlns="http://namespaces.zope.org/zope"
xmlns:mail="http://namespaces.zope.org/mail">
- <include package="zope.app.mail" file="meta.zcml"/>
+ <include package="zope.sendmail" file="meta.zcml"/>
<mail:queuedDelivery
name="Mail"
Modified: Zope3/branches/jim-adapter/src/zope/sendmail/tests/test_delivery.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/mail/tests/test_delivery.py 2006-04-12 23:06:03 UTC (rev 66920)
+++ Zope3/branches/jim-adapter/src/zope/sendmail/tests/test_delivery.py 2006-04-12 23:28:07 UTC (rev 66922)
@@ -24,7 +24,7 @@
from zope.interface import implements
from zope.interface.verify import verifyObject
-from zope.app.mail.interfaces import IMailer
+from zope.sendmail.interfaces import IMailer
class MailerStub(object):
@@ -41,7 +41,7 @@
def testInterface(self):
from transaction.interfaces import IDataManager
- from zope.app.mail.delivery import MailDataManager
+ from zope.sendmail.delivery import MailDataManager
manager = MailDataManager(object, (1, 2))
verifyObject(IDataManager, manager)
self.assertEqual(manager.callable, object)
@@ -51,15 +51,15 @@
class TestDirectMailDelivery(TestCase):
def testInterface(self):
- from zope.app.mail.interfaces import IDirectMailDelivery
- from zope.app.mail.delivery import DirectMailDelivery
+ from zope.sendmail.interfaces import IDirectMailDelivery
+ from zope.sendmail.delivery import DirectMailDelivery
mailer = MailerStub()
delivery = DirectMailDelivery(mailer)
verifyObject(IDirectMailDelivery, delivery)
self.assertEqual(delivery.mailer, mailer)
def testSend(self):
- from zope.app.mail.delivery import DirectMailDelivery
+ from zope.sendmail.delivery import DirectMailDelivery
mailer = MailerStub()
delivery = DirectMailDelivery(mailer)
fromaddr = 'Jim <jim at example.com'
@@ -166,7 +166,7 @@
class TestQueuedMailDelivery(TestCase):
def setUp(self):
- import zope.app.mail.delivery as mail_delivery_module
+ import zope.sendmail.delivery as mail_delivery_module
self.mail_delivery_module = mail_delivery_module
self.old_Maildir = mail_delivery_module.Maildir
mail_delivery_module.Maildir = MaildirStub
@@ -177,14 +177,14 @@
MaildirWriterStub.aborted_messages = []
def testInterface(self):
- from zope.app.mail.interfaces import IQueuedMailDelivery
- from zope.app.mail.delivery import QueuedMailDelivery
+ from zope.sendmail.interfaces import IQueuedMailDelivery
+ from zope.sendmail.delivery import QueuedMailDelivery
delivery = QueuedMailDelivery('/path/to/mailbox')
verifyObject(IQueuedMailDelivery, delivery)
self.assertEqual(delivery.queuePath, '/path/to/mailbox')
def testSend(self):
- from zope.app.mail.delivery import QueuedMailDelivery
+ from zope.sendmail.delivery import QueuedMailDelivery
delivery = QueuedMailDelivery('/path/to/mailbox')
fromaddr = 'jim at example.com'
toaddrs = ('guido at example.com',
@@ -234,7 +234,7 @@
class TestQueueProcessorThread(TestCase):
def setUp(self):
- from zope.app.mail.delivery import QueueProcessorThread
+ from zope.sendmail.delivery import QueueProcessorThread
self.md = MaildirStub('/foo/bar/baz')
self.thread = QueueProcessorThread()
self.thread.setMaildir(self.md)
Modified: Zope3/branches/jim-adapter/src/zope/sendmail/tests/test_directives.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/mail/tests/test_directives.py 2006-04-12 23:06:03 UTC (rev 66920)
+++ Zope3/branches/jim-adapter/src/zope/sendmail/tests/test_directives.py 2006-04-12 23:28:07 UTC (rev 66922)
@@ -26,11 +26,11 @@
from zope.configuration import xmlconfig
from zope.interface import implements
-from zope.app.mail.interfaces import \
+from zope.sendmail.interfaces import \
IMailDelivery, IMailer, ISMTPMailer
-from zope.app.mail.delivery import QueueProcessorThread
-from zope.app.mail import delivery
-import zope.app.mail.tests
+from zope.sendmail.delivery import QueueProcessorThread
+from zope.sendmail import delivery
+import zope.sendmail.tests
class MaildirStub(object):
@@ -61,7 +61,7 @@
gsm.registerUtility(Mailer(), IMailer, "test.smtp")
gsm.registerUtility(self.testMailer, IMailer, "test.mailer")
- self.context = xmlconfig.file("mail.zcml", zope.app.mail.tests)
+ self.context = xmlconfig.file("mail.zcml", zope.sendmail.tests)
self.orig_maildir = delivery.Maildir
delivery.Maildir = MaildirStub
Modified: Zope3/branches/jim-adapter/src/zope/sendmail/tests/test_event.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/mail/tests/test_event.py 2006-04-12 23:06:03 UTC (rev 66920)
+++ Zope3/branches/jim-adapter/src/zope/sendmail/tests/test_event.py 2006-04-12 23:28:07 UTC (rev 66922)
@@ -19,8 +19,8 @@
from zope.interface.verify import verifyObject
-from zope.app.mail.interfaces import IMailSentEvent, IMailErrorEvent
-from zope.app.mail.event import MailSentEvent
+from zope.sendmail.interfaces import IMailSentEvent, IMailErrorEvent
+from zope.sendmail.event import MailSentEvent
class TestMailEvents(TestCase):
@@ -32,7 +32,7 @@
self.assertEquals(m.messageId, msgid)
def testMailErrorEvent(self):
- from zope.app.mail.event import MailErrorEvent
+ from zope.sendmail.event import MailErrorEvent
msgid = '<1234 at example.com>'
error = '550 Relay access denied'
m = MailErrorEvent(msgid, error)
Modified: Zope3/branches/jim-adapter/src/zope/sendmail/tests/test_maildir.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/mail/tests/test_maildir.py 2006-04-12 23:06:03 UTC (rev 66920)
+++ Zope3/branches/jim-adapter/src/zope/sendmail/tests/test_maildir.py 2006-04-12 23:28:07 UTC (rev 66922)
@@ -11,7 +11,7 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""Unit tests for zope.app.mail.maildir module
+"""Unit tests for zope.sendmail.maildir module
$Id$
"""
@@ -131,7 +131,7 @@
class TestMaildir(unittest.TestCase):
def setUp(self):
- import zope.app.mail.maildir as maildir_module
+ import zope.sendmail.maildir as maildir_module
self.maildir_module = maildir_module
self.old_os_module = maildir_module.os
self.old_time_module = maildir_module.time
@@ -150,8 +150,8 @@
self.fake_os_module.path._exists_never_fails = False
def test_factory(self):
- from zope.app.mail.interfaces import IMaildirFactory, IMaildir
- from zope.app.mail.maildir import Maildir
+ from zope.sendmail.interfaces import IMaildirFactory, IMaildir
+ from zope.sendmail.maildir import Maildir
verifyObject(IMaildirFactory, Maildir)
# Case 1: normal maildir
@@ -180,7 +180,7 @@
self.assertRaises(ValueError, Maildir, '/path/to/emptydirectory', True)
def test_iteration(self):
- from zope.app.mail.maildir import Maildir
+ from zope.sendmail.maildir import Maildir
m = Maildir('/path/to/maildir')
messages = list(m)
messages.sort()
@@ -190,8 +190,8 @@
'/path/to/maildir/new/2'])
def test_newMessage(self):
- from zope.app.mail.maildir import Maildir
- from zope.app.mail.interfaces import IMaildirMessageWriter
+ from zope.sendmail.maildir import Maildir
+ from zope.sendmail.interfaces import IMaildirMessageWriter
m = Maildir('/path/to/maildir')
fd = m.newMessage()
verifyObject(IMaildirMessageWriter, fd)
@@ -199,14 +199,14 @@
'/path/to/maildir/tmp/1234500002.4242.myhostname')
def test_newMessage_never_loops(self):
- from zope.app.mail.maildir import Maildir
- from zope.app.mail.interfaces import IMaildirMessageWriter
+ from zope.sendmail.maildir import Maildir
+ from zope.sendmail.interfaces import IMaildirMessageWriter
self.fake_os_module.path._exists_never_fails = True
m = Maildir('/path/to/maildir')
self.assertRaises(RuntimeError, m.newMessage)
def test_message_writer_and_abort(self):
- from zope.app.mail.maildir import MaildirMessageWriter
+ from zope.sendmail.maildir import MaildirMessageWriter
filename1 = '/path/to/maildir/tmp/1234500002.4242.myhostname'
filename2 = '/path/to/maildir/new/1234500002.4242.myhostname'
writer = MaildirMessageWriter(filename1, filename2)
@@ -230,7 +230,7 @@
self.assertRaises(RuntimeError, writer.commit)
def test_message_writer_commit(self):
- from zope.app.mail.maildir import MaildirMessageWriter
+ from zope.sendmail.maildir import MaildirMessageWriter
filename1 = '/path/to/maildir/tmp/1234500002.4242.myhostname'
filename2 = '/path/to/maildir/new/1234500002.4242.myhostname'
writer = MaildirMessageWriter(filename1, filename2)
Modified: Zope3/branches/jim-adapter/src/zope/sendmail/tests/test_mailer.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/mail/tests/test_mailer.py 2006-04-12 23:06:03 UTC (rev 66920)
+++ Zope3/branches/jim-adapter/src/zope/sendmail/tests/test_mailer.py 2006-04-12 23:28:07 UTC (rev 66922)
@@ -19,13 +19,13 @@
import unittest
from StringIO import StringIO
from zope.interface.verify import verifyObject
-from zope.app.mail.interfaces import ISMTPMailer
+from zope.sendmail.interfaces import ISMTPMailer
class TestSMTPMailer(unittest.TestCase):
def setUp(self, port=None):
- from zope.app.mail.mailer import SMTPMailer
+ from zope.sendmail.mailer import SMTPMailer
class SMTP(object):
More information about the Zope3-Checkins
mailing list