← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Jelmer Vernooij
  • Date: 2011-12-19 19:15:58 UTC
  • mfrom: (6388 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6404.
  • Revision ID: jelmer@canonical.com-20111219191558-p1k7cvhjq8l6v2gm
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/http/ca_bundle.py
16
16
 
17
17
"""Auto-detect of CA bundle for SSL connections"""
18
18
 
 
19
from __future__ import absolute_import
 
20
 
19
21
import os
20
22
import sys
21
23
from bzrlib.trace import mutter