comparison easyhg.py @ 369:19cce6d2c470

Look in installation path + Python version suffix for PyQt before looking in plain installation path
author Chris Cannam
date Thu, 24 Mar 2011 10:20:47 +0000
parents ea6f76c0aa76
children 2d3f1e5d8638
comparison
equal deleted inserted replaced
368:d180d8719933 369:19cce6d2c470
22 # against its default value, because then the comparison text would 22 # against its default value, because then the comparison text would
23 # get modified as well. So, compare using prefix only. 23 # get modified as well. So, compare using prefix only.
24 # 24 #
25 easyhg_import_path = 'NO_EASYHG_IMPORT_PATH' 25 easyhg_import_path = 'NO_EASYHG_IMPORT_PATH'
26 if not easyhg_import_path.startswith('NO_'): 26 if not easyhg_import_path.startswith('NO_'):
27 # We have an installation path: append it twice, once with
28 # the Python version suffixed
29 version_suffix = "Py" + sys.version_info[0] + "." + sys.version_info[1];
30 sys.path.append(easyhg_import_path + version_suffix)
27 sys.path.append(easyhg_import_path) 31 sys.path.append(easyhg_import_path)
28 32
29 # Try to load the PyQt4 module that we need. If this fails, we should 33 # Try to load the PyQt4 module that we need. If this fails, we should
30 # bail out later (in uisetup), because if we bail out now, Mercurial 34 # bail out later (in uisetup), because if we bail out now, Mercurial
31 # will just continue without us and report success. The invoking 35 # will just continue without us and report success. The invoking