[CalendarServer-changes] [7875] CalendarServer/branches/users/glyph/imip-and-admin-html/ twistedcaldav/mail.py

[source_changes at macosforge.org]

Revision: 7875
          http://trac.macosforge.org/projects/calendarserver/changeset/7875
Author:   glyph at apple.com
Date:     2011-08-11 21:35:28 -0700 (Thu, 11 Aug 2011)
Log Message:
-----------
cStringIO is a required part of the stdlib

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/imip-and-admin-html/twistedcaldav/mail.py

Modified: CalendarServer/branches/users/glyph/imip-and-admin-html/twistedcaldav/mail.py
===================================================================
--- CalendarServer/branches/users/glyph/imip-and-admin-html/twistedcaldav/mail.py	2011-08-12 04:35:17 UTC (rev 7874)
+++ CalendarServer/branches/users/glyph/imip-and-admin-html/twistedcaldav/mail.py	2011-08-12 04:35:28 UTC (rev 7875)
@@ -26,11 +26,7 @@
 import os
 import uuid
 
-try:
-    from cStringIO import StringIO
-    StringIO
-except ImportError:
-    from StringIO import StringIO
+from cStringIO import StringIO
 
 from email.mime.image import MIMEImage
 from email.mime.multipart import MIMEMultipart
@@ -54,7 +50,6 @@
 from twext.web2.http import Response, HTTPError
 from twext.web2.http_headers import MimeType
 
-
 from twext.python.log import Logger, LoggingMixIn
 
 from twistedcaldav import ical, caldavxml
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110811/856ead88/attachment.html>