src/sage/numerical/backends: Remove unnecessary imports, muffle unuse…

…d variable warnings
sagemath · Oct 2, 2022 · 5b840bd · 5b840bd
1 parent b9c92ae
commit 5b840bd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/sage/numerical/backends/cvxpy_backend.pyx b/src/sage/numerical/backends/cvxpy_backend.pyx
@@ -124,8 +124,7 @@ cdef class CVXPYBackend:
             if cvxpy_solver.startswith("SCIPY/"):
                 cvxpy_solver_args['scipy_options'] = {"method": cvxpy_solver[len("SCIPY/"):]}
                 cvxpy_solver = "SCIPY"
-            import cvxpy as cp
-            cvxpy_solver = getattr(cp, cvxpy_solver)
+            cvxpy_solver = getattr(cvxpy, cvxpy_solver)
         self._cvxpy_solver = cvxpy_solver
         self._cvxpy_solver_args = cvxpy_solver_args
 

diff --git a/src/sage/numerical/backends/generic_backend.pyx b/src/sage/numerical/backends/generic_backend.pyx
@@ -1651,6 +1651,7 @@ def default_mip_solver(solver=None):
         except ImportError:
             raise ValueError("CVXPY is not available. Please refer to the documentation to install it.")
         else:
+            assert CVXPYBackend
             default_solver = solver
 
     elif solver.startswith("Cvxpy"):
@@ -1821,7 +1822,6 @@ cpdef GenericBackend get_solver(constraint_generation = False, solver = None, ba
 
     elif solver.startswith("Cvxpy"):
         from sage.numerical.backends.cvxpy_backend import CVXPYBackend
-        from functools import partial
         if solver == "Cvxpy":
             return CVXPYBackend()
         if solver.startswith("Cvxpy/"):