Trac #29617: treat empty MAXIMA_FAS and KENZO_FAS as None.

When these variables are defined to be the empty string, we now assume that ECL knows where to find the corresponding files.
sagemath · Apr 2, 2021 · 1615691 · 1615691
1 parent 683abb9
commit 1615691
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/sage/features/kenzo.py b/src/sage/features/kenzo.py
@@ -47,7 +47,7 @@ def _is_present(self):
 
         try:
             from sage.env import KENZO_FAS
-            if KENZO_FAS is not None:
+            if KENZO_FAS:
                 ecl_eval("(require :kenzo \"{}\")".format(KENZO_FAS))
             else:
                 ecl_eval("(require :kenzo)")

diff --git a/src/sage/interfaces/kenzo.py b/src/sage/interfaces/kenzo.py
@@ -107,7 +107,7 @@
 # are replaced with underscores to get valid Python identifiers.
 if Kenzo().is_present():
     from sage.env import KENZO_FAS
-    if KENZO_FAS is not None:
+    if KENZO_FAS:
         ecl_eval("(require :kenzo \"{}\")".format(KENZO_FAS))
     else:
         ecl_eval("(require :kenzo)")

diff --git a/src/sage/interfaces/maxima_lib.py b/src/sage/interfaces/maxima_lib.py
@@ -99,7 +99,7 @@
 ## We begin here by initializing Maxima in library mode
 ## i.e. loading it into ECL
 ecl_eval("(setf *load-verbose* NIL)")
-if MAXIMA_FAS is not None:
+if MAXIMA_FAS:
     ecl_eval("(require 'maxima \"{}\")".format(MAXIMA_FAS))
 else:
     ecl_eval("(require 'maxima)")