Index: mailer.py
===================================================================
--- mailer.py	(revision 35202)
+++ mailer.py	(working copy)
@@ -44,10 +44,10 @@
   # Python <2.4
   import popen2
   platform_with_subprocess = False
-if sys.version_info[0] >= 3:
+try:
   # Python >=3.0
   from io import StringIO
-else:
+except ImportError:
   # Python <3.0
   from cStringIO import StringIO
 import smtplib