sagemath/sagemath-qepcad.patch
2016-08-20 13:51:55 -04:00

61 lines
2 KiB
Diff

diff -up src/sage/interfaces/qepcad.py.orig src/sage/interfaces/qepcad.py
--- src/sage/interfaces/qepcad.py.orig 2016-08-08 13:58:03.953585989 -0400
+++ src/sage/interfaces/qepcad.py 2016-08-08 14:00:58.323592666 -0400
@@ -530,8 +530,8 @@ TESTS:
Check the qepcad configuration file::
- sage: open('%s/default.qepcadrc'%SAGE_LOCAL).readlines()[-1]
- 'SINGULAR .../bin\n'
+ sage: open('/usr/share/qepcad/default.qepcadrc').readlines()[-1]
+ 'SINGULAR /usr/bin\n'
Tests related to the not tested examples (nondeterministic order of atoms)::
@@ -606,7 +606,6 @@ AUTHORS:
from __future__ import print_function
from __future__ import absolute_import
-from sage.env import SAGE_LOCAL
import pexpect
import re
import sys
@@ -618,6 +617,8 @@ from sage.interfaces.tab_completion impo
from .expect import Expect, ExpectFunction, AsciiArtString
+QEPCAD_LOCAL = "/usr/share/qepcad"
+
def _qepcad_atoms(formula):
r"""
Return the atoms of a qepcad quantifier-free formula, as a set of strings.
@@ -647,17 +648,17 @@ def _qepcad_cmd(memcells=None):
sage: from sage.interfaces.qepcad import _qepcad_cmd
sage: s = _qepcad_cmd()
- sage: s == 'env qe=%s qepcad '%SAGE_LOCAL
+ sage: s == 'env qe=/usr/share/qepcad qepcad '
True
sage: s = _qepcad_cmd(memcells=8000000)
- sage: s == 'env qe=%s qepcad +N8000000'%SAGE_LOCAL
+ sage: s == 'env qe=/usr/share/qepcad qepcad +N8000000'
True
"""
if memcells is not None:
memcells_arg = '+N%s' % memcells
else:
memcells_arg = ''
- return "env qe=%s qepcad %s"%(SAGE_LOCAL, memcells_arg)
+ return "env qe=%s qepcad %s"%(QEPCAD_LOCAL, memcells_arg)
_command_info_cache = None
@@ -682,7 +683,7 @@ def _update_command_info():
cache = {}
- with open('%s/bin/qepcad.help'%SAGE_LOCAL) as help:
+ with open('%s/bin/qepcad.help'%QEPCAD_LOCAL) as help:
assert(help.readline().strip() == '@')
while True: