~ubuntu-branches/ubuntu/natty/miro/natty

« back to all changes in this revision

Viewing changes to platform/osx/plat/utils.py

  • Committer: Daniel Hahler
  • Date: 2010-04-14 20:40:55 UTC
  • mfrom: (1.4.8 upstream)
  • Revision ID: ubuntu-launchpad@thequod.de-20100414204055-b1fyz9dzmsl3za43
Tags: 3.0.1-0ubuntu1
New upstream: 3.0.1-0ubuntu1

Show diffs side-by-side

added added

removed removed

Lines of Context:
352
352
 
353
353
def movie_data_program_info(moviePath, thumbnailPath):
354
354
    main_bundle = NSBundle.mainBundle()
355
 
    py_exe_path = os.path.join(os.path.dirname(main_bundle.executablePath()), 'python')
356
355
    rsrc_path = main_bundle.resourcePath()
357
356
    script_path = os.path.join(rsrc_path, 'qt_extractor.py')
358
357
    options = main_bundle.infoDictionary().get('PyOptions')
359
358
    env = None
360
359
    if options['alias'] == 1:
 
360
        py_exe_path = os.path.join(os.path.dirname(main_bundle.executablePath()), 'python')
361
361
        env = {'PYTHONPATH': ':'.join(sys.path), 'MIRO_BUNDLE_PATH': main_bundle.bundlePath()}
362
362
    else:
 
363
        py_version = main_bundle.infoDictionary().get('PythonInfoDict').get('PythonShortVersion')
 
364
        py_exe_path = os.path.join(main_bundle.privateFrameworksPath(), "Python.framework", "Versions", py_version, "bin", 'python')
363
365
        env = {'PYTHONHOME': rsrc_path, 'MIRO_BUNDLE_PATH': main_bundle.bundlePath()}
364
366
    return ((py_exe_path, script_path, moviePath, thumbnailPath), env)
365
367