Merge lp://staging/~vila/bzr/1538480-match-hostname into lp://staging/bzr
Proposed by
Vincent Ladeuil
Status: | Merged |
---|---|
Approved by: | Richard Wilbur |
Approved revision: | no longer in the source branch. |
Merged at revision: | 6614 |
Proposed branch: | lp://staging/~vila/bzr/1538480-match-hostname |
Merge into: | lp://staging/bzr |
Diff against target: |
364 lines (+75/-127) 4 files modified
bzrlib/errors.py (+1/-9) bzrlib/tests/test_https_urllib.py (+32/-28) bzrlib/transport/http/_urllib2_wrappers.py (+39/-90) doc/en/release-notes/bzr-2.7.txt (+3/-0) |
To merge this branch: | bzr merge lp://staging/~vila/bzr/1538480-match-hostname |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Richard Wilbur | Approve | ||
Review via email: mp+284171@code.staging.launchpad.net |
Commit message
Use ssl.match_hostname instead of our own.
Description of the change
Since match_hostname is now provided, use it instead of carrying an obsolete version.
To post a comment you must log in.
Vincent, what you've done here is excellent and definitely an improvement over the contributed patch, exempli gratia, adding the not_ok function.
What I'm curious about is this patch requires python >= 2.7.9. Do we plan to bump our python version requirement from 2.6 to 2.7.9?
The other part of the patch checks for match_hostname in the ssl library and, if not found, imports it from backports.
1. Is that a worthwhile exercise in light of python version requirements?
2. Is backports normally available or would we change our dependencies to get it?