← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/config.py

Merge bzr.dev and tree-file-ids-as-tuples.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/config.py
73
73
"""
74
74
 
75
75
from __future__ import absolute_import
76
 
 
 
76
from cStringIO import StringIO
77
77
import os
78
78
import sys
79
79
 
83
83
lazy_import(globals(), """
84
84
import fnmatch
85
85
import re
86
 
from cStringIO import StringIO
87
86
 
88
87
from bzrlib import (
89
88
    atomicfile,
2867
2866
    Option('submit_to',
2868
2867
           help='''Where submissions from this branch are mailed to.'''))
2869
2868
 
 
2869
option_registry.register_lazy('ssl.ca_certs',
 
2870
    'bzrlib.transport.http._urllib2_wrappers', 'opt_ssl_ca_certs')
 
2871
 
 
2872
option_registry.register_lazy('ssl.cert_reqs',
 
2873
    'bzrlib.transport.http._urllib2_wrappers', 'opt_ssl_cert_reqs')
 
2874
 
 
2875
 
2870
2876
 
2871
2877
class Section(object):
2872
2878
    """A section defines a dict of option name => value.