← 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: Jelmer Vernooij
  • Date: 2012-03-06 17:17:27 UTC
  • mfrom: (6481 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6486.
  • Revision ID: jelmer@samba.org-20120306171727-jx9dsy122hsivepo
Merge bzr.dev.

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