| Message ID | 20230209154034.983044-2-jsnow@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Python: Drop support for Python 3.6 | expand |
On 9/2/23 16:40, John Snow wrote: > 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> > --- > python/qemu/qmp/protocol.py | 2 +- > python/qemu/qmp/qmp_client.py | 2 +- > python/qemu/utils/qemu_ga_client.py | 6 +++--- > tests/qemu-iotests/iotests.py | 4 ++-- > tests/qemu-iotests/tests/migrate-bitmaps-postcopy-test | 2 +- > 5 files changed, 8 insertions(+), 8 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
On Thu, Feb 09, 2023 at 10:40:28AM -0500, John Snow wrote: > 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> > --- > python/qemu/qmp/protocol.py | 2 +- > python/qemu/qmp/qmp_client.py | 2 +- > python/qemu/utils/qemu_ga_client.py | 6 +++--- > tests/qemu-iotests/iotests.py | 4 ++-- > tests/qemu-iotests/tests/migrate-bitmaps-postcopy-test | 2 +- > 5 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/python/qemu/qmp/protocol.py b/python/qemu/qmp/protocol.py > index 6d3d739daa7..22e60298d28 100644 > --- a/python/qemu/qmp/protocol.py > +++ b/python/qemu/qmp/protocol.py > @@ -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 > diff --git a/python/qemu/qmp/qmp_client.py b/python/qemu/qmp/qmp_client.py > index b5772e7f32b..9d73ae6e7ad 100644 > --- a/python/qemu/qmp/qmp_client.py > +++ b/python/qemu/qmp/qmp_client.py > @@ -198,7 +198,7 @@ async def run(self, address='/tmp/qemu.socket'): > 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] > diff --git a/python/qemu/utils/qemu_ga_client.py b/python/qemu/utils/qemu_ga_client.py > index 8c38a7ac9c0..d8411bb2d0b 100644 > --- a/python/qemu/utils/qemu_ga_client.py > +++ b/python/qemu/utils/qemu_ga_client.py > @@ -155,7 +155,7 @@ def ping(self, timeout: Optional[float]) -> bool: > > 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 @@ def fstrim(self, minimum: int) -> Dict[str, object]: > > 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 @@ def suspend(self, mode: str) -> None: > > 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) > diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py > index 94aeb3f3b20..3e82c634cfe 100644 > --- a/tests/qemu-iotests/iotests.py > +++ b/tests/qemu-iotests/iotests.py > @@ -720,7 +720,7 @@ def __exit__(self, exc_type, value, traceback): > 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''' > diff --git a/tests/qemu-iotests/tests/migrate-bitmaps-postcopy-test b/tests/qemu-iotests/tests/migrate-bitmaps-postcopy-test > index fc9c4b4ef41..dda55fad284 100755 > --- a/tests/qemu-iotests/tests/migrate-bitmaps-postcopy-test > +++ b/tests/qemu-iotests/tests/migrate-bitmaps-postcopy-test > @@ -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'], > -- > 2.39.0 > Reviewed-by: Beraldo Leal <bleal@redhat.com> -- Beraldo
diff --git a/python/qemu/qmp/protocol.py b/python/qemu/qmp/protocol.py index 6d3d739daa7..22e60298d28 100644 --- a/python/qemu/qmp/protocol.py +++ b/python/qemu/qmp/protocol.py @@ -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 diff --git a/python/qemu/qmp/qmp_client.py b/python/qemu/qmp/qmp_client.py index b5772e7f32b..9d73ae6e7ad 100644 --- a/python/qemu/qmp/qmp_client.py +++ b/python/qemu/qmp/qmp_client.py @@ -198,7 +198,7 @@ async def run(self, address='/tmp/qemu.socket'): 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] diff --git a/python/qemu/utils/qemu_ga_client.py b/python/qemu/utils/qemu_ga_client.py index 8c38a7ac9c0..d8411bb2d0b 100644 --- a/python/qemu/utils/qemu_ga_client.py +++ b/python/qemu/utils/qemu_ga_client.py @@ -155,7 +155,7 @@ def ping(self, timeout: Optional[float]) -> bool: 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 @@ def fstrim(self, minimum: int) -> Dict[str, object]: 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 @@ def suspend(self, mode: str) -> None: 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) diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 94aeb3f3b20..3e82c634cfe 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -720,7 +720,7 @@ def __exit__(self, exc_type, value, traceback): 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''' diff --git a/tests/qemu-iotests/tests/migrate-bitmaps-postcopy-test b/tests/qemu-iotests/tests/migrate-bitmaps-postcopy-test index fc9c4b4ef41..dda55fad284 100755 --- a/tests/qemu-iotests/tests/migrate-bitmaps-postcopy-test +++ b/tests/qemu-iotests/tests/migrate-bitmaps-postcopy-test @@ -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'],
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> --- python/qemu/qmp/protocol.py | 2 +- python/qemu/qmp/qmp_client.py | 2 +- python/qemu/utils/qemu_ga_client.py | 6 +++--- tests/qemu-iotests/iotests.py | 4 ++-- tests/qemu-iotests/tests/migrate-bitmaps-postcopy-test | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-)