--- a/contrib/casesmash.py Thu Jun 13 01:44:02 2013 +0200
+++ b/contrib/casesmash.py Thu Jun 13 01:36:58 2013 +0200
@@ -1,4 +1,4 @@
-import sys, os, __builtin__
+import os, __builtin__
from mercurial import util
def lowerwrap(scope, funcname):
--- a/contrib/perf.py Thu Jun 13 01:44:02 2013 +0200
+++ b/contrib/perf.py Thu Jun 13 01:36:58 2013 +0200
@@ -1,7 +1,7 @@
# perf.py - performance test routines
'''helper extension to measure performance'''
-from mercurial import cmdutil, scmutil, util, match, commands, obsolete
+from mercurial import cmdutil, scmutil, util, commands, obsolete
from mercurial import repoview, branchmap, merge, copies
import time, os, sys
--- a/contrib/synthrepo.py Thu Jun 13 01:44:02 2013 +0200
+++ b/contrib/synthrepo.py Thu Jun 13 01:36:58 2013 +0200
@@ -36,7 +36,7 @@
'''
import bisect, collections, json, os, random, time, sys
-from mercurial import cmdutil, context, patch, scmutil, url, util, hg
+from mercurial import cmdutil, context, patch, scmutil, util, hg
from mercurial.i18n import _
from mercurial.node import nullrev, nullid
--- a/doc/gendoc.py Thu Jun 13 01:44:02 2013 +0200
+++ b/doc/gendoc.py Thu Jun 13 01:36:58 2013 +0200
@@ -4,7 +4,6 @@
# fall back to pure modules if required C extensions are not available
sys.path.append(os.path.join('..', 'mercurial', 'pure'))
from mercurial import demandimport; demandimport.enable()
-from mercurial import encoding
from mercurial import minirst
from mercurial.commands import table, globalopts
from mercurial.i18n import gettext, _
--- a/tests/run-tests.py Thu Jun 13 01:44:02 2013 +0200
+++ b/tests/run-tests.py Thu Jun 13 01:36:58 2013 +0200
@@ -56,7 +56,6 @@
import re
import threading
import killdaemons as killmod
-import cPickle as pickle
import Queue as queue
processlock = threading.Lock()
--- a/tests/test-pathencode.py Thu Jun 13 01:44:02 2013 +0200
+++ b/tests/test-pathencode.py Thu Jun 13 01:36:58 2013 +0200
@@ -5,7 +5,6 @@
# that have proven likely to expose bugs and divergent behaviour in
# different encoding implementations.
-from mercurial import parsers
from mercurial import store
import binascii, itertools, math, os, random, sys, time
import collections
--- a/tests/test-ui-color.py Thu Jun 13 01:44:02 2013 +0200
+++ b/tests/test-ui-color.py Thu Jun 13 01:36:58 2013 +0200
@@ -1,4 +1,4 @@
-import os, sys
+import os
from hgext import color
from mercurial import dispatch, ui