Commits

Anonymous committed 95f39c6

tortoise: fix clashes between module and variable names

  • Participants
  • Parent commits ed11185

Comments (0)

Files changed (2)

tortoise/contextmenu.py

 import win32gui_struct
 import win32api
 import _winreg
-from mercurial import hg, ui, repo
+from mercurial import hg
+from mercurial import repo as _repo
 from thgutil import *
 
 S_OK = 0
         try:
             repo = hg.repository(ui.ui(), path=root)
             return repo
-        except repo.RepoError:
+        except _repo.RepoError:
             pass
 
     return None

tortoise/iconoverlay.py

 import win32con
 from win32com.shell import shell, shellcon
 import _winreg
-from mercurial import hg, repo, ui, cmdutil, util
+from mercurial import hg, cmdutil, util
+from mercurial import repo as _repo
 import thgutil
 import sys
 
             
         try:
             repo = hg.repository(ui.ui(), path=root)
-        except repo.RepoError:
+        except _repo.RepoError:
             # We aren't in a working tree
             print "%s: not in repo" % dir
             overlay_cache[path] = (UNKNOWN, tc)