Handle non-* unused import-related messages

roryyorke · roryyorke · commit dfc0ead207b4 · 2025-02-02T07:09:35.000+02:00
Mostly removing imports; in some cases, placate pyflakes with fake
evaluation of not-obviously-used name.
diff --git a/control/canonical.py b/control/canonical.py
@@ -8,9 +8,8 @@
 
 import numpy as np
 
-from numpy import zeros, zeros_like, shape, poly, iscomplex, vstack, hstack, \
-    transpose, empty, finfo, float64
-from numpy.linalg import solve, matrix_rank, eig
+from numpy import zeros_like, poly, transpose
+from numpy.linalg import solve, matrix_rank
 
 from scipy.linalg import schur
 
diff --git a/control/dtime.py b/control/dtime.py
@@ -48,7 +48,6 @@
 """
 
 from .iosys import isctime
-from .statesp import StateSpace
 
 __all__ = ['sample_system', 'c2d']
 
diff --git a/control/exception.py b/control/exception.py
@@ -72,6 +72,7 @@ def slycot_check():
     if slycot_installed is None:
         try:
             import slycot
+            slycot # pyflakes
             slycot_installed = True
         except:
             slycot_installed = False
@@ -86,6 +87,7 @@ def pandas_check():
     if pandas_installed is None:
         try:
             import pandas
+            pandas # pyflakes
             pandas_installed = True
         except:
             pandas_installed = False
@@ -99,6 +101,7 @@ def cvxopt_check():
     if cvxopt_installed is None:
         try:
             import cvxopt
+            cvxopt # pyflakes
             cvxopt_installed = True
         except:
             cvxopt_installed = False
diff --git a/control/flatsys/bspline.py b/control/flatsys/bspline.py
@@ -8,7 +8,7 @@
 
 import numpy as np
 from .basis import BasisFamily
-from scipy.interpolate import BSpline, splev
+from scipy.interpolate import BSpline
 
 class BSplineFamily(BasisFamily):
     """B-spline basis functions.
diff --git a/control/flatsys/flatsys.py b/control/flatsys/flatsys.py
@@ -245,7 +245,6 @@ def flatsys(*args, updfcn=None, outfcn=None, **kwargs):
     """
     from .linflat import LinearFlatSystem
     from ..statesp import StateSpace
-    from ..iosys import _process_iosys_keywords
 
     if len(args) == 1 and isinstance(args[0], StateSpace):
         # We were passed a linear system, so call linflat
diff --git a/control/frdata.py b/control/frdata.py
@@ -15,8 +15,8 @@
 from warnings import warn
 
 import numpy as np
-from numpy import absolute, angle, array, empty, eye, imag, linalg, ones, \
-    real, sort, where
+from numpy import absolute, array, empty, eye, imag, linalg, ones, \
+    real, sort
 from scipy.interpolate import splev, splprep
 
 from . import config
diff --git a/control/freqplot.py b/control/freqplot.py
@@ -11,7 +11,6 @@
 import itertools
 import math
 import warnings
-from os.path import commonprefix
 
 import matplotlib as mpl
 import matplotlib.pyplot as plt
diff --git a/control/iosys.py b/control/iosys.py
@@ -8,7 +8,6 @@
 
 import re
 from copy import deepcopy
-from warnings import warn
 
 import numpy as np
 
diff --git a/control/lti.py b/control/lti.py
@@ -7,7 +7,8 @@
 import numpy as np
 import math
 
-from numpy import real, angle, abs
+# todo: override built-in abs
+from numpy import real, abs
 from warnings import warn
 from . import config
 from .iosys import InputOutputSystem
diff --git a/control/mateqn.py b/control/mateqn.py
@@ -37,7 +37,7 @@
 
 import warnings
 import numpy as np
-from numpy import copy, eye, dot, finfo, inexact, atleast_2d
+from numpy import eye, finfo, inexact
 
 import scipy as sp
 from scipy.linalg import eigvals, solve
diff --git a/control/nichols.py b/control/nichols.py
@@ -21,7 +21,6 @@
 from .ctrlplot import ControlPlot, _get_line_labels, _process_ax_keyword, \
     _process_legend_keywords, _process_line_labels, _update_plot_title
 from .ctrlutil import unwrap
-from .freqplot import _default_frequency_range, _freqplot_defaults
 from .lti import frequency_response
 from .statesp import StateSpace
 from .xferfcn import TransferFunction
diff --git a/control/nlsys.py b/control/nlsys.py
@@ -18,15 +18,14 @@
 
 """
 
