src/sage/sat/solvers/picosat.py: Use lazy_import with feature instead…

… of try/except
sagemath · Sep 20, 2020 · 30613c8 · 30613c8
1 parent fdc62f7
commit 30613c8
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/sage/sat/solvers/picosat.py b/src/sage/sat/solvers/picosat.py
@@ -24,6 +24,11 @@
 
 from .satsolver import SatSolver
 
+from sage.misc.lazy_import import lazy_import
+from sage.features import PythonModule
+lazy_import('pycosat', ['solve'],
+            feature=PythonModule('pycosat', spkg='pycosat'))
+
 class PicoSAT(SatSolver):
     r"""
     PicoSAT Solver.
@@ -55,12 +60,7 @@ def __init__(self, verbosity=0, prop_limit=0):
             self._prop_limit = 0
         else:
             self._prop_limit = int(prop_limit)
-        try:
-            import pycosat
-        except ImportError:
-            from sage.misc.package import PackageNotFoundError
-            raise PackageNotFoundError("pycosat")
-        self._solve = pycosat.solve
+        self._solve = solve
         self._nvars = 0
         self._clauses = []