Skip to content

Fix to pyOpenSSL stubs to pass stubtest #5657

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 44 commits into from
Jun 17, 2021
Merged

Fix to pyOpenSSL stubs to pass stubtest #5657

merged 44 commits into from
Jun 17, 2021

Conversation

jolaf
Copy link
Contributor

@jolaf jolaf commented Jun 17, 2021

No description provided.

jolaf and others added 30 commits October 7, 2019 17:41
@jolaf
Merge pull request #1 from python/master
0a41f92 
Merge from master
@jolaf
Merge pull request #2 from python/master
6147b57 
Merge from master
Merge remote-tracking branch 'upstream/master'
24ccd88
Merge remote-tracking branch 'upstream/master'
8a67575
Merge remote-tracking branch 'upstream/master'
7208709
Merge remote-tracking branch 'upstream/master'
fb441f4
Merge remote-tracking branch 'upstream/master'
6842d78
Stubs for pyaudio added
84897db
Fixed for new format
f7a40e8
Trying to backport for Python 3.6
3204ff5
Fixed according to build checks
e2b2552
Fixed according to build checks
c5d7d62
Fixed according to build checks
1524136
Avoiding Literal as causing too much trouble in actual use
42c500f
Trying Python 2 compatibility
3be6149
Fixed error in annotation
6f8d928
Empty commit to trigger timed out build check
03e4dca
Revert "Empty commit to trigger timed out build check"
605c18d 
This reverts commit 03e4dca.
Added _ before auxiliary type names
e4a364d
Provided the actual version number
d2a5e1c
Fixed AssertionError: Unsupported Python version 0.2.11
1821870
Merge remote-tracking branch 'upstream/master'
8fa12cd
Added missing OpenSSL stubs
80d773e
Improved imports
0419f58
Fixed _StrLike and _BytesLike annotations, as well as passphrase call…
b354973 
…back annotations
More annotation fixes
fe4aa2a
Reordering classes according to official documentation per https://ww…
5e6fd23 
…w.pyopenssl.org/en/stable/api/crypto.html
Added missing OpenSSL stubs
4b9a50d
Reordering class fields according to official documentation per https…
1ab37de 
…://www.pyopenssl.org/en/stable/api/crypto.htmlAdded missing OpenSSL stubs
Formatting fixes
4798d01
@jolaf jolaf mentioned this pull request Jun 17, 2021
Merged
@jolaf jolaf changed the title Trying to fix pyOpenSSL tests Fix to pyOpenSSL stubs to pass stubtest Jun 17, 2021
Akuli
Akuli reviewed Jun 17, 2021
View reviewed changes
stubs/pyOpenSSL/@tests/stubtest_allowlist.txt
OpenSSL.SSL.Connection.__init__
OpenSSL.SSL.Context.load_verify_locations
OpenSSL.SSL.Context.set_verify
OpenSSL.crypto
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

stubtest complains that OpenSSL.crypto doesn't exist. If you don't want to figure out what's going on with that, you can leave OpenSSL.crypto in the allowlist for this PR.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems I've figured out what's going on and proposed a fix:
python/mypy#10663

srittau
srittau approved these changes Jun 17, 2021
View reviewed changes
Copy link
Collaborator

@srittau srittau left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, be we need to re-add OpenSSL.crypto back per Akuli's comment.

@jolaf
Copy link
Contributor Author

jolaf commented Jun 17, 2021 •
edited
Loading

Looks good, be we need to re-add OpenSSL.crypto back per Akuli's comment.

I just wonder, why stubtest complains. OpenSSL.crypto definitely exists.

Here's the error output:

error: OpenSSL.crypto is not a module
Stub: at line 1
MypyFile:1(
  /home/runner/work/typeshed/typeshed/stubs/pyOpenSSL/OpenSSL/crypto.pyi)
Runtime:
<cryptography.utils._ModuleWithDeprecations object at 0x7f0217cf0b80>

The root of the problem seems to be here:
https://github.com/python/mypy/blob/master/mypy/stubtest.py#L206

Should that place in stubtest be fixed instead of hiding the error by excluding the test?

@srittau
Copy link
Collaborator

srittau commented Jun 17, 2021

Fixing this would be great, of course.

@jolaf jolaf mentioned this pull request Jun 17, 2021
Closed
@jolaf
Copy link
Contributor Author

jolaf commented Jun 17, 2021

Fixing this would be great, of course.

I've just proposed a workaround to mypy.

@srittau
Copy link
Collaborator

srittau commented Jun 17, 2021

Per the feedback on the mypy bug, let's just add the item back in the allowlist.

@srittau srittau merged commit 4d981f8 into python:master Jun 17, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Akuli Akuli Akuli left review comments

@srittau srittau srittau approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jolaf @srittau @Akuli