--- a/contrib/perf.py Sat May 30 11:32:23 2009 -0700
+++ b/contrib/perf.py Sat May 30 23:20:30 2009 +0200
@@ -1,6 +1,5 @@
# perf.py - performance test routines
-from mercurial.i18n import _
from mercurial import cmdutil, match, commands
import time, os, sys
--- a/hgext/convert/common.py Sat May 30 11:32:23 2009 -0700
+++ b/hgext/convert/common.py Sat May 30 23:20:30 2009 +0200
@@ -8,7 +8,7 @@
import base64, errno
import os
import cPickle as pickle
-from mercurial import util, strutil
+from mercurial import util
from mercurial.i18n import _
def encodeargs(args):
--- a/hgext/inotify/__init__.py Sat May 30 11:32:23 2009 -0700
+++ b/hgext/inotify/__init__.py Sat May 30 23:20:30 2009 +0200
@@ -13,7 +13,7 @@
from mercurial.i18n import _
from mercurial import cmdutil, util
-import os, server
+import server
from weakref import proxy
from client import client, QueryFailed
--- a/mercurial/ui.py Sat May 30 11:32:23 2009 -0700
+++ b/mercurial/ui.py Sat May 30 23:20:30 2009 +0200
@@ -6,7 +6,7 @@
# GNU General Public License version 2, incorporated herein by reference.
from i18n import _
-import errno, getpass, os, re, socket, sys, tempfile, traceback
+import errno, getpass, os, socket, sys, tempfile, traceback
import config, util, error
_booleans = {'1': True, 'yes': True, 'true': True, 'on': True,
--- a/mercurial/win32.py Sat May 30 11:32:23 2009 -0700
+++ b/mercurial/win32.py Sat May 30 23:20:30 2009 +0200
@@ -16,9 +16,8 @@
import win32api
import errno, os, sys, pywintypes, win32con, win32file, win32process
-import cStringIO, winerror
+import winerror
import osutil, encoding
-import util
from win32com.shell import shell,shellcon
class WinError(Exception):
--- a/tests/test-bdiff.py Sat May 30 11:32:23 2009 -0700
+++ b/tests/test-bdiff.py Sat May 30 23:20:30 2009 +0200
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-import sys, struct
+import struct
from mercurial import bdiff, mpatch
def test1(a, b):
--- a/tests/test-revlog-ancestry.py Sat May 30 11:32:23 2009 -0700
+++ b/tests/test-revlog-ancestry.py Sat May 30 23:20:30 2009 +0200
@@ -1,6 +1,5 @@
import os
from mercurial import hg, ui, merge
-from hgext import graphlog
u = ui.ui()
--- a/tests/test-ui-config.py Sat May 30 11:32:23 2009 -0700
+++ b/tests/test-ui-config.py Sat May 30 23:20:30 2009 +0200
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-from mercurial import ui, util, dispatch, error
+from mercurial import ui, dispatch, error
testui = ui.ui()
parsed = dispatch._parseconfig(testui, [
--- a/tests/test-walkrepo.py Sat May 30 11:32:23 2009 -0700
+++ b/tests/test-walkrepo.py Sat May 30 23:20:30 2009 +0200
@@ -1,5 +1,4 @@
import os
-import os.path
from mercurial import hg, ui
from mercurial.util import walkrepos
from os import mkdir, chdir