diff --git a/src/sage/interfaces/axiom.py b/src/sage/interfaces/axiom.py index 0dffe1d928a..32012f7661b 100644 --- a/src/sage/interfaces/axiom.py +++ b/src/sage/interfaces/axiom.py @@ -176,11 +176,12 @@ # http://www.gnu.org/licenses/ ########################################################################### from __future__ import print_function +from __future__ import absolute_import import os import re -from expect import Expect, ExpectElement, FunctionElement, ExpectFunction +from .expect import Expect, ExpectElement, FunctionElement, ExpectFunction from sage.misc.all import verbose from sage.env import DOT_SAGE from pexpect import EOF diff --git a/src/sage/interfaces/expect.py b/src/sage/interfaces/expect.py index 2067843bd05..8149e1ee097 100644 --- a/src/sage/interfaces/expect.py +++ b/src/sage/interfaces/expect.py @@ -39,14 +39,15 @@ # http://www.gnu.org/licenses/ #***************************************************************************** from __future__ import print_function +from __future__ import absolute_import import os import sys import weakref import time import gc -import quit -import cleaner +from . import quit +from . import cleaner import six from random import randrange diff --git a/src/sage/interfaces/fricas.py b/src/sage/interfaces/fricas.py index 726d7432804..ba690652b76 100644 --- a/src/sage/interfaces/fricas.py +++ b/src/sage/interfaces/fricas.py @@ -153,8 +153,9 @@ # http://www.gnu.org/licenses/ ########################################################################### from __future__ import print_function +from __future__ import absolute_import -from axiom import PanAxiom, PanAxiomElement, PanAxiomFunctionElement, PanAxiomExpectFunction +from .axiom import PanAxiom, PanAxiomElement, PanAxiomFunctionElement, PanAxiomExpectFunction class FriCAS(PanAxiom): diff --git a/src/sage/interfaces/gap.py b/src/sage/interfaces/gap.py index 6aa65fe6bb6..8b96ae0b24d 100644 --- a/src/sage/interfaces/gap.py +++ b/src/sage/interfaces/gap.py @@ -175,8 +175,9 @@ # http://www.gnu.org/licenses/ #***************************************************************************** from __future__ import print_function +from __future__ import absolute_import -from expect import Expect, ExpectElement, FunctionElement, ExpectFunction +from .expect import Expect, ExpectElement, FunctionElement, ExpectFunction from sage.env import SAGE_LOCAL, SAGE_EXTCODE, DOT_SAGE from sage.misc.misc import is_in_string from sage.misc.superseded import deprecation diff --git a/src/sage/interfaces/gp.py b/src/sage/interfaces/gp.py index 2d0e4c10f17..511ab1370d7 100644 --- a/src/sage/interfaces/gp.py +++ b/src/sage/interfaces/gp.py @@ -139,8 +139,9 @@ # ########################################################################## from __future__ import print_function +from __future__ import absolute_import -from expect import Expect, ExpectElement, ExpectFunction, FunctionElement +from .expect import Expect, ExpectElement, ExpectFunction, FunctionElement from sage.misc.misc import verbose from sage.interfaces.tab_completion import ExtraTabCompletion from sage.libs.pari.all import pari diff --git a/src/sage/interfaces/kash.py b/src/sage/interfaces/kash.py index 127f20d051d..80efd6a6516 100644 --- a/src/sage/interfaces/kash.py +++ b/src/sage/interfaces/kash.py @@ -430,8 +430,9 @@ # http://www.gnu.org/licenses/ #***************************************************************************** from __future__ import print_function +from __future__ import absolute_import -from expect import Expect, ExpectElement +from .expect import Expect, ExpectElement import os class Kash(Expect): diff --git a/src/sage/interfaces/lie.py b/src/sage/interfaces/lie.py index 47f8e56a4f2..6d8309cb316 100644 --- a/src/sage/interfaces/lie.py +++ b/src/sage/interfaces/lie.py @@ -286,8 +286,9 @@ # ########################################################################## from __future__ import print_function +from __future__ import absolute_import -from expect import Expect, ExpectElement, ExpectFunction, FunctionElement, AsciiArtString +from .expect import Expect, ExpectElement, ExpectFunction, FunctionElement, AsciiArtString from sage.misc.all import prod from sage.env import DOT_SAGE, SAGE_LOCAL from sage.interfaces.tab_completion import ExtraTabCompletion diff --git a/src/sage/interfaces/lisp.py b/src/sage/interfaces/lisp.py index 9e2b139a2e2..c40efacccd8 100644 --- a/src/sage/interfaces/lisp.py +++ b/src/sage/interfaces/lisp.py @@ -40,6 +40,7 @@ -- William Stein (first version) -- William Stein (2007-06-20): significant improvements. """ +from __future__ import absolute_import ########################################################################## # @@ -53,7 +54,7 @@ import random -from expect import Expect, ExpectElement, ExpectFunction, FunctionElement, gc_disabled +from .expect import Expect, ExpectElement, ExpectFunction, FunctionElement, gc_disabled from sage.structure.element import RingElement, parent class Lisp(Expect): diff --git a/src/sage/interfaces/magma.py b/src/sage/interfaces/magma.py index 410fe14873a..3ba63b5a619 100644 --- a/src/sage/interfaces/magma.py +++ b/src/sage/interfaces/magma.py @@ -212,12 +212,13 @@ # http://www.gnu.org/licenses/ #***************************************************************************** from __future__ import print_function +from __future__ import absolute_import import re import sys from sage.structure.parent import Parent -from expect import console, Expect, ExpectElement, ExpectFunction, FunctionElement +from .expect import console, Expect, ExpectElement, ExpectFunction, FunctionElement PROMPT = ">>>" SAGE_REF = "_sage_ref" diff --git a/src/sage/interfaces/maple.py b/src/sage/interfaces/maple.py index 2e162739f72..e669bc78494 100644 --- a/src/sage/interfaces/maple.py +++ b/src/sage/interfaces/maple.py @@ -235,10 +235,11 @@ # http://www.gnu.org/licenses/ ############################################################################# from __future__ import print_function +from __future__ import absolute_import import os -from expect import Expect, ExpectElement, ExpectFunction, FunctionElement, gc_disabled +from .expect import Expect, ExpectElement, ExpectFunction, FunctionElement, gc_disabled import pexpect diff --git a/src/sage/interfaces/matlab.py b/src/sage/interfaces/matlab.py index a0242e1749c..39d6219989d 100644 --- a/src/sage/interfaces/matlab.py +++ b/src/sage/interfaces/matlab.py @@ -147,10 +147,11 @@ # http://www.gnu.org/licenses/ ############################################################################## from __future__ import print_function +from __future__ import absolute_import import os -from expect import Expect, ExpectElement +from .expect import Expect, ExpectElement #import sage.matrix.matrix_space diff --git a/src/sage/interfaces/maxima.py b/src/sage/interfaces/maxima.py index d4804f676a7..cda8532b7b0 100644 --- a/src/sage/interfaces/maxima.py +++ b/src/sage/interfaces/maxima.py @@ -464,6 +464,7 @@ # http://www.gnu.org/licenses/ #***************************************************************************** from __future__ import print_function +from __future__ import absolute_import import os import re @@ -476,10 +477,10 @@ ##import sage.rings.all -from expect import (Expect, ExpectElement, FunctionElement, +from .expect import (Expect, ExpectElement, FunctionElement, ExpectFunction, gc_disabled) -from maxima_abstract import (MaximaAbstract, MaximaAbstractFunction, +from .maxima_abstract import (MaximaAbstract, MaximaAbstractFunction, MaximaAbstractElement, MaximaAbstractFunctionElement, MaximaAbstractElementFunction) diff --git a/src/sage/interfaces/maxima_abstract.py b/src/sage/interfaces/maxima_abstract.py index 34c660630c4..6ff638aa610 100644 --- a/src/sage/interfaces/maxima_abstract.py +++ b/src/sage/interfaces/maxima_abstract.py @@ -49,6 +49,7 @@ # http://www.gnu.org/licenses/ #***************************************************************************** from __future__ import print_function +from __future__ import absolute_import import os import re @@ -64,7 +65,7 @@ ##import sage.rings.all -from interface import (Interface, InterfaceElement, InterfaceFunctionElement, +from .interface import (Interface, InterfaceElement, InterfaceFunctionElement, InterfaceFunction, AsciiArtString) from sage.interfaces.tab_completion import ExtraTabCompletion diff --git a/src/sage/interfaces/maxima_lib.py b/src/sage/interfaces/maxima_lib.py index 87596dca473..a2fb5f5f939 100644 --- a/src/sage/interfaces/maxima_lib.py +++ b/src/sage/interfaces/maxima_lib.py @@ -85,12 +85,13 @@ # http://www.gnu.org/licenses/ #***************************************************************************** from __future__ import print_function +from __future__ import absolute_import from sage.symbolic.ring import SR from sage.libs.ecl import EclObject, ecl_eval -from maxima_abstract import (MaximaAbstract, MaximaAbstractFunction, +from .maxima_abstract import (MaximaAbstract, MaximaAbstractFunction, MaximaAbstractElement, MaximaAbstractFunctionElement, MaximaAbstractElementFunction) diff --git a/src/sage/interfaces/mupad.py b/src/sage/interfaces/mupad.py index 3e10d63b889..f738524e789 100644 --- a/src/sage/interfaces/mupad.py +++ b/src/sage/interfaces/mupad.py @@ -90,10 +90,11 @@ # http://www.gnu.org/licenses/ ############################################################################# from __future__ import print_function +from __future__ import absolute_import import os -from expect import (Expect, ExpectElement, ExpectFunction, +from .expect import (Expect, ExpectElement, ExpectFunction, FunctionElement, AsciiArtString) from sage.interfaces.tab_completion import ExtraTabCompletion diff --git a/src/sage/interfaces/mwrank.py b/src/sage/interfaces/mwrank.py index 369ab4f1e5e..9d9bd6cbcaa 100644 --- a/src/sage/interfaces/mwrank.py +++ b/src/sage/interfaces/mwrank.py @@ -17,10 +17,11 @@ # http://www.gnu.org/licenses/ #***************************************************************************** from __future__ import print_function +from __future__ import absolute_import import os import weakref -from expect import Expect +from .expect import Expect instances={} def Mwrank(options="", server=None, server_tmpdir=None): diff --git a/src/sage/interfaces/octave.py b/src/sage/interfaces/octave.py index 3fac4c9c50a..cfbbceba3bc 100644 --- a/src/sage/interfaces/octave.py +++ b/src/sage/interfaces/octave.py @@ -151,9 +151,10 @@ # http://www.gnu.org/licenses/ #***************************************************************************** from __future__ import print_function +from __future__ import absolute_import import os -from expect import Expect, ExpectElement +from .expect import Expect, ExpectElement class Octave(Expect): diff --git a/src/sage/interfaces/psage.py b/src/sage/interfaces/psage.py index ff8b1501456..e567996fae7 100644 --- a/src/sage/interfaces/psage.py +++ b/src/sage/interfaces/psage.py @@ -40,11 +40,12 @@ 9623 * 68492481833 * 23579543011798993222850893929565870383844167873851502677311057483194673] """ from __future__ import print_function +from __future__ import absolute_import import os import time -from sage0 import Sage, SageElement +from .sage0 import Sage, SageElement from pexpect import ExceptionPexpect number = 0 diff --git a/src/sage/interfaces/qepcad.py b/src/sage/interfaces/qepcad.py index 06ca3b8cfb2..9ca8855acee 100644 --- a/src/sage/interfaces/qepcad.py +++ b/src/sage/interfaces/qepcad.py @@ -604,6 +604,7 @@ # http://www.gnu.org/licenses/ #***************************************************************************** from __future__ import print_function +from __future__ import absolute_import from sage.env import SAGE_LOCAL import pexpect @@ -615,7 +616,7 @@ from sage.repl.preparse import implicit_mul from sage.interfaces.tab_completion import ExtraTabCompletion -from expect import Expect, ExpectFunction, AsciiArtString +from .expect import Expect, ExpectFunction, AsciiArtString def _qepcad_atoms(formula): r""" diff --git a/src/sage/interfaces/qsieve.py b/src/sage/interfaces/qsieve.py index 9bfffe85fdc..c99249d2656 100644 --- a/src/sage/interfaces/qsieve.py +++ b/src/sage/interfaces/qsieve.py @@ -2,6 +2,7 @@ Interface to Bill Hart's Quadratic Sieve """ from __future__ import print_function +from __future__ import absolute_import import os @@ -132,7 +133,7 @@ def data_to_list(out, n, time): from sage.interfaces.sagespawn import SageSpawn import pexpect -import cleaner +from . import cleaner class qsieve_nonblock: """ A non-blocking version of Hart's quadratic sieve. diff --git a/src/sage/interfaces/r.py b/src/sage/interfaces/r.py index b9561102dfc..f8eda3b8d46 100644 --- a/src/sage/interfaces/r.py +++ b/src/sage/interfaces/r.py @@ -264,8 +264,9 @@ # ########################################################################## from __future__ import print_function +from __future__ import absolute_import -from expect import Expect, ExpectElement, ExpectFunction, FunctionElement +from .expect import Expect, ExpectElement, ExpectFunction, FunctionElement from sage.env import DOT_SAGE import re import six diff --git a/src/sage/interfaces/rubik.py b/src/sage/interfaces/rubik.py index b5f3583c20a..6dfe986be11 100644 --- a/src/sage/interfaces/rubik.py +++ b/src/sage/interfaces/rubik.py @@ -33,10 +33,11 @@ # http://www.gnu.org/licenses/ ######################################################################## from __future__ import print_function +from __future__ import absolute_import import pexpect import time -import cleaner +from . import cleaner from sage.groups.perm_gps.cubegroup import index2singmaster diff --git a/src/sage/interfaces/sage0.py b/src/sage/interfaces/sage0.py index 3270dffd057..87bfc0bd649 100644 --- a/src/sage/interfaces/sage0.py +++ b/src/sage/interfaces/sage0.py @@ -4,6 +4,7 @@ This is an expect interface to *another* copy of the Sage interpreter. """ +from __future__ import absolute_import #***************************************************************************** # Copyright (C) 2005 William Stein @@ -18,7 +19,7 @@ import cPickle import os -from expect import Expect, ExpectElement, FunctionElement +from .expect import Expect, ExpectElement, FunctionElement import sage.repl.preparse from sage.interfaces.tab_completion import ExtraTabCompletion diff --git a/src/sage/interfaces/scilab.py b/src/sage/interfaces/scilab.py index 5dc183fb24a..f746132cbac 100644 --- a/src/sage/interfaces/scilab.py +++ b/src/sage/interfaces/scilab.py @@ -187,10 +187,11 @@ # http://www.gnu.org/licenses/ ############################################################################## from __future__ import print_function +from __future__ import absolute_import import os -from expect import Expect, ExpectElement +from .expect import Expect, ExpectElement class Scilab(Expect): diff --git a/src/sage/interfaces/singular.py b/src/sage/interfaces/singular.py index 87abf5a1a83..a9fac740c30 100644 --- a/src/sage/interfaces/singular.py +++ b/src/sage/interfaces/singular.py @@ -316,6 +316,7 @@ # http://www.gnu.org/licenses/ #***************************************************************************** from __future__ import print_function +from __future__ import absolute_import import os import re @@ -323,7 +324,7 @@ import pexpect from time import sleep -from expect import Expect, ExpectElement, FunctionElement, ExpectFunction +from .expect import Expect, ExpectElement, FunctionElement, ExpectFunction from sage.interfaces.tab_completion import ExtraTabCompletion from sage.structure.sequence import Sequence diff --git a/src/sage/interfaces/tests.py b/src/sage/interfaces/tests.py index 4e97a30d42e..e41f15c1bce 100644 --- a/src/sage/interfaces/tests.py +++ b/src/sage/interfaces/tests.py @@ -43,8 +43,9 @@ 0 """ from __future__ import print_function +from __future__ import absolute_import -from all import * +from .all import * from sage.misc.misc import cputime, walltime import sys