Ticket #20666: patch-disable_optional_deps.diff
File patch-disable_optional_deps.diff, 5.6 KB (added by mdippery@…, 15 years ago) |
---|
-
setupext.py
old new 338 338 return '.'.join(temp) 339 339 340 340 def check_for_qt(): 341 try: 342 import pyqtconfig 343 except ImportError: 341 MP_QT=False 342 if MP_QT: 343 try: 344 import pyqtconfig 345 except ImportError: 346 print_status("Qt", "no") 347 return False 348 else: 349 try: 350 qt_version = pyqtconfig.Configuration().qt_version 351 qt_version = convert_qt_version(qt_version) 352 except AttributeError: 353 qt_version = "<unknown>" 354 print_status("Qt", "Qt: %s, PyQt: %s" % 355 (qt_version, 356 pyqtconfig.Configuration().pyqt_version_str)) 357 return True 358 else: 344 359 print_status("Qt", "no") 345 360 return False 346 else:347 try:348 qt_version = pyqtconfig.Configuration().qt_version349 qt_version = convert_qt_version(qt_version)350 except AttributeError:351 qt_version = "<unknown>"352 print_status("Qt", "Qt: %s, PyQt: %s" %353 (qt_version,354 pyqtconfig.Configuration().pyqt_version_str))355 return True356 361 357 362 def check_for_qt4(): 358 try: 359 from PyQt4 import pyqtconfig 360 except ImportError: 363 MP_QT4=False 364 if MP_QT4: 365 try: 366 from PyQt4 import pyqtconfig 367 except ImportError: 368 print_status("Qt4", "no") 369 return False 370 else: 371 print_status("Qt4", "Qt: %s, PyQt4: %s" % 372 (convert_qt_version(pyqtconfig.Configuration().qt_version), 373 pyqtconfig.Configuration().pyqt_version_str)) 374 return True 375 else: 361 376 print_status("Qt4", "no") 362 377 return False 363 else:364 print_status("Qt4", "Qt: %s, PyQt4: %s" %365 (convert_qt_version(pyqtconfig.Configuration().qt_version),366 pyqtconfig.Configuration().pyqt_version_str))367 return True368 378 369 379 def check_for_cairo(): 370 try: 371 import cairo 372 except ImportError: 380 MP_Cairo=False 381 if MP_Cairo: 382 try: 383 import cairo 384 except ImportError: 385 print_status("Cairo", "no") 386 return False 387 else: 388 print_status("Cairo", cairo.version) 389 return True 390 else: 373 391 print_status("Cairo", "no") 374 392 return False 375 else:376 print_status("Cairo", cairo.version)377 return True378 393 379 394 def check_for_datetime(): 380 395 try: … … 433 448 return False 434 449 435 450 def check_for_dvipng(): 436 try: 437 stdin, stdout = run_child_process('dvipng -version') 438 print_status("dvipng", stdout.readlines()[1].split()[-1]) 439 return True 440 except (IndexError, ValueError): 451 MP_LaTeX=False 452 if MP_LaTeX: 453 try: 454 stdin, stdout = run_child_process('dvipng -version') 455 print_status("dvipng", stdout.readlines()[1].split()[-1]) 456 return True 457 except (IndexError, ValueError): 458 print_status("dvipng", "no") 459 return False 460 else: 441 461 print_status("dvipng", "no") 442 462 return False 443 463 444 464 def check_for_ghostscript(): 445 try: 446 if sys.platform == 'win32': 447 command = 'gswin32c --version' 448 else: 449 command = 'gs --version' 450 stdin, stdout = run_child_process(command) 451 print_status("ghostscript", stdout.read()[:-1]) 452 return True 453 except (IndexError, ValueError): 465 MP_GhostScript=False 466 if MP_GhostScript: 467 try: 468 if sys.platform == 'win32': 469 command = 'gswin32c --version' 470 else: 471 command = 'gs --version' 472 stdin, stdout = run_child_process(command) 473 print_status("ghostscript", stdout.read()[:-1]) 474 return True 475 except (IndexError, ValueError): 476 print_status("ghostscript", "no") 477 return False 478 else: 454 479 print_status("ghostscript", "no") 455 480 return False 456 481 457 482 def check_for_latex(): 458 try: 459 stdin, stdout = run_child_process('latex -version') 460 line = stdout.readlines()[0] 461 pattern = '(3\.1\d+)|(MiKTeX \d+.\d+)' 462 match = re.search(pattern, line) 463 print_status("latex", match.group(0)) 464 return True 465 except (IndexError, ValueError, AttributeError): 483 MP_LaTeX=False 484 if MP_LaTeX: 485 try: 486 stdin, stdout = run_child_process('latex -version') 487 line = stdout.readlines()[0] 488 pattern = '(3\.1\d+)|(MiKTeX \d+.\d+)' 489 match = re.search(pattern, line) 490 print_status("latex", match.group(0)) 491 return True 492 except (IndexError, ValueError, AttributeError): 493 print_status("latex", "no") 494 return False 495 else: 466 496 print_status("latex", "no") 467 497 return False 468 498 … … 806 836 def check_for_macosx(): 807 837 gotit = False 808 838 import sys 809 if sys.platform=='darwin': 810 gotit = True 811 if gotit: 812 print_status("Mac OS X native", "yes") 839 MP_MACOSX = False 840 if MP_MACOSX: 841 if sys.platform=='darwin': 842 gotit = True 843 if gotit: 844 print_status("Mac OS X native", "yes") 845 else: 846 print_status("Mac OS X native", "no") 847 return gotit 813 848 else: 814 849 print_status("Mac OS X native", "no") 815 return gotit850 return False 816 851 817 852 def query_tcltk(): 818 853 """Tries to open a Tk window in order to query the Tk object about its library paths.