diff --git a/contrib/churn.py b/contrib/churn.py --- a/contrib/churn.py +++ b/contrib/churn.py @@ -11,7 +11,7 @@ # # -import time, sys, signal, os +import sys from mercurial.i18n import gettext as _ from mercurial import hg, mdiff, cmdutil, ui, util, templater, node diff --git a/hgext/hgk.py b/hgext/hgk.py --- a/hgext/hgk.py +++ b/hgext/hgk.py @@ -5,7 +5,7 @@ # This software may be used and distributed according to the terms # of the GNU General Public License, incorporated herein by reference. -import time, sys, signal, os +import sys, os from mercurial import hg, fancyopts, commands, ui, util, patch, revlog def difftree(ui, repo, node1=None, node2=None, *files, **opts): diff --git a/hgext/mq.py b/hgext/mq.py --- a/hgext/mq.py +++ b/hgext/mq.py @@ -31,7 +31,7 @@ refresh contents of top applied patch from mercurial.i18n import _ from mercurial import commands, cmdutil, hg, patch, revlog, util, changegroup -import os, sys, re, struct, traceback, errno, bz2 +import os, sys, re, errno commands.norepo += " qclone qversion" diff --git a/hgext/patchbomb.py b/hgext/patchbomb.py --- a/hgext/patchbomb.py +++ b/hgext/patchbomb.py @@ -63,7 +63,7 @@ # # That should be all. Now your patchbomb is on its way out. -import os, errno, popen2, socket, sys, tempfile, time +import os, errno, socket, time import email.MIMEMultipart, email.MIMEText, email.Utils from mercurial import cmdutil, commands, hg, mail, ui, patch from mercurial.i18n import _ diff --git a/mercurial/hgweb/request.py b/mercurial/hgweb/request.py --- a/mercurial/hgweb/request.py +++ b/mercurial/hgweb/request.py @@ -6,7 +6,7 @@ # This software may be used and distributed according to the terms # of the GNU General Public License, incorporated herein by reference. -import socket, sys, cgi, os, errno +import socket, cgi, errno from mercurial.i18n import gettext as _ class wsgiapplication(object): diff --git a/mercurial/mail.py b/mercurial/mail.py --- a/mercurial/mail.py +++ b/mercurial/mail.py @@ -6,7 +6,7 @@ # of the GNU General Public License, incorporated herein by reference. from i18n import _ -import os, re, smtplib, templater, util +import os, smtplib, templater, util def _smtp(ui): '''send mail using smtp.''' diff --git a/mercurial/patch.py b/mercurial/patch.py --- a/mercurial/patch.py +++ b/mercurial/patch.py @@ -8,7 +8,7 @@ from i18n import _ from node import * import base85, cmdutil, mdiff, util -import cStringIO, email.Parser, errno, os, popen2, re, shutil, sha +import cStringIO, email.Parser, os, popen2, re, sha import sys, tempfile, zlib # helper functions