Mercurial > public > mercurial-scm > hg

comparison mercurial/sslutil.py @ 25432:bdc15b3c9bdb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ssl: remove CERT_REQUIRED constant that was necessary for compatibility
author Yuya Nishihara <yuya@tcha.org>
date Fri, 05 Jun 2015 21:45:44 +0900
parents 96159068c506
children 696f6e2be282
comparison
equal deleted inserted replaced
25431:96159068c506 25432:bdc15b3c9bdb
10 10
11 from mercurial import util 11 from mercurial import util
12 from mercurial.i18n import _ 12 from mercurial.i18n import _
13 13
14 _canloaddefaultcerts = False 14 _canloaddefaultcerts = False
15 CERT_REQUIRED = ssl.CERT_REQUIRED
16 try: 15 try:
17 ssl_context = ssl.SSLContext 16 ssl_context = ssl.SSLContext
18 _canloaddefaultcerts = util.safehasattr(ssl_context, 'load_default_certs') 17 _canloaddefaultcerts = util.safehasattr(ssl_context, 'load_default_certs')
19 18
20 def wrapsocket(sock, keyfile, certfile, ui, cert_reqs=ssl.CERT_NONE, 19 def wrapsocket(sock, keyfile, certfile, ui, cert_reqs=ssl.CERT_NONE,
142 if cacerts and cacerts != '!': 141 if cacerts and cacerts != '!':
143 ui.debug('using %s to enable OS X system CA\n' % cacerts) 142 ui.debug('using %s to enable OS X system CA\n' % cacerts)
144 ui.setconfig('web', 'cacerts', cacerts, 'defaultcacerts') 143 ui.setconfig('web', 'cacerts', cacerts, 'defaultcacerts')
145 if cacerts != '!': 144 if cacerts != '!':
146 kws.update({'ca_certs': cacerts, 145 kws.update({'ca_certs': cacerts,
147 'cert_reqs': CERT_REQUIRED, 146 'cert_reqs': ssl.CERT_REQUIRED,
148 }) 147 })
149 return kws 148 return kws
150 149
151 class validator(object): 150 class validator(object):
152 def __init__(self, ui, host): 151 def __init__(self, ui, host):