##// END OF EJS Templates
sslutil: abort if peer certificate is not verified for secure use...
sslutil: abort if peer certificate is not verified for secure use Before this patch, "sslutil.validator" may returns successfully, even if peer certificate is not verified because there is no information in "[hostfingerprints]" and "[web] cacerts". To prevent from sending authentication credential to untrustable SMTP server, validation should be aborted if peer certificate is not verified. This patch introduces "strict" optional argument, and "sslutil.validator" will abort if it is True and peer certificate is not verified.

File last commit:

r18847:40c67974 default
r18887:2d7fac04 default
Show More
dicthelpers.py
55 lines | 1.5 KiB | text/x-python | PythonLexer
# dicthelpers.py - helper routines for Python dicts
#
# Copyright 2013 Facebook
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
def diff(d1, d2, default=None):
'''Return all key-value pairs that are different between d1 and d2.
This includes keys that are present in one dict but not the other, and
keys whose values are different. The return value is a dict with values
being pairs of values from d1 and d2 respectively, and missing values
represented as default.'''
res = {}
if d1 is d2:
# same dict, so diff is empty
return res
for k1, v1 in d1.iteritems():
if k1 in d2:
v2 = d2[k1]
if v1 != v2:
res[k1] = (v1, v2)
else:
res[k1] = (v1, default)
for k2 in d2:
if k2 not in d1:
res[k2] = (default, d2[k2])
return res
def join(d1, d2, default=None):
'''Return all key-value pairs from both d1 and d2.
This is akin to an outer join in relational algebra. The return value is a
dict with values being pairs of values from d1 and d2 respectively, and
missing values represented as default.'''
res = {}
for k1, v1 in d1.iteritems():
if k1 in d2:
res[k1] = (v1, d2[k1])
else:
res[k1] = (v1, default)
if d1 is d2:
return res
for k2 in d2:
if k2 not in d1:
res[k2] = (default, d2[k2])
return res