comparison easyhg.py @ 372:2d3f1e5d8638

OS/X build fixes, for now slightly simpler (conceptually) situation in which we have a single bundle with two Python extension distributions in it, one for each active Python version
author Chris Cannam
date Thu, 24 Mar 2011 13:15:49 +0000
parents 19cce6d2c470
children 8530c31536a7
comparison
equal deleted inserted replaced
371:f051d210521e 372:2d3f1e5d8638
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 27 # We have an installation path: append it twice, once with
28 # the Python version suffixed 28 # the Python version suffixed
29 version_suffix = "Py" + sys.version_info[0] + "." + sys.version_info[1]; 29 version_suffix = "Py" + str(sys.version_info[0]) + "." + str(sys.version_info[1]);
30 sys.path.append(easyhg_import_path + version_suffix) 30 sys.path.append(easyhg_import_path + "/" + version_suffix)
31 sys.path.append(easyhg_import_path) 31 sys.path.append(easyhg_import_path)
32 32
33 # 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
34 # 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
35 # will just continue without us and report success. The invoking 35 # will just continue without us and report success. The invoking