added SCARD_E_NO_SERVICE to renewContext #154
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
smartcard/pcsc/PCSCReader.py
Outdated
| @@ -114,6 +116,10 @@ def readers(groups=[]): | |||
| hcontext = PCSCContext.renewContext() | |||
| pcsc_readers = __PCSCreaders__(hcontext, groups) | |||
|
|
|||
| except CardServiceNotFoundException: | |||
There was a problem hiding this comment.
I would prefer to handle the 2 exceptions at once with:
except (CardServiceStoppedException, CardServiceNotFoundException):
to factorize the code and avoid code duplication.
smartcard/pcsc/PCSCCardRequest.py
Outdated
| @@ -89,7 +89,7 @@ def getReaderNames(self): | |||
|
|
|||
| # get inserted readers | |||
| hresult, pcscreaders = SCardListReaders(self.hcontext, []) | |||
| if SCARD_E_SERVICE_STOPPED == hresult: | |||
| if SCARD_E_SERVICE_STOPPED == hresult or SCARD_E_NO_SERVICE == hresult: | |||
There was a problem hiding this comment.
I prefer the syntax I proposed:
elif hresult in (SCARD_E_SERVICE_STOPPED, SCARD_E_NO_SERVICE):
to avoid the hresult repetition.
LudovicRousseau
requested changes
Mar 27, 2023
|
Ok I will make these changes and amend the pull request. thanks for reviewing. |
change from review
change from review
|
Thanks. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Added SCARD_E_NO_SERVICE to renewContext. Added CardServiceNotFoundException exception. Worked for me on the latest Windows 10 catching both stop and no service to renew the context.