← Back to branch summary

~ubuntu-branches/ubuntu/quantal/lightning-extension/quantal-security

« back to all changes in this revision

Viewing changes to mozilla/other-licenses/virtualenv/virtualenv_embedded/site.py

  • Committer: Package Import Robot
  • Author(s): Chris Coulson
  • Date: 2012-09-03 14:00:01 UTC
  • mfrom: (1.3.6)
  • Revision ID: package-import@ubuntu.com-20120903140001-vg7pjaks2orp9sor
Tags: 1.8+build1-0ubuntu1
https://launchpad.net/bugs/1062587
* New upstream stable release to support Thunderbird 16 (CALENDAR_1_8_BUILD1)
  - LP: #1062587

* Add extra Makefiles that are needed for the build
  - update debian/rules

Show diffs side-by-side

added added

removed removed

Lines of Context:
mozilla/other-licenses/virtualenv/virtualenv_embedded/site.py
422
422
            for filename in self.__files:
423
423
                filename = os.path.join(dir, filename)
424
424
                try:
425
 
                    fp = file(filename, "rU")
 
425
                    fp = open(filename, "rU")
426
426
                    data = fp.read()
427
427
                    fp.close()
428
428
                    break
553
553
    hardcoded_relative_dirs = []
554
554
    if sys.path[0] == '':
555
555
        pos += 1
556
 
    if sys.platform == 'win32':
557
 
        paths = [os.path.join(sys.real_prefix, 'Lib'), os.path.join(sys.real_prefix, 'DLLs')]
558
 
    elif _is_jython:
 
556
    if _is_jython:
559
557
        paths = [os.path.join(sys.real_prefix, 'Lib')]
560
558
    elif _is_pypy:
561
559
        if sys.pypy_version_info >= (1, 5):
572
570
            plat_path = os.path.join(path, 'plat-%s' % sys.platform)
573
571
            if os.path.exists(plat_path):
574
572
                paths.append(plat_path)
 
573
    elif sys.platform == 'win32':
 
574
        paths = [os.path.join(sys.real_prefix, 'Lib'), os.path.join(sys.real_prefix, 'DLLs')]
575
575
    else:
576
576
        paths = [os.path.join(sys.real_prefix, 'lib', 'python'+sys.version[:3])]
577
577
        hardcoded_relative_dirs = paths[:] # for the special 'darwin' case below