Hopiu/linkchecker
1
0
Fork 0
mirror of https://github.com/Hopiu/linkchecker.git synced 2026-05-03 20:34:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '9.3.x'

Browse source
This commit is contained in:
Antoine Beaupré 2017-01-31 19:21:22 -05:00
commit d51b7f34b6
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
linkcheck/httputil.py
View file

@ -32,14 +32,14 @@ def x509_to_dict(x509):
"""Parse a x509 pyopenssl object to a dictionary with keys
subject, subjectAltName and optional notAfter.
"""
import requests.packages.urllib3.contrib.pyopenssl as SSL
from requests.packages.urllib3.contrib.pyopenssl import get_subj_alt_name
res = {
'subject': (
(('commonName', x509.get_subject().CN),),
),
'subjectAltName': [
('DNS', value)
for value in SSL.get_subj_alt_name(x509)
for value in get_subj_alt_name(x509)
]
}
notAfter = x509.get_notAfter()

3
setup.py
View file

@ -375,8 +375,7 @@ myemail = "bastian.kleineidam@web.de"
data_files = [
('share/linkchecker',
['config/linkcheckerrc',
'doc/html/lccollection.qhc', 'doc/html/lcdoc.qch']),
['config/linkcheckerrc']),
('share/linkchecker/examples',
['cgi-bin/lconline/leer.html.en',
'cgi-bin/lconline/leer.html.de',