# HG changeset patch
# User Vadim Gelfer <vadim.gelfer@gmail.com>
# Date 1143772552 28800
# Node ID 24c604628867c9e20aef9c53952a2c5cdeef4394
# Parent  581d9a8b5fb932589a077c778069ae0feaf053eb
more windows fixes.


diff --git a/mercurial/util.py b/mercurial/util.py
--- a/mercurial/util.py
+++ b/mercurial/util.py
@@ -536,7 +536,7 @@ if os.name == 'nt':
         return pf
 
     try: # Mark Hammond's win32all package allows better functionality on Windows
-        import win32api, win32con, win32file, winerror, pywintypes
+        import win32api, win32con, win32file, pywintypes
 
         # create hard links using win32file module
         def os_link(src, dst): # NB will only succeed on NTFS
@@ -558,6 +558,7 @@ if os.name == 'nt':
             '''return True if pid is still running or unable to
             determine, False otherwise'''
             try:
+                import win32process, winerror
                 handle = win32api.OpenProcess(
                     win32con.PROCESS_QUERY_INFORMATION, False, pid)
                 if handle: