GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2026-01-31 10:01:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

asyncio.CancelledError is a subclass of BaseException since 3.8

Browse Source
This commit is contained in:
Devaev Maxim
2020-03-16 02:32:19 +03:00
parent 5b58af4d6f
commit 966267ebb9
6 changed files with 0 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
kvmd/plugins/msd/otg/__init__.py
View File

@@ -237,8 +237,6 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes
self.__drive.set_image_path("")
self.__drive.set_rw_flag(False)
self.__drive.set_cdrom_flag(False)
except asyncio.CancelledError: # pylint: disable=try-except-raise
raise
except Exception:
get_logger(0).exception("Can't reset MSD")
@@ -332,8 +330,6 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes
await self.__close_new_file()
try:
await self.__remount_storage(rw=False)
except asyncio.CancelledError: # pylint: disable=try-except-raise
raise
except Exception:
pass
finally:
@@ -383,8 +379,6 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes
if self.__new_file:
get_logger().info("Closing new image file ...")
await self.__new_file.close()
except asyncio.CancelledError: # pylint: disable=try-except-raise
raise
except Exception:
get_logger().exception("Can't close device file")
finally:
@@ -429,8 +423,6 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes
if need_reload_state:
await self.__reload_state()
await self.__state_notifier.notify()
except asyncio.CancelledError: # pylint: disable=try-except-raise
raise
except Exception:
logger.exception("Unexpected MSD watcher error")
@@ -451,8 +443,6 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes
await self.__remount_storage(rw=False)
storage_state = self.__get_storage_state()
except asyncio.CancelledError: # pylint: disable=try-except-raise
raise
except Exception:
logger.exception("Error while reloading MSD state; switching to offline")
self.__state.storage = None

4
kvmd/plugins/msd/relay.py
View File

@@ -359,8 +359,6 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes
if self.__device_file:
get_logger().info("Closing device file ...")
await self.__device_file.close()
except asyncio.CancelledError: # pylint: disable=try-except-raise
raise
except Exception:
get_logger().exception("Can't close device file")
finally:
@@ -374,8 +372,6 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes
try:
self.__device_info = await aiotools.run_async(_explore_device, self.__device_path)
break
except asyncio.CancelledError: # pylint: disable=try-except-raise
raise
except Exception:
if retries == 0:
self.__device_info = None