Skip to content

Commit

Permalink
Trac #20979: py3 import in interfaces folder (futurize)
Browse files Browse the repository at this point in the history
another step to py3

done using
{{{
futurize -w -f absolute_import src/sage/interfaces/
}}}

URL: https://trac.sagemath.org/20979
Reported by: chapoton
Ticket author(s): Frédéric Chapoton
Reviewer(s): Jori Mäntysalo
  • Loading branch information
Release Manager authored and vbraun committed Jul 9, 2016
2 parents e4b2060 + 312dc1e commit 98a318e
Show file tree
Hide file tree
Showing 26 changed files with 54 additions and 28 deletions.
3 changes: 2 additions & 1 deletion src/sage/interfaces/axiom.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions src/sage/interfaces/expect.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion src/sage/interfaces/fricas.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
3 changes: 2 additions & 1 deletion src/sage/interfaces/gap.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion src/sage/interfaces/gp.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion src/sage/interfaces/kash.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
3 changes: 2 additions & 1 deletion src/sage/interfaces/lie.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion src/sage/interfaces/lisp.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
-- William Stein (first version)
-- William Stein (2007-06-20): significant improvements.
"""
from __future__ import absolute_import

##########################################################################
#
Expand All @@ -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):
Expand Down
3 changes: 2 additions & 1 deletion src/sage/interfaces/magma.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion src/sage/interfaces/maple.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion src/sage/interfaces/matlab.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions src/sage/interfaces/maxima.py
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,7 @@
# http://www.gnu.org/licenses/
#*****************************************************************************
from __future__ import print_function
from __future__ import absolute_import

import os
import re
Expand All @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion src/sage/interfaces/maxima_abstract.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
# http://www.gnu.org/licenses/
#*****************************************************************************
from __future__ import print_function
from __future__ import absolute_import

import os
import re
Expand All @@ -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

Expand Down
3 changes: 2 additions & 1 deletion src/sage/interfaces/maxima_lib.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
3 changes: 2 additions & 1 deletion src/sage/interfaces/mupad.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion src/sage/interfaces/mwrank.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
3 changes: 2 additions & 1 deletion src/sage/interfaces/octave.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
3 changes: 2 additions & 1 deletion src/sage/interfaces/psage.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion src/sage/interfaces/qepcad.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"""
Expand Down
3 changes: 2 additions & 1 deletion src/sage/interfaces/qsieve.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
Interface to Bill Hart's Quadratic Sieve
"""
from __future__ import print_function
from __future__ import absolute_import

import os

Expand Down Expand Up @@ -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.
Expand Down
3 changes: 2 additions & 1 deletion src/sage/interfaces/r.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion src/sage/interfaces/rubik.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion src/sage/interfaces/sage0.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 <wstein@gmail.com>
Expand All @@ -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
Expand Down
3 changes: 2 additions & 1 deletion src/sage/interfaces/scilab.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
3 changes: 2 additions & 1 deletion src/sage/interfaces/singular.py
Original file line number Diff line number Diff line change
Expand Up @@ -316,14 +316,15 @@
# http://www.gnu.org/licenses/
#*****************************************************************************
from __future__ import print_function
from __future__ import absolute_import

import os
import re
import sys
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
Expand Down
3 changes: 2 additions & 1 deletion src/sage/interfaces/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 98a318e

Please sign in to comment.