Skip to content

Commit eb40ba1

Browse files
committed
Fix tests
1 parent 64d15cd commit eb40ba1

File tree

11 files changed

+135
-82
lines changed

11 files changed

+135
-82
lines changed

src/sage/interfaces/axiom.py

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -179,17 +179,21 @@
179179
import os
180180
import re
181181

182-
import sage.interfaces.abc
182+
from pexpect import EOF
183183

184-
from .expect import Expect, ExpectElement, FunctionElement, ExpectFunction
184+
import sage.interfaces.abc
185185
from sage.env import DOT_SAGE
186-
from pexpect import EOF
187-
from sage.misc.multireplace import multiple_replace
186+
from sage.interfaces.expect import (
187+
Expect,
188+
ExpectElement,
189+
ExpectFunction,
190+
FunctionElement,
191+
)
188192
from sage.interfaces.tab_completion import ExtraTabCompletion
189193
from sage.misc.instancedoc import instancedoc
194+
from sage.misc.multireplace import multiple_replace
190195
from sage.structure.richcmp import rich_to_bool
191196

192-
193197
# The Axiom commands ")what thing det" ")show Matrix" and ")display
194198
# op det" commands, gives a list of all identifiers that begin in
195199
# a certain way. This could maybe be useful somehow... (?) Also
@@ -209,6 +213,7 @@ def __init__(self, name='axiom', command='axiom -nox -noclef',
209213
210214
TESTS::
211215
216+
sage: from sage.interfaces.axiom import axiom
212217
sage: axiom == loads(dumps(axiom))
213218
True
214219
"""
@@ -829,8 +834,8 @@ def _sage_(self):
829834
return self._sage_domain()
830835

831836
if type == "Float":
832-
from sage.rings.real_mpfr import RealField
833837
from sage.rings.integer_ring import ZZ
838+
from sage.rings.real_mpfr import RealField
834839
prec = max(self.mantissa().length()._sage_(), 53)
835840
R = RealField(prec)
836841
x, e, b = self.unparsed_input_form().lstrip('float(').rstrip(')').split(',')

src/sage/interfaces/gap.py

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -191,26 +191,31 @@
191191
# https://www.gnu.org/licenses/
192192
# ****************************************************************************
193193

194-
from .expect import Expect, ExpectElement, FunctionElement, ExpectFunction
195-
from .gap_workspace import gap_workspace_file, prepare_workspace_dir
196-
from sage.cpython.string import bytes_to_str
197-
from sage.env import SAGE_EXTCODE, SAGE_GAP_COMMAND, SAGE_GAP_MEMORY, GAP_ROOT_PATHS
198-
from sage.misc.misc import is_in_string
199-
from sage.misc.cachefunc import cached_method
200-
from sage.misc.instancedoc import instancedoc
201-
from sage.interfaces.tab_completion import ExtraTabCompletion
202-
from sage.structure.element import ModuleElement
203-
204-
import sage.interfaces.abc
205-
206-
import re
207194
import os
208-
import pexpect
209-
import time
210195
import platform
196+
import re
211197
import string
198+
import time
212199
import warnings
213200

201+
import pexpect
202+
203+
import sage.interfaces.abc
204+
from sage.cpython.string import bytes_to_str
205+
from sage.env import GAP_ROOT_PATHS, SAGE_EXTCODE, SAGE_GAP_COMMAND, SAGE_GAP_MEMORY
206+
from sage.interfaces.expect import (
207+
Expect,
208+
ExpectElement,
209+
ExpectFunction,
210+
FunctionElement,
211+
)
212+
from sage.interfaces.gap_workspace import gap_workspace_file, prepare_workspace_dir
213+
from sage.interfaces.tab_completion import ExtraTabCompletion
214+
from sage.misc.cachefunc import cached_method
215+
from sage.misc.instancedoc import instancedoc
216+
from sage.misc.misc import is_in_string
217+
from sage.structure.element import ModuleElement
218+
214219
WORKSPACE = gap_workspace_file()
215220

216221
first_try = True
@@ -893,10 +898,9 @@ def function_call(self, function, args=None, kwds=None):
893898
res = self.eval(cmd)
894899
if self.eval(self._identical_function + '(last,__SAGE_LAST__)') != 'true':
895900
return self.new('last2;')
896-
else:
897-
if res.strip():
898-
from sage.interfaces.interface import AsciiArtString
899-
return AsciiArtString(res)
901+
elif res.strip():
902+
from sage.interfaces.interface import AsciiArtString
903+
return AsciiArtString(res)
900904

901905
def get_record_element(self, record, name):
902906
r"""
@@ -1072,6 +1076,7 @@ def __init__(self, max_workspace_size=None,
10721076
"""
10731077
EXAMPLES::
10741078
1079+
sage: from sage.interfaces.gap import gap
10751080
sage: gap == loads(dumps(gap))
10761081
True
10771082
"""

src/sage/interfaces/giac.py

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -237,17 +237,21 @@
237237

238238
import os
239239

240-
from sage.interfaces.expect import Expect, ExpectElement, ExpectFunction, FunctionElement, gc_disabled
241-
242240
import pexpect
243241

244242
from sage.cpython.string import bytes_to_str
245243
from sage.env import DOT_SAGE
246-
from sage.misc.pager import pager
244+
from sage.interfaces.expect import (
245+
Expect,
246+
ExpectElement,
247+
ExpectFunction,
248+
FunctionElement,
249+
gc_disabled,
250+
)
247251
from sage.misc.instancedoc import instancedoc
252+
from sage.misc.pager import pager
248253
from sage.structure.richcmp import rich_to_bool
249254

250-
251255
COMMANDS_CACHE = '%s/giac_commandlist_cache.sobj' % DOT_SAGE
252256

253257

@@ -326,6 +330,7 @@ def __init__(self, maxread=None, script_subdirectory=None, server=None, server_t
326330
327331
EXAMPLES::
328332
333+
sage: from sage.interfaces.giac import giac
329334
sage: giac == loads(dumps(giac))
330335
True
331336
"""
@@ -1115,8 +1120,11 @@ def _sage_(self, locals=None):
11151120
sage: giac(e * i * pi).sage().variables()
11161121
()
11171122
"""
1123+
from sage.calculus.calculus import (
1124+
SR_parser_giac,
1125+
symbolic_expression_from_string,
1126+
)
11181127
from sage.symbolic.expression import symbol_table
1119-
from sage.calculus.calculus import symbolic_expression_from_string, SR_parser_giac
11201128

11211129
if locals is None:
11221130
locals = {}

src/sage/interfaces/gp.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@
140140
import os
141141

142142
import sage.interfaces.abc
143-
144143
from sage.env import DOT_SAGE
145144
from sage.interfaces.tab_completion import ExtraTabCompletion
146145
from sage.libs.pari import pari
@@ -210,6 +209,7 @@ def __init__(self, stacksize=10000000, # 10MB
210209
211210
EXAMPLES::
212211
212+
sage: from sage.interfaces.gp import gp
213213
sage: gp == loads(dumps(gp))
214214
True
215215
"""

src/sage/interfaces/lie.py

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -285,17 +285,21 @@
285285
# https://www.gnu.org/licenses/
286286
#
287287
##########################################################################
288-
from itertools import chain
289288
import os
289+
from itertools import chain
290290

291-
from .expect import Expect, ExpectElement, ExpectFunction, FunctionElement
292-
from sage.interfaces.interface import AsciiArtString
293-
from sage.misc.misc_c import prod
294291
from sage.env import DOT_SAGE, LIE_INFO_DIR
295-
from sage.misc.sage_eval import sage_eval
292+
from sage.interfaces.expect import (
293+
Expect,
294+
ExpectElement,
295+
ExpectFunction,
296+
FunctionElement,
297+
)
298+
from sage.interfaces.interface import AsciiArtString
296299
from sage.interfaces.tab_completion import ExtraTabCompletion
297300
from sage.misc.instancedoc import instancedoc
298-
301+
from sage.misc.misc_c import prod
302+
from sage.misc.sage_eval import sage_eval
299303

300304
COMMANDS_CACHE = '%s/lie_commandlist_cache.sobj' % DOT_SAGE
301305
HELP_CACHE = '%s/lie_helpdict_cache.sobj' % DOT_SAGE
@@ -319,6 +323,7 @@ def __init__(self,
319323
"""
320324
EXAMPLES::
321325
326+
sage: from sage.interfaces.lie import lie
322327
sage: lie == loads(dumps(lie))
323328
True
324329
"""

src/sage/interfaces/lisp.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,15 @@
5353
import os
5454
import random
5555

56-
from .expect import Expect, ExpectElement, ExpectFunction, FunctionElement, gc_disabled
57-
from sage.structure.element import RingElement, parent
56+
from sage.interfaces.expect import (
57+
Expect,
58+
ExpectElement,
59+
ExpectFunction,
60+
FunctionElement,
61+
gc_disabled,
62+
)
5863
from sage.misc.instancedoc import instancedoc
64+
from sage.structure.element import RingElement, parent
5965
from sage.structure.richcmp import rich_to_bool
6066

6167

@@ -68,6 +74,7 @@ def __init__(self,
6874
"""
6975
EXAMPLES::
7076
77+
sage: from sage.interfaces.lisp import lisp
7178
sage: lisp == loads(dumps(lisp))
7279
True
7380
"""

src/sage/interfaces/macaulay2.py

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -126,14 +126,17 @@
126126
import re
127127

128128
import sage.interfaces.abc
129-
130-
from sage.interfaces.expect import (Expect, ExpectElement, ExpectFunction,
131-
FunctionElement)
129+
from sage.interfaces.expect import (
130+
Expect,
131+
ExpectElement,
132+
ExpectFunction,
133+
FunctionElement,
134+
)
132135
from sage.interfaces.interface import AsciiArtString
133-
from sage.misc.multireplace import multiple_replace
134-
from sage.misc.superseded import deprecated_function_alias
135136
from sage.interfaces.tab_completion import ExtraTabCompletion
136137
from sage.misc.instancedoc import instancedoc
138+
from sage.misc.multireplace import multiple_replace
139+
from sage.misc.superseded import deprecated_function_alias
137140
from sage.structure.global_options import GlobalOptions
138141

139142

@@ -202,6 +205,7 @@ def __init__(self, maxread=None, script_subdirectory=None,
202205
203206
TESTS::
204207
208+
sage: from sage.interfaces.macaulay2 import macaulay2
205209
sage: macaulay2 == loads(dumps(macaulay2))
206210
True
207211
"""
@@ -1590,8 +1594,8 @@ def _sage_(self):
15901594
# Handle the ZZ/n case
15911595
ambient = self.ambient()
15921596
if ambient.external_string() == 'ZZ':
1593-
from sage.rings.integer_ring import ZZ
15941597
from sage.rings.finite_rings.finite_field_constructor import GF
1598+
from sage.rings.integer_ring import ZZ
15951599
external_string = self.external_string()
15961600
zz, n = external_string.split("/")
15971601

@@ -1603,7 +1607,9 @@ def _sage_(self):
16031607
ideal = self.ideal()._sage_()
16041608
return ambient_ring.quotient(ideal, names=ambient_ring.variable_names())
16051609
elif cls_str == "PolynomialRing":
1606-
from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
1610+
from sage.rings.polynomial.polynomial_ring_constructor import (
1611+
PolynomialRing,
1612+
)
16071613
from sage.rings.polynomial.term_order import inv_macaulay2_name_mapping
16081614

16091615
# Get the base ring
@@ -1629,8 +1635,8 @@ def _sage_(self):
16291635

16301636
return PolynomialRing(base_ring, order=order, names=gens)
16311637
elif cls_str == "GaloisField":
1632-
from sage.rings.integer_ring import ZZ
16331638
from sage.rings.finite_rings.finite_field_constructor import GF
1639+
from sage.rings.integer_ring import ZZ
16341640
gf, n = repr_str.split(" ")
16351641
n = ZZ(n)
16361642
if n.is_prime():

src/sage/interfaces/maple.py

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -237,17 +237,21 @@
237237

238238
import os
239239

240-
from .expect import Expect, ExpectElement, ExpectFunction, FunctionElement, gc_disabled
241-
242240
import pexpect
243241

242+
from sage.cpython.string import bytes_to_str
244243
from sage.env import DOT_SAGE
245-
from sage.misc.pager import pager
244+
from sage.interfaces.expect import (
245+
Expect,
246+
ExpectElement,
247+
ExpectFunction,
248+
FunctionElement,
249+
gc_disabled,
250+
)
246251
from sage.interfaces.tab_completion import ExtraTabCompletion
247252
from sage.misc.instancedoc import instancedoc
253+
from sage.misc.pager import pager
248254
from sage.structure.richcmp import rich_to_bool
249-
from sage.cpython.string import bytes_to_str
250-
251255

252256
COMMANDS_CACHE = '%s/maple_commandlist_cache.sobj' % DOT_SAGE
253257

@@ -270,6 +274,7 @@ def __init__(self, maxread=None, script_subdirectory=None, server=None,
270274
271275
EXAMPLES::
272276
277+
sage: from sage.interfaces.maple import maple
273278
sage: maple == loads(dumps(maple))
274279
True
275280
"""

src/sage/interfaces/maxima.py

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -494,19 +494,20 @@
494494

495495
import os
496496
import re
497-
import pexpect
498497
import shlex
499-
500498
from random import randrange
501499

502-
from sage.env import MAXIMA
503-
504-
from .expect import (Expect, ExpectElement, gc_disabled)
500+
import pexpect
505501

506-
from .maxima_abstract import (MaximaAbstract, MaximaAbstractFunction,
507-
MaximaAbstractElement,
508-
MaximaAbstractFunctionElement,
509-
MaximaAbstractElementFunction)
502+
from sage.env import MAXIMA
503+
from sage.interfaces.expect import Expect, ExpectElement, gc_disabled
504+
from sage.interfaces.maxima_abstract import (
505+
MaximaAbstract,
506+
MaximaAbstractElement,
507+
MaximaAbstractElementFunction,
508+
MaximaAbstractFunction,
509+
MaximaAbstractFunctionElement,
510+
)
510511
from sage.misc.instancedoc import instancedoc
511512

512513

@@ -529,6 +530,7 @@ def __init__(self, script_subdirectory=None, logfile=None, server=None,
529530
530531
TESTS::
531532
533+
sage:: from sage.interfaces.maxima import Maxima, maxima
532534
sage: Maxima == loads(dumps(Maxima))
533535
True
534536
sage: maxima == loads(dumps(maxima))

src/sage/interfaces/octave.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,12 +145,14 @@
145145
# ****************************************************************************
146146

147147
import os
148-
from .expect import Expect, ExpectElement
148+
149149
import pexpect
150-
from sage.misc.verbose import verbose
150+
151+
from sage.cpython.string import bytes_to_str
152+
from sage.interfaces.expect import Expect, ExpectElement
151153
from sage.misc.instancedoc import instancedoc
152154
from sage.misc.temporary_file import tmp_filename
153-
from sage.cpython.string import bytes_to_str
155+
from sage.misc.verbose import verbose
154156

155157

156158
class Octave(Expect):
@@ -186,6 +188,7 @@ def __init__(self, maxread=None, script_subdirectory=None, logfile=None,
186188
"""
187189
EXAMPLES::
188190
191+
sage: from sage.interfaces.octave import octave
189192
sage: octave == loads(dumps(octave))
190193
True
191194
"""

0 commit comments

Comments
 (0)