Skip to content

Commit

Permalink
Trac #21010: py3 imports in calculus, game_theory, stats, sandpiles f…
Browse files Browse the repository at this point in the history
…olders (futurize)

another step to py3

done using
{{{
futurize -w -f absolute_import src/sage/stats/
futurize -w -f absolute_import src/sage/sandpiles/
futurize -w -f absolute_import src/sage/game_theory/
futurize -w -f absolute_import src/sage/calculus/
}}}

URL: https://trac.sagemath.org/21010
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 13, 2016
2 parents 7cabd66 + beebfec commit 3af97c2
Show file tree
Hide file tree
Showing 12 changed files with 30 additions and 17 deletions.
3 changes: 2 additions & 1 deletion src/sage/calculus/functional.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,9 @@
sage: inverse_laplace( e^a/(a-1), x, a)
ilt(e^a/(a - 1), x, a)
"""
from __future__ import absolute_import

from calculus import SR
from .calculus import SR
from sage.symbolic.expression import Expression

def simplify(f):
Expand Down
3 changes: 2 additions & 1 deletion src/sage/calculus/functions.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
r"""
Calculus functions.
"""
from __future__ import absolute_import
from sage.matrix.all import matrix
from sage.matrix.matrix import is_Matrix
from sage.structure.element import is_Vector
from sage.symbolic.ring import is_SymbolicVariable
from functional import diff
from .functional import diff


def wronskian(*args):
Expand Down
3 changes: 2 additions & 1 deletion src/sage/game_theory/catalog.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
r"""
Catalog Of Games
"""
from __future__ import absolute_import

import catalog_normal_form_games as normal_form_games
from . import catalog_normal_form_games as normal_form_games
3 changes: 2 additions & 1 deletion src/sage/game_theory/normal_form_game.py
Original file line number Diff line number Diff line change
Expand Up @@ -603,10 +603,11 @@
# http://www.gnu.org/licenses/
#*****************************************************************************
from __future__ import print_function
from __future__ import absolute_import

from collections import MutableMapping
from itertools import product
from parser import Parser
from .parser import Parser
from sage.misc.latex import latex
from sage.misc.misc import powerset
from sage.rings.all import QQ
Expand Down
3 changes: 2 additions & 1 deletion src/sage/sandpiles/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
import all
from __future__ import absolute_import
from . import all
3 changes: 2 additions & 1 deletion src/sage/sandpiles/all.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from __future__ import absolute_import
from sage.misc.lazy_import import lazy_import

from sandpile import Sandpile, SandpileDivisor, SandpileConfig, firing_graph, parallel_firing_graph, wilmes_algorithm, random_tree, random_digraph, random_DAG, triangle_sandpile
from .sandpile import Sandpile, SandpileDivisor, SandpileConfig, firing_graph, parallel_firing_graph, wilmes_algorithm, random_tree, random_digraph, random_DAG, triangle_sandpile

lazy_import('sage.sandpiles.examples', 'sandpiles')

Expand Down
3 changes: 2 additions & 1 deletion src/sage/stats/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
import all
from __future__ import absolute_import
from . import all
12 changes: 7 additions & 5 deletions src/sage/stats/all.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
from r import (ttest)
from basic_stats import (mean, mode, std, variance, median, moving_average)
from __future__ import absolute_import

import hmm.all as hmm
from .r import ttest
from .basic_stats import (mean, mode, std, variance, median, moving_average)
from .hmm import all as hmm

# We lazy_import the following modules since they import numpy which slows down sage startup
# We lazy_import the following modules since they import numpy which
# slows down sage startup
from sage.misc.lazy_import import lazy_import
lazy_import("sage.finance.time_series", ["TimeSeries"])
lazy_import("sage.stats.intlist",["IntList"])
lazy_import("sage.stats.intlist", ["IntList"])
5 changes: 3 additions & 2 deletions src/sage/stats/distributions/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
import discrete_gaussian_integer
import discrete_gaussian_polynomial
from __future__ import absolute_import
from . import discrete_gaussian_integer
from . import discrete_gaussian_polynomial
3 changes: 2 additions & 1 deletion src/sage/stats/distributions/discrete_gaussian_lattice.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
((3, 0, -5, 0, -1, -3, 3, 3, -7, 2), (4, 0, 1, -2, -4, -4, 4, 0, 1, -4), (-3, 0, 4, 5, 0, 1, 3, 2, 0, -1))
"""
from __future__ import absolute_import
#******************************************************************************
#
# DGS - Discrete Gaussian Samplers
Expand Down Expand Up @@ -57,7 +58,7 @@
from sage.functions.log import exp
from sage.functions.other import ceil
from sage.rings.all import RealField, RR, ZZ, QQ
from discrete_gaussian_integer import DiscreteGaussianDistributionIntegerSampler
from .discrete_gaussian_integer import DiscreteGaussianDistributionIntegerSampler
from sage.structure.sage_object import SageObject
from sage.matrix.constructor import matrix, identity_matrix
from sage.modules.free_module import FreeModule
Expand Down
3 changes: 2 additions & 1 deletion src/sage/stats/distributions/discrete_gaussian_polynomial.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
(23.83..., 24.0...)
"""
from __future__ import absolute_import
#******************************************************************************
#
# DGS - Discrete Gaussian Samplers
Expand Down Expand Up @@ -54,7 +55,7 @@
#*****************************************************************************/

from sage.rings.all import RealField, RR, ZZ
from discrete_gaussian_integer import DiscreteGaussianDistributionIntegerSampler
from .discrete_gaussian_integer import DiscreteGaussianDistributionIntegerSampler
from sage.structure.sage_object import SageObject

class DiscreteGaussianDistributionPolynomialSampler(SageObject):
Expand Down
3 changes: 2 additions & 1 deletion src/sage/stats/hmm/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
import all
from __future__ import absolute_import
from . import all

0 comments on commit 3af97c2

Please sign in to comment.