--- setupext.py 2009-08-01 14:15:24.000000000 -0500 +++ setupext.py 2009-08-07 08:51:38.000000000 -0500 @@ -338,43 +338,58 @@ return '.'.join(temp) def check_for_qt(): - try: - import pyqtconfig - except ImportError: + MP_QT=False + if MP_QT: + try: + import pyqtconfig + except ImportError: + print_status("Qt", "no") + return False + else: + try: + qt_version = pyqtconfig.Configuration().qt_version + qt_version = convert_qt_version(qt_version) + except AttributeError: + qt_version = "<unknown>" + print_status("Qt", "Qt: %s, PyQt: %s" % + (qt_version, + pyqtconfig.Configuration().pyqt_version_str)) + return True + else: print_status("Qt", "no") return False - else: - try: - qt_version = pyqtconfig.Configuration().qt_version - qt_version = convert_qt_version(qt_version) - except AttributeError: - qt_version = "<unknown>" - print_status("Qt", "Qt: %s, PyQt: %s" % - (qt_version, - pyqtconfig.Configuration().pyqt_version_str)) - return True def check_for_qt4(): - try: - from PyQt4 import pyqtconfig - except ImportError: + MP_QT4=False + if MP_QT4: + try: + from PyQt4 import pyqtconfig + except ImportError: + print_status("Qt4", "no") + return False + else: + print_status("Qt4", "Qt: %s, PyQt4: %s" % + (convert_qt_version(pyqtconfig.Configuration().qt_version), + pyqtconfig.Configuration().pyqt_version_str)) + return True + else: print_status("Qt4", "no") return False - else: - print_status("Qt4", "Qt: %s, PyQt4: %s" % - (convert_qt_version(pyqtconfig.Configuration().qt_version), - pyqtconfig.Configuration().pyqt_version_str)) - return True def check_for_cairo(): - try: - import cairo - except ImportError: + MP_Cairo=False + if MP_Cairo: + try: + import cairo + except ImportError: + print_status("Cairo", "no") + return False + else: + print_status("Cairo", cairo.version) + return True + else: print_status("Cairo", "no") return False - else: - print_status("Cairo", cairo.version) - return True def check_for_datetime(): try: @@ -433,36 +448,51 @@ return False def check_for_dvipng(): - try: - stdin, stdout = run_child_process('dvipng -version') - print_status("dvipng", stdout.readlines()[1].split()[-1]) - return True - except (IndexError, ValueError): + MP_LaTeX=False + if MP_LaTeX: + try: + stdin, stdout = run_child_process('dvipng -version') + print_status("dvipng", stdout.readlines()[1].split()[-1]) + return True + except (IndexError, ValueError): + print_status("dvipng", "no") + return False + else: print_status("dvipng", "no") return False def check_for_ghostscript(): - try: - if sys.platform == 'win32': - command = 'gswin32c --version' - else: - command = 'gs --version' - stdin, stdout = run_child_process(command) - print_status("ghostscript", stdout.read()[:-1]) - return True - except (IndexError, ValueError): + MP_GhostScript=False + if MP_GhostScript: + try: + if sys.platform == 'win32': + command = 'gswin32c --version' + else: + command = 'gs --version' + stdin, stdout = run_child_process(command) + print_status("ghostscript", stdout.read()[:-1]) + return True + except (IndexError, ValueError): + print_status("ghostscript", "no") + return False + else: print_status("ghostscript", "no") return False def check_for_latex(): - try: - stdin, stdout = run_child_process('latex -version') - line = stdout.readlines()[0] - pattern = '(3\.1\d+)|(MiKTeX \d+.\d+)' - match = re.search(pattern, line) - print_status("latex", match.group(0)) - return True - except (IndexError, ValueError, AttributeError): + MP_LaTeX=False + if MP_LaTeX: + try: + stdin, stdout = run_child_process('latex -version') + line = stdout.readlines()[0] + pattern = '(3\.1\d+)|(MiKTeX \d+.\d+)' + match = re.search(pattern, line) + print_status("latex", match.group(0)) + return True + except (IndexError, ValueError, AttributeError): + print_status("latex", "no") + return False + else: print_status("latex", "no") return False