-import copy
 from warnings import warn
 
 import numpy as np
 import scipy as sp
 
 from . import config
 from .iosys import InputOutputSystem, _parse_spec, _process_iosys_keywords, \
-    _process_signal_list, common_timebase, iosys_repr, isctime, isdtime
+    common_timebase, iosys_repr, isctime, isdtime
 from .timeresp import _check_convert_array, _process_time_response, \
     TimeResponseData, TimeResponseList
 
@@ -2474,8 +2473,7 @@ def interconnect(
     `outputs`, for more natural naming of SISO systems.
 
     """
-    from .statesp import LinearICSystem, StateSpace, _convert_to_statespace
-    from .xferfcn import TransferFunction
+    from .statesp import LinearICSystem, StateSpace
 
     dt = kwargs.pop('dt', None)         # bypass normal 'dt' processing
     name, inputs, outputs, states, _ = _process_iosys_keywords(kwargs)
diff --git a/control/optimal.py b/control/optimal.py
@@ -23,8 +23,7 @@
 import time
 
 from . import config
-from .exception import ControlNotImplemented
-from .iosys import _process_indices, _process_labels, \
+from .iosys import _process_labels, \
     _process_control_disturbance_indices
 
 
diff --git a/control/phaseplot.py b/control/phaseplot.py
@@ -38,7 +38,6 @@
 from . import config
 from .ctrlplot import ControlPlot, _add_arrows_to_line2D, _get_color, \
     _process_ax_keyword, _update_plot_title
-from .exception import ControlNotImplemented
 from .nlsys import NonlinearIOSystem, find_operating_point, \
     input_output_response
 
diff --git a/control/pzmap.py b/control/pzmap.py
@@ -11,21 +11,18 @@
 
 import itertools
 import warnings
-from math import pi
 
 import matplotlib.pyplot as plt
 import numpy as np
-from numpy import cos, exp, imag, linspace, real, sin, sqrt
+from numpy import imag, real
 
 from . import config
 from .config import _process_legacy_keyword
 from .ctrlplot import ControlPlot, _get_color, _get_color_offset, \
     _get_line_labels, _process_ax_keyword, _process_legend_keywords, \
     _process_line_labels, _update_plot_title
-from .freqplot import _freqplot_defaults
 from .grid import nogrid, sgrid, zgrid
 from .iosys import isctime, isdtime
-from .lti import LTI
 from .statesp import StateSpace
 from .xferfcn import TransferFunction
 
diff --git a/control/rlocus.py b/control/rlocus.py
@@ -16,17 +16,14 @@
 #
 
 import warnings
-from functools import partial
 
-import matplotlib.pyplot as plt
 import numpy as np
 import scipy.signal  # signal processing toolbox
-from numpy import array, imag, poly1d, real, vstack, zeros_like
+from numpy import poly1d, vstack, zeros_like
 
 from . import config
 from .ctrlplot import ControlPlot
 from .exception import ControlMIMONotImplemented
-from .iosys import isdtime
 from .lti import LTI
 from .xferfcn import _convert_to_transfer_function
 
diff --git a/control/statesp.py b/control/statesp.py
@@ -16,14 +16,14 @@
 import math
 import sys
 from collections.abc import Iterable
-from copy import deepcopy
 from warnings import warn
 
 import numpy as np
 import scipy as sp
 import scipy.linalg
+# todo: check override of built-in any
 from numpy import any, array, asarray, concatenate, cos, delete, empty, \
-    exp, eye, isinf, ones, pad, sin, squeeze, zeros
+    exp, eye, isinf, pad, sin, squeeze, zeros
 from numpy.linalg import LinAlgError, eigvals, matrix_rank, solve
 from numpy.random import rand, randn
 from scipy.signal import StateSpace as signalStateSpace
@@ -33,13 +33,15 @@
 from . import bdalg
 from .exception import ControlMIMONotImplemented, ControlSlycot, slycot_check
 from .frdata import FrequencyResponseData
-from .iosys import InputOutputSystem, NamedSignal, _process_dt_keyword, \
+from .iosys import InputOutputSystem, NamedSignal, \
     _process_iosys_keywords, _process_signal_list, _process_subsys_index, \
-    common_timebase, iosys_repr, isdtime, issiso
+    common_timebase, issiso
 from .lti import LTI, _process_frequency_response
 from .nlsys import InterconnectedSystem, NonlinearIOSystem
 import control
 
+array # pyflakes
+
 try:
     from slycot import ab13dd
 except ImportError:
diff --git a/control/stochsys.py b/control/stochsys.py
@@ -16,14 +16,15 @@
 __maintainer__ = "Richard Murray"
 __email__ = "murray@cds.caltech.edu"
 
+import warnings
+
 import numpy as np
 import scipy as sp
 from math import sqrt
 
-from .statesp import StateSpace
 from .lti import LTI
-from .iosys import InputOutputSystem, isctime, isdtime, _process_indices, \
-    _process_labels, _process_control_disturbance_indices
+from .iosys import (isctime, isdtime, _process_labels,
+                    _process_control_disturbance_indices)
 from .nlsys import NonlinearIOSystem
 from .mateqn import care, dare, _check_shape
 from .statesp import StateSpace, _ssmatrix
@@ -460,7 +461,7 @@ def create_estimator_iosystem(
     # Set the input and direct matrices
     B = sys.B[:, ctrl_idx]
     if not np.allclose(sys.D, 0):
-        raise NotImplemented("nonzero 'D' matrix not yet implemented")
+        raise NotImplementedError("nonzero 'D' matrix not yet implemented")
 
     # Set the output matrices
     if C is not None:
diff --git a/control/sysnorm.py b/control/sysnorm.py
@@ -12,7 +12,6 @@
 """
 
 import numpy as np
-import scipy as sp
 import numpy.linalg as la
 import warnings
 
diff --git a/control/timeplot.py b/control/timeplot.py
@@ -11,7 +11,6 @@
 import itertools
 from warnings import warn
 
-import matplotlib as mpl
 import matplotlib.pyplot as plt
 import numpy as np
 
@@ -178,8 +177,6 @@ def time_response_plot(
 
     """
     from .ctrlplot import _process_ax_keyword, _process_line_labels
-    from .iosys import InputOutputSystem
-    from .timeresp import TimeResponseData
 
     #
     # Process keywords and set defaults
diff --git a/control/timeresp.py b/control/timeresp.py
@@ -1838,8 +1838,6 @@ def initial_response(
     >>> T, yout = ct.initial_response(G)
 
     """
-    from .lti import LTI
-
     # Create the time and input vectors
     if T is None or np.asarray(T).size == 1:
         T = _default_time_vector(sysdata, N=T_num, tfinal=T, is_step=False)
diff --git a/control/xferfcn.py b/control/xferfcn.py
@@ -22,8 +22,8 @@
 
 import numpy as np
 import scipy as sp
-from numpy import angle, array, delete, empty, exp, finfo, float64, ndarray, \
-    nonzero, ones, pi, poly, polyadd, polymul, polyval, real, roots, sqrt, \
+from numpy import array, delete, empty, exp, finfo, float64, ndarray, \
+    nonzero, ones, poly, polyadd, polymul, polyval, real, roots, sqrt, \
     squeeze, where, zeros
 from scipy.signal import TransferFunction as signalTransferFunction
 from scipy.signal import cont2discrete, tf2zpk, zpk2tf
@@ -33,9 +33,11 @@
 from .exception import ControlMIMONotImplemented
 from .frdata import FrequencyResponseData
 from .iosys import InputOutputSystem, NamedSignal, _process_iosys_keywords, \
-    _process_subsys_index, common_timebase, isdtime
+    _process_subsys_index, common_timebase
 from .lti import LTI, _process_frequency_response
 
+float64 # pyflakes
+
 __all__ = ['TransferFunction', 'tf', 'zpk', 'ss2tf', 'tfdata']
 
 
