--- a/mercurial/cmdutil.py	Thu May 14 15:24:36 2009 +0200
+++ b/mercurial/cmdutil.py	Thu May 14 15:35:46 2009 +0200
@@ -8,7 +8,7 @@
 from node import hex, nullid, nullrev, short
 from i18n import _
 import os, sys, bisect, stat, errno
-import mdiff, bdiff, util, templater, templatefilters, patch, error, encoding
+import mdiff, bdiff, util, templater, patch, error, encoding
 import match as _match
 
 revrangesep = ':'

--- a/mercurial/hgweb/hgweb_mod.py	Thu May 14 15:24:36 2009 +0200
+++ b/mercurial/hgweb/hgweb_mod.py	Thu May 14 15:35:46 2009 +0200
@@ -7,7 +7,7 @@
 # GNU General Public License version 2, incorporated herein by reference.
 
 import os
-from mercurial import ui, hg, util, hook, error, encoding, templater
+from mercurial import ui, hg, hook, error, encoding, templater
 from common import get_mtime, ErrorResponse
 from common import HTTP_OK, HTTP_BAD_REQUEST, HTTP_NOT_FOUND, HTTP_SERVER_ERROR
 from common import HTTP_UNAUTHORIZED, HTTP_METHOD_NOT_ALLOWED

--- a/mercurial/hgweb/webcommands.py	Thu May 14 15:24:36 2009 +0200
+++ b/mercurial/hgweb/webcommands.py	Thu May 14 15:35:46 2009 +0200
@@ -12,7 +12,7 @@
 from mercurial.util import binary
 from common import paritygen, staticfile, get_contact, ErrorResponse
 from common import HTTP_OK, HTTP_FORBIDDEN, HTTP_NOT_FOUND
-from mercurial import graphmod, util
+from mercurial import graphmod
 
 # __all__ is populated with the allowed commands. Be sure to add to it if
 # you're adding a new command, or the new command won't work.

--- a/mercurial/localrepo.py	Thu May 14 15:24:36 2009 +0200
+++ b/mercurial/localrepo.py	Thu May 14 15:35:46 2009 +0200
@@ -9,7 +9,7 @@
 from i18n import _
 import repo, changegroup
 import changelog, dirstate, filelog, manifest, context
-import lock, transaction, ui, store, encoding
+import lock, transaction, store, encoding
 import util, extensions, hook, error
 import match as match_
 import merge as merge_

--- a/mercurial/lsprofcalltree.py	Thu May 14 15:24:36 2009 +0200
+++ b/mercurial/lsprofcalltree.py	Thu May 14 15:35:46 2009 +0200
@@ -10,10 +10,6 @@
 of the GNU General Public License, incorporated herein by reference.
 """
 
-import optparse
-import os
-import sys
-
 def label(code):
     if isinstance(code, str):
         return '~' + code    # built-in functions ('~' sorts at the end)

--- a/mercurial/manifest.py	Thu May 14 15:24:36 2009 +0200
+++ b/mercurial/manifest.py	Thu May 14 15:35:46 2009 +0200
@@ -6,7 +6,7 @@
 # GNU General Public License version 2, incorporated herein by reference.
 
 from i18n import _
-import mdiff, parsers, util, error, revlog
+import mdiff, parsers, error, revlog
 import array, struct
 
 class manifestdict(dict):

--- a/mercurial/templatefilters.py	Thu May 14 15:24:36 2009 +0200
+++ b/mercurial/templatefilters.py	Thu May 14 15:35:46 2009 +0200
@@ -6,7 +6,7 @@
 # GNU General Public License version 2, incorporated herein by reference.
 
 import cgi, re, os, time, urllib, textwrap
-import util, templater, encoding
+import util, encoding
 
 def stringify(thing):
     '''turn nested template iterator into string.'''

--- a/mercurial/util.py	Thu May 14 15:24:36 2009 +0200
+++ b/mercurial/util.py	Thu May 14 15:35:46 2009 +0200
@@ -16,7 +16,7 @@
 from i18n import _
 import error, osutil
 import cStringIO, errno, re, shutil, sys, tempfile, traceback
-import os, stat, threading, time, calendar, glob, random
+import os, stat, time, calendar, glob, random
 import imp
 
 # Python compatibility