Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplify TLS logging for the modern pyOpenSSL. #4822

Merged
merged 1 commit into from Oct 1, 2020

Conversation

wRAR
Copy link
Contributor

@wRAR wRAR commented Oct 1, 2020

We now require pyOpenSSL>=16.2.0 so the code can be simplified.

There is another conditional that is used by this feature, in utils.ssl, it checks hasattr(pyOpenSSLutil.lib, 'SSL_get_server_tmp_key') which requires OpenSSL 1.0.2. I don't know how does Scrapy itself work on systems with older OpenSSL, and how many such systems are there, but I decided to keep it for now.

@wRAR wRAR added the cleanup label Oct 1, 2020
@codecov
Copy link

codecov bot commented Oct 1, 2020

Codecov Report

Merging #4822 into master will increase coverage by 0.04%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##           master    #4822      +/-   ##
==========================================
+ Coverage   87.52%   87.56%   +0.04%     
==========================================
  Files         160      160              
  Lines        9761     9758       -3     
  Branches     1440     1438       -2     
==========================================
+ Hits         8543     8545       +2     
+ Misses        955      953       -2     
+ Partials      263      260       -3     
Impacted Files Coverage Δ
scrapy/core/downloader/tls.py 92.50% <100.00%> (+6.45%) ⬆️
scrapy/core/downloader/__init__.py 92.48% <0.00%> (+1.50%) ⬆️

@Gallaecio Gallaecio merged commit 44f0fde into scrapy:master Oct 1, 2020
1 check passed
@wRAR wRAR deleted the old-pyopenssl-conditionals branch Oct 2, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants