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.

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

added SCARD_E_NO_SERVICE to renewContext #154

Closed
wants to merge 5 commits into from
Closed

added SCARD_E_NO_SERVICE to renewContext #154

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
60fbc2b
added CardServiceNotFoundException exception
mbokil Mar 27, 2023
47230d2
added CardServiceNotFoundException exception
mbokil Mar 27, 2023
43e40b9
added SCARD_E_NO_SERVICE calls renewContext
mbokil Mar 27, 2023
453f8cd
Update PCSCCardRequest.py
mbokil Mar 29, 2023
68bad93
Update PCSCReader.py
mbokil Mar 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions smartcard/pcsc/PCSCReader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ def __PCSCreaders__(hcontext, groups=[]):
readers = []
elif hresult == SCARD_E_SERVICE_STOPPED:
raise CardServiceStoppedException()
elif hresult == SCARD_E_NO_SERVICE:
raise CardServiceNotFoundException()
else:
raise ListReadersException(hresult)

Expand Down Expand Up @@ -114,6 +116,10 @@ def readers(groups=[]):
hcontext = PCSCContext.renewContext()
pcsc_readers = __PCSCreaders__(hcontext, groups)

except CardServiceNotFoundException:
Copy link
Owner

Choose a reason for hiding this comment

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

I would prefer to handle the 2 exceptions at once with:

except (CardServiceStoppedException, CardServiceNotFoundException):

to factorize the code and avoid code duplication.

hcontext = PCSCContext.renewContext()
pcsc_readers = __PCSCreaders__(hcontext, groups)

for reader in pcsc_readers:
creaders.append(PCSCReader.Factory.create(reader))
return creaders
Expand Down