diff -r 65f1b97484be -r 962eb403165b mercurial/mail.py
--- a/mercurial/mail.py	Sun Apr 13 11:31:45 2008 -0500
+++ b/mercurial/mail.py	Mon Apr 14 14:34:38 2008 +0200
@@ -6,7 +6,8 @@
 # of the GNU General Public License, incorporated herein by reference.
 
 from i18n import _
-import os, smtplib, util, socket
+import os, smtplib, socket
+import util
 
 def _smtp(ui):
     '''build an smtp connection and return a function to send mail'''
@@ -53,7 +54,7 @@
     cmdline = '%s -f %s %s' % (program, util.email(sender),
                                ' '.join(map(util.email, recipients)))
     ui.note(_('sending mail: %s\n') % cmdline)
-    fp = os.popen(cmdline, 'w')
+    fp = util.popen(cmdline, 'w')
     fp.write(msg)
     ret = fp.close()
     if ret: