diff --git a/mercurial/windows.py b/mercurial/windows.py --- a/mercurial/windows.py +++ b/mercurial/windows.py @@ -9,6 +9,21 @@ from i18n import _ import osutil import errno, msvcrt, os, re, sys +from win32 import executablepath +from win32 import getuser +from win32 import hidewindow +from win32 import lookupreg +from win32 import makedir +from win32 import nlinks +from win32 import oslink +from win32 import samedevice +from win32 import samefile +from win32 import setsignalhandler +from win32 import spawndetached +from win32 import termwidth +from win32 import testpid +from win32 import unlink + nulldev = 'NUL:' umask = 002 @@ -285,8 +300,6 @@ def groupmembers(name): def isexec(f): return False -from win32 import * - class cachestat(object): def __init__(self, path): pass diff --git a/tests/test-check-pyflakes.t b/tests/test-check-pyflakes.t --- a/tests/test-check-pyflakes.t +++ b/tests/test-check-pyflakes.t @@ -7,6 +7,5 @@ mercurial/commands.py:*: 'mpatch' imported but unused (glob) mercurial/commands.py:*: 'osutil' imported but unused (glob) hgext/inotify/linux/__init__.py:*: 'from _inotify import *' used; unable to detect undefined names (glob) - mercurial/windows.py:*: 'from win32 import *' used; unable to detect undefined names (glob)