mirror of https://github.com/proxmox/mirror_qemu
python: support pylint 2.16
Pylint 2.16 adds a few new checks that cause the optional check-tox CI job to fail. 1. The superfluous-parens check seems to be a bit more aggressive, 2. broad-exception-raised is new; it discourages "raise Exception". Fix these minor issues and turn the lights green. Signed-off-by: John Snow <jsnow@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Beraldo Leal <bleal@redhat.com> Message-id: 20230210003147.1309376-2-jsnow@redhat.com Signed-off-by: John Snow <jsnow@redhat.com>master
parent
79b677d658
commit
aef633e765
|
@ -207,7 +207,7 @@ class AsyncProtocol(Generic[T]):
|
|||
logger = logging.getLogger(__name__)
|
||||
|
||||
# Maximum allowable size of read buffer
|
||||
_limit = (64 * 1024)
|
||||
_limit = 64 * 1024
|
||||
|
||||
# -------------------------
|
||||
# Section: Public interface
|
||||
|
|
|
@ -198,7 +198,7 @@ class QMPClient(AsyncProtocol[Message], Events):
|
|||
logger = logging.getLogger(__name__)
|
||||
|
||||
# Read buffer limit; 10MB like libvirt default
|
||||
_limit = (10 * 1024 * 1024)
|
||||
_limit = 10 * 1024 * 1024
|
||||
|
||||
# Type alias for pending execute() result items
|
||||
_PendingT = Union[Message, ExecInterruptedError]
|
||||
|
|
|
@ -155,7 +155,7 @@ class QemuGuestAgentClient:
|
|||
|
||||
def fsfreeze(self, cmd: str) -> object:
|
||||
if cmd not in ['status', 'freeze', 'thaw']:
|
||||
raise Exception('Invalid command: ' + cmd)
|
||||
raise ValueError('Invalid command: ' + cmd)
|
||||
# Can be int (freeze, thaw) or GuestFsfreezeStatus (status)
|
||||
return getattr(self.qga, 'fsfreeze' + '_' + cmd)()
|
||||
|
||||
|
@ -167,7 +167,7 @@ class QemuGuestAgentClient:
|
|||
|
||||
def suspend(self, mode: str) -> None:
|
||||
if mode not in ['disk', 'ram', 'hybrid']:
|
||||
raise Exception('Invalid mode: ' + mode)
|
||||
raise ValueError('Invalid mode: ' + mode)
|
||||
|
||||
try:
|
||||
getattr(self.qga, 'suspend' + '_' + mode)()
|
||||
|
@ -178,7 +178,7 @@ class QemuGuestAgentClient:
|
|||
|
||||
def shutdown(self, mode: str = 'powerdown') -> None:
|
||||
if mode not in ['powerdown', 'halt', 'reboot']:
|
||||
raise Exception('Invalid mode: ' + mode)
|
||||
raise ValueError('Invalid mode: ' + mode)
|
||||
|
||||
try:
|
||||
self.qga.shutdown(mode=mode)
|
||||
|
|
|
@ -720,7 +720,7 @@ class Timeout:
|
|||
signal.setitimer(signal.ITIMER_REAL, 0)
|
||||
return False
|
||||
def timeout(self, signum, frame):
|
||||
raise Exception(self.errmsg)
|
||||
raise TimeoutError(self.errmsg)
|
||||
|
||||
def file_pattern(name):
|
||||
return "{0}-{1}".format(os.getpid(), name)
|
||||
|
@ -804,7 +804,7 @@ def remote_filename(path):
|
|||
elif imgproto == 'ssh':
|
||||
return "ssh://%s@127.0.0.1:22%s" % (os.environ.get('USER'), path)
|
||||
else:
|
||||
raise Exception("Protocol %s not supported" % (imgproto))
|
||||
raise ValueError("Protocol %s not supported" % (imgproto))
|
||||
|
||||
class VM(qtest.QEMUQtestMachine):
|
||||
'''A QEMU VM'''
|
||||
|
|
|
@ -84,7 +84,7 @@ class TestDirtyBitmapPostcopyMigration(iotests.QMPTestCase):
|
|||
e['vm'] = 'SRC'
|
||||
for e in self.vm_b_events:
|
||||
e['vm'] = 'DST'
|
||||
events = (self.vm_a_events + self.vm_b_events)
|
||||
events = self.vm_a_events + self.vm_b_events
|
||||
events = [(e['timestamp']['seconds'],
|
||||
e['timestamp']['microseconds'],
|
||||
e['vm'],
|
||||
|
|
Loading…
Reference in New Issue