Log message for revision 38563:
- Make the mailhost CMFSetup bits actually work on CMF 1.5.x/Zope 2.7.x -
both the test and the implementation were dodgy and assumed things about
the MailHost objects that are not true for Zope 2.7.x.
Changed:
U CMF/branches/1.5/CMFSetup/mailhost.py
U CMF/branches/1.5/CMFSetup/tests/test_mailhost.py
-=-
Modified: CMF/branches/1.5/CMFSetup/mailhost.py
===================================================================
--- CMF/branches/1.5/CMFSetup/mailhost.py 2005-09-22 02:55:46 UTC (rev
38562)
+++ CMF/branches/1.5/CMFSetup/mailhost.py 2005-09-22 08:36:03 UTC (rev
38563)
@@ -90,8 +90,8 @@
config['id'] = mh.getId()
config['smtp_host'] = mh.smtp_host
config['smtp_port'] = int(mh.smtp_port)
- config['smtp_uid'] = mh.smtp_uid
- config['smtp_pwd'] = mh.smtp_pwd
+ config['smtp_uid'] = getattr(mh, 'smtp_uid', '')
+ config['smtp_pwd'] = getattr(mh, 'smtp_pwd', '')
config['i18n_domain'] = ''
return config
Modified: CMF/branches/1.5/CMFSetup/tests/test_mailhost.py
===================================================================
--- CMF/branches/1.5/CMFSetup/tests/test_mailhost.py 2005-09-22 02:55:46 UTC
(rev 38562)
+++ CMF/branches/1.5/CMFSetup/tests/test_mailhost.py 2005-09-22 08:36:03 UTC
(rev 38563)
@@ -51,8 +51,6 @@
smtp_port='25'
smtp_host="localhost.localdomain"
- smtp_uid=""
- smtp_pwd=""
id='MailHost'
def getId(self):
_______________________________________________
CMF-checkins mailing list
[email protected]
http://mail.zope.org/mailman/listinfo/cmf-checkins
