Error - got an unexpected keyword argument 'timeout'

[cpeters@…]

I just re-installed as I was updating a few plugins in my installation. Announcements are no longer sent out and I see this in the Trac log

2010-02-26 09:28:38,061 Trac[api] ERROR: AnnouncementSystem failed.
Traceback (most recent call last):
  File "build/bdist.linux-i686/egg/announcerplugin/api.py", line 369, in _real_send
    distributor.distribute(transport, packages[transport], evt)
  File "build/bdist.linux-i686/egg/announcerplugin/distributors/email_distributor.py", line 210, in distribute
    self._do_send(transport, event, fmt, msgset, fmtr)
  File "build/bdist.linux-i686/egg/announcerplugin/distributors/email_distributor.py", line 331, in _do_send
    self._transmit(*package)
  File "build/bdist.linux-i686/egg/announcerplugin/distributors/email_distributor.py", line 341, in _transmit
    timeout=self.smtp_timeout
TypeError: __init__() got an unexpected keyword argument 'timeout'
2010-02-26 09:28:38,063 Trac[api] DEBUG: AnnouncementSystem sent event in 0.16 seconds.

So I'm not sure if I have something wrong with my configuration, or what. I installed with "sudo easy_install ​http://trac-hacks.org/svn/announcerplugin/0.11"

[anonymous]

FYI: My configuration is

[components]
announcerplugin.api.announcementsystem = enabled
announcerplugin.distributors.email_distributor.emaildistributor = enabled
announcerplugin.formatters.ticket_email.ticketemailformatter = enabled
announcerplugin.formatters.wiki_email.wikiemailformatter = enabled
announcerplugin.pref.announcerpreferences = enabled
announcerplugin.producers.attachment.attachmentchangeproducer = enabled
announcerplugin.producers.ticket.ticketchangeproducer = enabled
announcerplugin.producers.wiki.wikichangeproducer = enabled
announcerplugin.resolvers.defaultdomain.defaultdomainemailresolver = enabled
announcerplugin.resolvers.sessionemail.sessionemailresolver = enabled
announcerplugin.resolvers.specified.specifiedemailresolver = enabled
announcerplugin.subscribers.ticket_compat.carboncopysubscriber = enabled
announcerplugin.subscribers.ticket_compat.legacyticketsubscriber = enabled
announcerplugin.subscribers.ticket_compat.staticticketsubscriber = enabled
announcerplugin.subscribers.watchers.watchsubscriber = enabled
announcerplugin.subscribers.wiki.generalwikisubscriber = enabled

[announcer]
admit_domains =
always_notify_owner = true
always_notify_reporter = true
always_notify_updater = true
default_email_format = text/html
email_address_resolvers = SpecifiedEmailResolver, SessionEmailResolver
ignore_domains =
mime_encoding = base64
smtp_always_bcc =
smtp_always_cc = cpeters@intouchtechnology.com
smtp_default_domain =
smtp_enabled = true
smtp_from = trac@intouchtechnology.com
smtp_from_name = InTouch Trac
smtp_password =
smtp_port = 25
smtp_replyto = trac@intouchtechnology.com
smtp_server = localhost
smtp_subject_prefix = __default__
smtp_timeout = 30
smtp_user =
ticket_email_header_fields = owner, reporter, milestone, component, priority, severity.
ticket_email_subject = Ticket #${ticket.id}: ${ticket['summary']}.
ticket_subject_template = $prefix #$ticket.id: $summary
use_public_cc = false
use_short_addr = false
use_tls = false

[Robert Corsaro]

(In [7735]) removes timeout from smtplib connection

timeout isn't available until python 2.6

fixes #6732

Conflicts:

announcerplugin/distributors/email_distributor.py