changeset 13378:244772f67ac1

windows: eliminate system_rcpath_win32()
author Adrian Buehlmann <adrian@cadifra.com>
date Mon, 14 Feb 2011 11:12:57 +0100
parents 4ac565a30e84
children 67743d5f49b6
files mercurial/windows.py
diffstat 1 files changed, 1 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/windows.py	Mon Feb 14 11:12:35 2011 +0100
+++ b/mercurial/windows.py	Mon Feb 14 11:12:57 2011 +0100
@@ -75,7 +75,7 @@
 
 _HKEY_LOCAL_MACHINE = 0x80000002L
 
-def system_rcpath_win32():
+def system_rcpath():
     '''return default os-specific hgrc search path'''
     rcpath = []
     filename = executable_path()
@@ -105,12 +105,6 @@
                     rcpath.append(os.path.join(p, f))
     return rcpath
 
-def system_rcpath():
-    try:
-        return system_rcpath_win32()
-    except:
-        return [r'c:\mercurial\mercurial.ini']
-
 def user_rcpath():
     '''return os-specific hgrc search path to the user dir'''
     try: