← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/http/_urllib2_wrappers.py

  • Committer: Patch Queue Manager
  • Date: 2012-02-23 19:11:01 UTC
  • mfrom: (6472.1.1 merge-2.5)
  • Revision ID: pqm@pqm.ubuntu.com-20120223191101-x6g60ci59rhkvp3e
(jelmer) Merge bzr/2.5. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/http/_urllib2_wrappers.py
88
88
    ]
89
89
def default_ca_certs():
90
90
    if sys.platform == 'win32':
91
 
        return os.path.join(os.path.dirname(sys.executable), u"ca_bundle.crt")
 
91
        return os.path.join(os.path.dirname(sys.executable), u"cacert.pem")
92
92
    elif sys.platform == 'darwin':
93
93
        # FIXME: Needs some default value for osx, waiting for osx installers
94
94
        # guys feedback -- vila 2012-01-25