Antoni Segura Puimedon has uploaded a new change for review. Change subject: Remove redundant exception assignations. ......................................................................
Remove redundant exception assignations. Remove some obvious assignations from the except clauses that do not make any use of them. Change-Id: I5521612493ee9d5a57816fbcd8a54b174d29aefb Signed-off-by: Antoni S. Puimedon <[email protected]> --- M vdsm/libvirtvm.py M vdsm/storage/blockSD.py M vdsm/storage/blockVolume.py M vdsm/storage/fileSD.py M vdsm/storage/fileVolume.py M vdsm/storage/image.py M vdsm/storage/remoteFileHandler.py M vdsm/storage/volume.py M vdsm/vmChannels.py 9 files changed, 21 insertions(+), 21 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/34/11034/1 diff --git a/vdsm/libvirtvm.py b/vdsm/libvirtvm.py index d13dbb0..465be81 100644 --- a/vdsm/libvirtvm.py +++ b/vdsm/libvirtvm.py @@ -1660,7 +1660,7 @@ exc_info=True) raise SetLinkAndNetworkError(e.message) yield - except Exception as e: + except Exception: # Rollback link and network. self.log.debug('Rolling back link and net for: %s', dev.alias, exc_info=True) diff --git a/vdsm/storage/blockSD.py b/vdsm/storage/blockSD.py index 987dd7c..949257d 100644 --- a/vdsm/storage/blockSD.py +++ b/vdsm/storage/blockSD.py @@ -538,8 +538,8 @@ misc.ddCopy("/dev/zero", path, RESERVED_MAILBOX_SIZE) path = lvm.lvPath(vgName, sd.OUTBOX) misc.ddCopy("/dev/zero", path, RESERVED_MAILBOX_SIZE) - except se.ActionStopped as e: - raise e + except se.ActionStopped: + raise except se.StorageException: raise se.VolumesZeroingError(path) diff --git a/vdsm/storage/blockVolume.py b/vdsm/storage/blockVolume.py index 5dec748..6f7231a 100644 --- a/vdsm/storage/blockVolume.py +++ b/vdsm/storage/blockVolume.py @@ -116,7 +116,7 @@ # Fix me: assert resource lock. lvm.getLV(sdUUID, volUUID) lvm.removeLVs(sdUUID, volUUID) - except se.LogicalVolumeDoesNotExistError as e: + except se.LogicalVolumeDoesNotExistError: pass # It's OK: inexistent LV, don't try to remove. except se.CannotRemoveLogicalVolume as e: cls.log.warning("Remove logical volume failed %s/%s %s", sdUUID, @@ -224,9 +224,9 @@ misc.ddWatchCopy( "/dev/zero", vol_path, vars.task.aborting, int(size), recoveryCallback=volume.baseAsyncTasksRollback) - except se.ActionStopped as e: - raise e - except Exception as e: + except se.ActionStopped: + raise + except Exception: self.log.error("Unexpected error", exc_info=True) raise se.VolumesZeroingError(vol_path) finally: @@ -668,7 +668,7 @@ # Assert volumes are writable. (Don't do this at home.) try: lvm.changelv(sdUUID, lvNames, ("--permission", "rw")) - except se.StorageException as e: + except se.StorageException: # Hope this only means that some volumes were already writable. pass @@ -682,9 +682,9 @@ "/dev/zero", lvm.lvPath(sdUUID, lv.name), vars.task.aborting, int(lv.size), recoveryCallback=volume.baseAsyncTasksRollback) - except se.ActionStopped as e: - raise e - except Exception as e: + except se.ActionStopped: + raise + except Exception: raise se.VolumesZeroingError(lv.name) diff --git a/vdsm/storage/fileSD.py b/vdsm/storage/fileSD.py index c9a230a..1730a0d 100644 --- a/vdsm/storage/fileSD.py +++ b/vdsm/storage/fileSD.py @@ -333,7 +333,7 @@ self.oop.os.remove(volPath) self.oop.os.remove(volPath + '.meta') self.oop.os.remove(volPath + '.lease') - except OSError as e: + except OSError: self.log.error("vol: %s can't be removed.", volPath, exc_info=True) try: diff --git a/vdsm/storage/fileVolume.py b/vdsm/storage/fileVolume.py index d1c465b..01575e0 100644 --- a/vdsm/storage/fileVolume.py +++ b/vdsm/storage/fileVolume.py @@ -141,9 +141,9 @@ # ddWatchCopy expects size to be in bytes misc.ddWatchCopy("/dev/zero", volPath, vars.task.aborting, sizeBytes) - except se.ActionStopped as e: - raise e - except Exception as e: + except se.ActionStopped: + raise + except Exception: cls.log.error("Unexpected error", exc_info=True) raise se.VolumesZeroingError(volPath) diff --git a/vdsm/storage/image.py b/vdsm/storage/image.py index 01a07db..28bc6eb 100644 --- a/vdsm/storage/image.py +++ b/vdsm/storage/image.py @@ -940,8 +940,8 @@ if rc: raise se.StorageException("rc: %s, err: %s" % (rc, err)) - except se.ActionStopped as e: - raise e + except se.ActionStopped: + raise except se.StorageException as e: raise se.CopyImageError(str(e)) diff --git a/vdsm/storage/remoteFileHandler.py b/vdsm/storage/remoteFileHandler.py index 94f621a..c12d22b 100644 --- a/vdsm/storage/remoteFileHandler.py +++ b/vdsm/storage/remoteFileHandler.py @@ -406,5 +406,5 @@ logging.root.error("Error while serving", exc_info=True) raise - except BaseException as e: + except BaseException: sys.exit(errno.ENOEXEC) diff --git a/vdsm/storage/volume.py b/vdsm/storage/volume.py index 301e7c1..ca30638 100644 --- a/vdsm/storage/volume.py +++ b/vdsm/storage/volume.py @@ -733,10 +733,10 @@ if pvol: pvol.prepare(rw=chainrw, justme=False, chainrw=chainrw, setrw=setrw) - except Exception as e: + except Exception: self.log.error("Unexpected error", exc_info=True) self.teardown(self.sdUUID, self.volUUID) - raise e + raise return True diff --git a/vdsm/vmChannels.py b/vdsm/vmChannels.py index 5879afa..1d20f1d 100644 --- a/vdsm/vmChannels.py +++ b/vdsm/vmChannels.py @@ -82,7 +82,7 @@ if err.errno == 2: self.log.debug("%s (unregister was called twice?)" % err) else: - raise err + raise self._add_channels.pop(fileno, None) self._unconnected.pop(fileno, None) self._channels.pop(fileno, None) -- To view, visit http://gerrit.ovirt.org/11034 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5521612493ee9d5a57816fbcd8a54b174d29aefb Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Antoni Segura Puimedon <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
