Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove remaining uses of WindowsError

Browse Source
This commit is contained in:
Kovid Goyal 2019-12-19 09:14:03 +05:30
parent bbdebbc3ef
commit fb9d5a16ce
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
4 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/srv/utils.py
View File

@ -426,12 +426,14 @@ class HandleInterrupt(object): # {{{
def __enter__(self):
if iswindows:
if self.SetConsoleCtrlHandler(self.handle, 1) == 0:
raise WindowsError()
import ctypes
raise ctypes.WinError()
def __exit__(self, *args):
if iswindows:
if self.SetConsoleCtrlHandler(self.handle, 0) == 0:
raise WindowsError()
import ctypes
raise ctypes.WinError()
# }}}

12
src/calibre/utils/shared_file.py
View File

@ -71,13 +71,13 @@ if iswindows:
}
def raise_winerror(pywinerr, path=None):
reraise(
WindowsError, WindowsError(
pywinerr.winerror,
(pywinerr.funcname or '') + ': ' + (pywinerr.strerror or ''), path
),
sys.exc_info()[2]
exc = OSError(
pywinerr.winerror,
(pywinerr.funcname or '') + ': ' + (pywinerr.strerror or ''),
path,
pywinerr.winerror
)
reraise(type(exc), exc, sys.exc_info()[2])
def os_open(path, flags, mode=0o777, share_flags=FILE_SHARE_VALID_FLAGS):
'''

16
src/calibre/utils/winreg/default_programs.py
View File

@ -198,8 +198,8 @@ def get_prog_id_map(base, key_path):
desc, ans = None, {}
try:
k = Key(open_at=key_path, root=base)
except WindowsError as err:
if err.errno == winerror.ERROR_FILE_NOT_FOUND:
except OSError as err:
if err.winerror == winerror.ERROR_FILE_NOT_FOUND:
return desc, ans
raise
with k:
@ -214,8 +214,8 @@ def get_prog_id_map(base, key_path):
def get_open_data(base, prog_id):
try:
k = Key(open_at=r'Software\Classes\%s' % prog_id, root=base)
except WindowsError as err:
if err.errno == winerror.ERROR_FILE_NOT_FOUND:
except OSError as err:
if err.winerror == winerror.ERROR_FILE_NOT_FOUND:
return None, None, None
with k:
cmd = k.get(sub_key=r'shell\open\command')
@ -266,8 +266,8 @@ def find_programs(extensions):
for base in (HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE):
try:
k = Key(open_at=r'Software\RegisteredApplications', root=base)
except WindowsError as err:
if err.errno == winerror.ERROR_FILE_NOT_FOUND:
except OSError as err:
if err.winerror == winerror.ERROR_FILE_NOT_FOUND:
continue
raise
with k:
@ -292,8 +292,8 @@ def find_programs(extensions):
for ext in extensions:
try:
k = Key(open_at=r'Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.%s\OpenWithProgIDs' % ext, root=HKEY_CURRENT_USER)
except WindowsError as err:
if err.errno == winerror.ERROR_FILE_NOT_FOUND:
except OSError as err:
if err.winerror == winerror.ERROR_FILE_NOT_FOUND:
continue
for prog_id in itervalues(k):
if prog_id and prog_id not in seen_prog_ids:

6
src/calibre/utils/winreg/lib.py
View File

@ -252,8 +252,8 @@ class Key(object):
data_buf = ctypes.create_unicode_buffer(max(2 * len(data_buf), size.value // 2))
except KeyError:
return default
except WindowsError as err:
if fallback and err.errno == winerror.ERROR_BAD_COMMAND:
except OSError as err:
if fallback and err.winerror == winerror.ERROR_BAD_COMMAND:
return self.get(value_name=value_name, default=default)
raise
return data_buf.value
@ -310,7 +310,7 @@ class Key(object):
if sub_key is not None:
try:
key = RegOpenKey(key, sub_key)
except WindowsError:
except OSError:
return
try:
name_buf = ctypes.create_unicode_buffer(16385)