From fb27c0d1350611815127226bdf6b9785e55e8f59 Mon Sep 17 00:00:00 2001 From: Luke Olson Date: Tue, 31 Oct 2023 16:30:22 -0500 Subject: [PATCH] lint: remove unneeded else --- pyamg/krylov/_fgmres.py | 9 ++++----- pyamg/krylov/_gmres.py | 9 ++++----- pyamg/krylov/_gmres_householder.py | 9 ++++----- pyamg/krylov/_gmres_mgs.py | 9 ++++----- 4 files changed, 16 insertions(+), 20 deletions(-) diff --git a/pyamg/krylov/_fgmres.py b/pyamg/krylov/_fgmres.py index 72aaf586..d355c91a 100644 --- a/pyamg/krylov/_fgmres.py +++ b/pyamg/krylov/_fgmres.py @@ -113,11 +113,10 @@ def fgmres(A, b, x0=None, tol=1e-5, if restrt is not None: if restart is not None: raise ValueError('Only use restart, not restrt (deprecated).') - else: - restart = restrt - msg = ('The keyword argument "restrt" is deprecated and will ' - 'be removed in 2024. Use "restart" instead.') - warnings.warn(msg, DeprecationWarning, stacklevel=1) + restart = restrt + msg = ('The keyword argument "restrt" is deprecated and will ' + 'be removed in 2024. Use "restart" instead.') + warnings.warn(msg, DeprecationWarning, stacklevel=1) # Convert inputs to linear system, with error checking A, M, x, b, postprocess = make_system(A, M, x0, b) diff --git a/pyamg/krylov/_gmres.py b/pyamg/krylov/_gmres.py index 21c54e9e..be01bb7c 100644 --- a/pyamg/krylov/_gmres.py +++ b/pyamg/krylov/_gmres.py @@ -102,11 +102,10 @@ def gmres(A, b, x0=None, tol=1e-5, restart=None, maxiter=None, if restrt is not None: if restart is not None: raise ValueError('Only use restart, not restrt (deprecated).') - else: - restart = restrt - msg = ('The keyword argument "restrt" is deprecated and will ' - 'be removed in 2024. Use "restart" instead.') - warnings.warn(msg, DeprecationWarning, stacklevel=1) + restart = restrt + msg = ('The keyword argument "restrt" is deprecated and will ' + 'be removed in 2024. Use "restart" instead.') + warnings.warn(msg, DeprecationWarning, stacklevel=1) # pass along **kwargs if orthog == 'householder': diff --git a/pyamg/krylov/_gmres_householder.py b/pyamg/krylov/_gmres_householder.py index 24b5f322..78f0c026 100644 --- a/pyamg/krylov/_gmres_householder.py +++ b/pyamg/krylov/_gmres_householder.py @@ -111,11 +111,10 @@ def gmres_householder(A, b, x0=None, tol=1e-5, if restrt is not None: if restart is not None: raise ValueError('Only use restart, not restrt (deprecated).') - else: - restart = restrt - msg = ('The keyword argument "restrt" is deprecated and will ' - 'be removed in 2024. Use "restart" instead.') - warnings.warn(msg, DeprecationWarning, stacklevel=1) + restart = restrt + msg = ('The keyword argument "restrt" is deprecated and will ' + 'be removed in 2024. Use "restart" instead.') + warnings.warn(msg, DeprecationWarning, stacklevel=1) # Convert inputs to linear system, with error checking A, M, x, b, postprocess = make_system(A, M, x0, b) diff --git a/pyamg/krylov/_gmres_mgs.py b/pyamg/krylov/_gmres_mgs.py index c7d87133..eaa5d59e 100644 --- a/pyamg/krylov/_gmres_mgs.py +++ b/pyamg/krylov/_gmres_mgs.py @@ -133,11 +133,10 @@ def gmres_mgs(A, b, x0=None, tol=1e-5, if restrt is not None: if restart is not None: raise ValueError('Only use restart, not restrt (deprecated).') - else: - restart = restrt - msg = ('The keyword argument "restrt" is deprecated and will ' - 'be removed in 2024. Use "restart" instead.') - warnings.warn(msg, DeprecationWarning, stacklevel=1) + restart = restrt + msg = ('The keyword argument "restrt" is deprecated and will ' + 'be removed in 2024. Use "restart" instead.') + warnings.warn(msg, DeprecationWarning, stacklevel=1) # Convert inputs to linear system, with error checking A, M, x, b, postprocess = make_system(A, M, x0, b)