Skip to content

Commit 3563c72

Browse files
authored
Merge pull request #3 from grqz/master
fix WinError handling
2 parents 880276c + 3fabb44 commit 3563c72

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

src/plugin_jm_server/driver.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import os
2+
import re
23

34

45
def get_winDriver():
@@ -23,11 +24,11 @@ def get_winDriver():
2324
driver_list[i] = driver_name
2425
i += 1
2526
except PermissionError as e:
26-
if '[WinError 21]' in str(e):
27-
del driver_list[i]
28-
# 异常类型不为 “设备未就绪” 的再次抛出异常供调试
29-
else:
30-
raise (PermissionError, e)
27+
del driver_list[i]
28+
mobj = re.match(r'\[WinError (\d+)\]', str(e))
29+
# ERROR_NOT_READY, ERROR_ACCESS_DENIED
30+
if mobj is not None and mobj.group(1) not in {'21', '5'}:
31+
print(f'Drive {driver_name} unexpectedly unavailable: {e}')
3132
finally:
3233
num -= 1
3334

0 commit comments

Comments
 (0)