[CalendarServer-changes] [9079] CalendarServer/branches/users/glyph/ipv6-client/twistedcaldav/mail. py

[source_changes at macosforge.org]

Revision: 9079
          http://trac.macosforge.org/projects/calendarserver/changeset/9079
Author:   glyph at apple.com
Date:     2012-04-13 11:46:02 -0700 (Fri, 13 Apr 2012)
Log Message:
-----------
change connectTCP to GAIEndpoint in twistedcaldav.mail

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/ipv6-client/twistedcaldav/mail.py

Modified: CalendarServer/branches/users/glyph/ipv6-client/twistedcaldav/mail.py
===================================================================
--- CalendarServer/branches/users/glyph/ipv6-client/twistedcaldav/mail.py	2012-04-13 18:45:56 UTC (rev 9078)
+++ CalendarServer/branches/users/glyph/ipv6-client/twistedcaldav/mail.py	2012-04-13 18:46:02 UTC (rev 9079)
@@ -53,6 +53,9 @@
 from twisted.web.microdom import parseString
 from twisted.web.microdom import Text as DOMText, Element as DOMElement
 
+from twext.internet.gaiendpoint import GAIEndpoint
+from twext.internet.adaptendpoint import connect
+
 from twext.web2 import server, responsecode
 from twext.web2.channel.http import HTTPFactory
 from txdav.xml import element as davxml
@@ -77,7 +80,6 @@
 from twistedcaldav.util import AuthorizedHTTPGetter
 from twistedcaldav.stdconfig import DEFAULT_CONFIG, DEFAULT_CONFIG_FILE
 
-
 from calendarserver.tap.util import getRootResource, directoryFromConfig
 
 
@@ -615,7 +617,7 @@
         reactor.connectSSL(parsed.hostname, parsed.port, factory,
             ssl.ClientContextFactory())
     else:
-        reactor.connectTCP(parsed.hostname, parsed.port, factory)
+        connect(GAIEndpoint(reactor, parsed.hostname, parsed.port), factory)
 
     def _success(result, msgId):
         log.info("Mail gateway successfully injected message %s" % (msgId,))
@@ -1106,7 +1108,8 @@
             )
 
             self.log_warn("Mail gateway forwarding reply back to organizer")
-            _reactor.connectTCP(settings["Server"], settings["Port"], factory)
+            connect(GAIEndpoint(_reactor, settings["Server"], settings["Port"]),
+                    factory)
             return deferred
 
         # Process the imip attachment; inject to calendar server
@@ -1371,7 +1374,8 @@
                 requireAuthentication=False,
                 requireTransportSecurity=settings["UseSSL"])
 
-            _reactor.connectTCP(settings['Server'], settings['Port'], factory)
+            connect(GAIEndpoint(_reactor, settings["Server"], settings["Port"]),
+                    factory)
             deferred.addCallback(_success, msgId, fromAddr, toAddr)
             deferred.addErrback(_failure, msgId, fromAddr, toAddr)
             return deferred
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120413/811f0491/attachment-0001.html>