Modified: CalendarServer/branches/users/glyph/sharedpool/twistedcaldav/test/test_mail.py (6504 => 6505)

--- CalendarServer/branches/users/glyph/sharedpool/twistedcaldav/test/test_mail.py	2010-11-01 21:15:41 UTC (rev 6504)
+++ CalendarServer/branches/users/glyph/sharedpool/twistedcaldav/test/test_mail.py	2010-11-01 21:15:58 UTC (rev 6505)
@@ -14,7 +14,6 @@
 # limitations under the License.
 ##
 
-from twistedcaldav.mail import *
 from twistedcaldav.test.util import TestCase
 from twistedcaldav.ical import Component
 from twistedcaldav.config import config
@@ -23,6 +22,8 @@
 
 from twisted.internet.defer import inlineCallbacks
 import email
+from twistedcaldav.mail import MailHandler
+from twistedcaldav.mail import MailGatewayTokensDatabase
 import os