diff --git a/psage/ellcurve/galrep/tests.py b/psage/ellcurve/galrep/tests.py index f88821e2..36ab42b0 100644 --- a/psage/ellcurve/galrep/tests.py +++ b/psage/ellcurve/galrep/tests.py @@ -1,5 +1,5 @@ from __future__ import absolute_import -from builtins import range + def test_nonsurj(v=list(range(1,50))): """ For each non CM curve of conductor in the list v, compute the diff --git a/psage/ellcurve/lseries/lseries_nf.py b/psage/ellcurve/lseries/lseries_nf.py index 5c3d538e..1f2dd7e4 100644 --- a/psage/ellcurve/lseries/lseries_nf.py +++ b/psage/ellcurve/lseries/lseries_nf.py @@ -46,7 +46,7 @@ from __future__ import absolute_import from __future__ import division -from builtins import range + import math from sage.all import (PowerSeriesRing, Integer, factor, QQ, ZZ, diff --git a/psage/function_fields/category.py b/psage/function_fields/category.py index 818ae46c..cc6a7eed 100644 --- a/psage/function_fields/category.py +++ b/psage/function_fields/category.py @@ -23,7 +23,7 @@ """ -from builtins import object + from sage.categories.category import Category from sage.misc.cachefunc import cached_method from sage.categories.basic import Fields diff --git a/psage/function_fields/function_field.py b/psage/function_fields/function_field.py index d82ae4db..ca872b80 100644 --- a/psage/function_fields/function_field.py +++ b/psage/function_fields/function_field.py @@ -60,7 +60,7 @@ """ from __future__ import absolute_import, division -from builtins import range + from sage.structure.category_object import CategoryObject from sage.rings.ring import Field diff --git a/psage/lmfdb/collection.py b/psage/lmfdb/collection.py index 2a6d47f5..db7270db 100644 --- a/psage/lmfdb/collection.py +++ b/psage/lmfdb/collection.py @@ -26,7 +26,7 @@ """ from __future__ import print_function -from builtins import object + class Collection(object): def __init__(self, collection, db): self.collection = collection diff --git a/psage/lmfdb/converter.py b/psage/lmfdb/converter.py index a4a162c2..0ff433da 100644 --- a/psage/lmfdb/converter.py +++ b/psage/lmfdb/converter.py @@ -36,7 +36,7 @@ order to not tie the database too tightly to Sage. """ -from builtins import object + class DBConverter(object): def from_dirichlet_character(self, e): zeta_order = int(e.parent().base_ring().zeta_order()) diff --git a/psage/lmfdb/ellcurves/L0s.py b/psage/lmfdb/ellcurves/L0s.py index 332cb340..4c3b95f2 100644 --- a/psage/lmfdb/ellcurves/L0s.py +++ b/psage/lmfdb/ellcurves/L0s.py @@ -20,8 +20,8 @@ # ################################################################################# -from builtins import str -from builtins import range + + import sage.parallel.ncpus from psage.lmfdb.auth import userpass diff --git a/psage/lmfdb/ellcurves/ap.py b/psage/lmfdb/ellcurves/ap.py index 0fcca623..ed6729b7 100644 --- a/psage/lmfdb/ellcurves/ap.py +++ b/psage/lmfdb/ellcurves/ap.py @@ -20,8 +20,8 @@ # ################################################################################# -from builtins import str -from builtins import range + + import sage.parallel.ncpus from psage.lmfdb.auth import userpass diff --git a/psage/lmfdb/ellcurves/sqrt5/aplists.py b/psage/lmfdb/ellcurves/sqrt5/aplists.py index 08ef95a7..a5099762 100644 --- a/psage/lmfdb/ellcurves/sqrt5/aplists.py +++ b/psage/lmfdb/ellcurves/sqrt5/aplists.py @@ -20,7 +20,7 @@ # ################################################################################# -from builtins import range + def str_to_apdict(s, labels): return dict([(labels[a], int(b)) for a,b in enumerate(s.split()) if b != '?']) diff --git a/psage/lmfdb/ellcurves/sqrt5/util.py b/psage/lmfdb/ellcurves/sqrt5/util.py index d4ab7769..caf6cafd 100644 --- a/psage/lmfdb/ellcurves/sqrt5/util.py +++ b/psage/lmfdb/ellcurves/sqrt5/util.py @@ -20,7 +20,7 @@ # ################################################################################# -from builtins import str + def ellcurves_sqrt5(address='localhost:29000', username=None, password=None): from sage.databases.cremona import cremona_letter_code from psage.modform.hilbert.sqrt5.sqrt5 import F diff --git a/psage/lmfdb/ellcurves/two_selmer.py b/psage/lmfdb/ellcurves/two_selmer.py index f3a904cc..7a1b60ff 100644 --- a/psage/lmfdb/ellcurves/two_selmer.py +++ b/psage/lmfdb/ellcurves/two_selmer.py @@ -21,7 +21,7 @@ ################################################################################# -from builtins import range + from sage.all import mwrank_EllipticCurve from psage.lmfdb.auth import userpass diff --git a/psage/lmfdb/mfdb.py b/psage/lmfdb/mfdb.py index 9f77f1c2..2614d30b 100644 --- a/psage/lmfdb/mfdb.py +++ b/psage/lmfdb/mfdb.py @@ -37,7 +37,7 @@ from __future__ import print_function from __future__ import absolute_import -from builtins import object + class MFDB(object): def __init__(self, host='localhost', port=29000): # Open connection to the MongoDB diff --git a/psage/lmfdb/newforms.py b/psage/lmfdb/newforms.py index c01bb3d1..2cc6aed3 100644 --- a/psage/lmfdb/newforms.py +++ b/psage/lmfdb/newforms.py @@ -37,7 +37,7 @@ class is instantiated by the main MFDB database object. from __future__ import print_function from __future__ import absolute_import from .populate import Populate -from builtins import str + from .collection import Collection class NewformCollection(Collection): diff --git a/psage/lmfdb/objectdb.py b/psage/lmfdb/objectdb.py index f0c0fe25..f2ec90d4 100644 --- a/psage/lmfdb/objectdb.py +++ b/psage/lmfdb/objectdb.py @@ -29,7 +29,7 @@ MongoDB. """ -from builtins import object + class ObjectDB(object): def __init__(self, db): from gridfs import GridFS diff --git a/psage/lmfdb/populate.py b/psage/lmfdb/populate.py index 36493ed8..9aa15cf5 100644 --- a/psage/lmfdb/populate.py +++ b/psage/lmfdb/populate.py @@ -29,7 +29,7 @@ """ from __future__ import print_function -from builtins import object + class Populate(object): def __init__(self, collection): self.collection = collection diff --git a/psage/lmfdb/sqlite_keyval.py b/psage/lmfdb/sqlite_keyval.py index 71666de5..7ca2c006 100644 --- a/psage/lmfdb/sqlite_keyval.py +++ b/psage/lmfdb/sqlite_keyval.py @@ -26,9 +26,9 @@ """ from builtins import next -from builtins import str -from builtins import range -from builtins import object + + + import sqlite3 import zlib try: diff --git a/psage/lseries/eulerprod.py b/psage/lseries/eulerprod.py index e49e73eb..8f79762e 100644 --- a/psage/lseries/eulerprod.py +++ b/psage/lseries/eulerprod.py @@ -36,9 +36,9 @@ # ################################################################################# -from builtins import str -from builtins import range -from builtins import object + + + import copy import math import types diff --git a/psage/lseries/triple_prod/triple.py b/psage/lseries/triple_prod/triple.py index b4f07a99..19832caa 100644 --- a/psage/lseries/triple_prod/triple.py +++ b/psage/lseries/triple_prod/triple.py @@ -38,8 +38,8 @@ ################################################################################# -from builtins import range -from builtins import object + + from sage.all import ZZ, RDF, CDF R_cdf = CDF['x'] diff --git a/psage/matrix/tests.py b/psage/matrix/tests.py index e53e18a4..1bcd8f7e 100644 --- a/psage/matrix/tests.py +++ b/psage/matrix/tests.py @@ -20,7 +20,7 @@ # ################################################################################# -from builtins import range + from sage.rings.complex_mpc import MPComplexField from sage.all import ZZ, MatrixSpace,Matrix from .matrix_complex_dense import random_unitary_matrix diff --git a/psage/modform/arithgroup/mysubgroup.py b/psage/modform/arithgroup/mysubgroup.py index 80ac5ebe..011624b3 100644 --- a/psage/modform/arithgroup/mysubgroup.py +++ b/psage/modform/arithgroup/mysubgroup.py @@ -61,8 +61,8 @@ #from sage.all_cmdline import * # import sage library -from builtins import str -from builtins import range + + from sage.arith.all import xgcd,gcd,CRT_basis from sage.rings.all import Integer,CC,ZZ,QQ,RR,RealNumber,infinity,Rational,Infinity,RealField from sage.rings.real_mpfr import RealNumber as RealNumber_class diff --git a/psage/modform/arithgroup/plot_dom.py b/psage/modform/arithgroup/plot_dom.py index a52af373..b7b4effb 100644 --- a/psage/modform/arithgroup/plot_dom.py +++ b/psage/modform/arithgroup/plot_dom.py @@ -4,9 +4,9 @@ r""" from __future__ import print_function from __future__ import division -from builtins import str -from builtins import range -from builtins import object + + + import matplotlib import matplotlib.patches as patches import matplotlib.path as path diff --git a/psage/modform/fourier_expansion_framework/gradedexpansions/expansion_lazy_evaluation.py b/psage/modform/fourier_expansion_framework/gradedexpansions/expansion_lazy_evaluation.py index c804a4b2..2c357869 100644 --- a/psage/modform/fourier_expansion_framework/gradedexpansions/expansion_lazy_evaluation.py +++ b/psage/modform/fourier_expansion_framework/gradedexpansions/expansion_lazy_evaluation.py @@ -24,7 +24,7 @@ # #=============================================================================== -from builtins import object + from psage.modform.fourier_expansion_framework.monoidpowerseries.monoidpowerseries_lazyelement import EquivariantMonoidPowerSeries_lazy def LazyFourierExpansionEvaluation(parent, element, precision) : diff --git a/psage/modform/fourier_expansion_framework/gradedexpansions/expansion_module.py b/psage/modform/fourier_expansion_framework/gradedexpansions/expansion_module.py index 611caacd..218ece5c 100644 --- a/psage/modform/fourier_expansion_framework/gradedexpansions/expansion_module.py +++ b/psage/modform/fourier_expansion_framework/gradedexpansions/expansion_module.py @@ -24,9 +24,9 @@ # #=============================================================================== -from builtins import str -from builtins import range -from builtins import object + + + from psage.modform.fourier_expansion_framework.gradedexpansions.expansion_lazy_evaluation import LazyFourierExpansionEvaluation from psage.modform.fourier_expansion_framework.gradedexpansions.fourierexpansionwrapper import FourierExpansionWrapper from psage.modform.fourier_expansion_framework.monoidpowerseries.monoidpowerseries_ring import EquivariantMonoidPowerSeriesAmbient_abstract, MonoidPowerSeriesAmbient_abstract diff --git a/psage/modform/fourier_expansion_framework/gradedexpansions/fourierexpansionwrapper.py b/psage/modform/fourier_expansion_framework/gradedexpansions/fourierexpansionwrapper.py index dac8a221..d2c84215 100644 --- a/psage/modform/fourier_expansion_framework/gradedexpansions/fourierexpansionwrapper.py +++ b/psage/modform/fourier_expansion_framework/gradedexpansions/fourierexpansionwrapper.py @@ -24,7 +24,7 @@ # #=============================================================================== -from builtins import object + class FourierExpansionWrapper(object) : r""" Abstract class for elements, which do not represent Fourier diff --git a/psage/modform/fourier_expansion_framework/gradedexpansions/gradedexpansion_ambient.py b/psage/modform/fourier_expansion_framework/gradedexpansions/gradedexpansion_ambient.py index 5b9a9d8b..724e9fc8 100644 --- a/psage/modform/fourier_expansion_framework/gradedexpansions/gradedexpansion_ambient.py +++ b/psage/modform/fourier_expansion_framework/gradedexpansions/gradedexpansion_ambient.py @@ -24,8 +24,8 @@ # #=============================================================================== -from builtins import map -from builtins import object + + from psage.modform.fourier_expansion_framework.gradedexpansions.gradedexpansion_functor import \ GradedExpansionFunctor, GradedExpansionEvaluationHomomorphism from operator import xor diff --git a/psage/modform/fourier_expansion_framework/gradedexpansions/gradedexpansion_element.py b/psage/modform/fourier_expansion_framework/gradedexpansions/gradedexpansion_element.py index 25558cac..16120375 100644 --- a/psage/modform/fourier_expansion_framework/gradedexpansions/gradedexpansion_element.py +++ b/psage/modform/fourier_expansion_framework/gradedexpansions/gradedexpansion_element.py @@ -24,8 +24,8 @@ # #=============================================================================== -from builtins import map -from builtins import range + + from psage.modform.fourier_expansion_framework.gradedexpansions.fourierexpansionwrapper import FourierExpansionWrapper from itertools import groupby from sage.structure.element import AlgebraElement diff --git a/psage/modform/fourier_expansion_framework/gradedexpansions/gradedexpansion_functor.py b/psage/modform/fourier_expansion_framework/gradedexpansions/gradedexpansion_functor.py index 0d0c05d9..6dc81653 100644 --- a/psage/modform/fourier_expansion_framework/gradedexpansions/gradedexpansion_functor.py +++ b/psage/modform/fourier_expansion_framework/gradedexpansions/gradedexpansion_functor.py @@ -26,7 +26,7 @@ #=============================================================================== from builtins import next -from builtins import map + from itertools import groupby, dropwhile from sage.algebras.algebra import Algebra from sage.categories.morphism import Morphism diff --git a/psage/modform/fourier_expansion_framework/gradedexpansions/gradedexpansion_grading.py b/psage/modform/fourier_expansion_framework/gradedexpansions/gradedexpansion_grading.py index 65daad4e..5d53ff9c 100644 --- a/psage/modform/fourier_expansion_framework/gradedexpansions/gradedexpansion_grading.py +++ b/psage/modform/fourier_expansion_framework/gradedexpansions/gradedexpansion_grading.py @@ -24,9 +24,9 @@ # #=============================================================================== -from builtins import str -from builtins import map -from builtins import range + + + from operator import mul from operator import xor from sage.misc.latex import latex diff --git a/psage/modform/fourier_expansion_framework/gradedexpansions/gradedexpansion_module.py b/psage/modform/fourier_expansion_framework/gradedexpansions/gradedexpansion_module.py index 36a5bfed..a112e709 100644 --- a/psage/modform/fourier_expansion_framework/gradedexpansions/gradedexpansion_module.py +++ b/psage/modform/fourier_expansion_framework/gradedexpansions/gradedexpansion_module.py @@ -25,7 +25,7 @@ #=============================================================================== from builtins import zip -from builtins import range + from psage.modform.fourier_expansion_framework.gradedexpansions.gradedexpansion_ambient import GradedExpansionAmbient_abstract from psage.modform.fourier_expansion_framework.gradedexpansions.gradedexpansion_element import GradedExpansionVector_class from psage.modform.fourier_expansion_framework.gradedexpansions.gradedexpansion_ring import GradedExpansionRing_class diff --git a/psage/modform/fourier_expansion_framework/gradedexpansions/gradedexpansion_ring.py b/psage/modform/fourier_expansion_framework/gradedexpansions/gradedexpansion_ring.py index 56bbd8a7..a678b422 100644 --- a/psage/modform/fourier_expansion_framework/gradedexpansions/gradedexpansion_ring.py +++ b/psage/modform/fourier_expansion_framework/gradedexpansions/gradedexpansion_ring.py @@ -25,7 +25,7 @@ #=============================================================================== from builtins import zip -from builtins import range + from psage.modform.fourier_expansion_framework.gradedexpansions.gradedexpansion_ambient import GradedExpansionAmbient_abstract from psage.modform.fourier_expansion_framework.gradedexpansions.gradedexpansion_element import GradedExpansion_class from psage.modform.fourier_expansion_framework.gradedexpansions.gradedexpansion_functor import GradedExpansionBaseringInjection diff --git a/psage/modform/fourier_expansion_framework/gradedexpansions/gradedexpansion_submodule.py b/psage/modform/fourier_expansion_framework/gradedexpansions/gradedexpansion_submodule.py index c1f5710c..277298db 100644 --- a/psage/modform/fourier_expansion_framework/gradedexpansions/gradedexpansion_submodule.py +++ b/psage/modform/fourier_expansion_framework/gradedexpansions/gradedexpansion_submodule.py @@ -24,9 +24,9 @@ # #=============================================================================== -from builtins import map -from builtins import str -from builtins import range + + + from psage.modform.fourier_expansion_framework.gradedexpansions.expansion_lazy_evaluation import LazyFourierExpansionEvaluation from psage.modform.fourier_expansion_framework.gradedexpansions.expansion_module import ExpansionModule_abstract from psage.modform.fourier_expansion_framework.gradedexpansions.expansion_module import ExpansionModule_generic, ExpansionModule_ambient_pid, \ diff --git a/psage/modform/fourier_expansion_framework/modularforms/modularform_ambient.py b/psage/modform/fourier_expansion_framework/modularforms/modularform_ambient.py index 90eeae38..7c3946e1 100644 --- a/psage/modform/fourier_expansion_framework/modularforms/modularform_ambient.py +++ b/psage/modform/fourier_expansion_framework/modularforms/modularform_ambient.py @@ -24,7 +24,7 @@ # #=============================================================================== -from builtins import object + from psage.modform.fourier_expansion_framework.gradedexpansions.gradedexpansion_module import GradedExpansionModule_class from psage.modform.fourier_expansion_framework.gradedexpansions.gradedexpansion_ring import GradedExpansionRing_class from psage.modform.fourier_expansion_framework.modularforms.modularform_element import ModularForm_generic diff --git a/psage/modform/fourier_expansion_framework/modularforms/modularform_element.py b/psage/modform/fourier_expansion_framework/modularforms/modularform_element.py index 215f1492..03c69c9f 100644 --- a/psage/modform/fourier_expansion_framework/modularforms/modularform_element.py +++ b/psage/modform/fourier_expansion_framework/modularforms/modularform_element.py @@ -1,4 +1,4 @@ -from builtins import object + from psage.modform.fourier_expansion_framework.gradedexpansions.gradedexpansion_ambient import GradedExpansionAmbient_abstract r""" A orthogonal modular form, namely a graded expansion providing additional features. diff --git a/psage/modform/fourier_expansion_framework/modularforms/modularform_interfaces.py b/psage/modform/fourier_expansion_framework/modularforms/modularform_interfaces.py index 60d7664f..d761469d 100644 --- a/psage/modform/fourier_expansion_framework/modularforms/modularform_interfaces.py +++ b/psage/modform/fourier_expansion_framework/modularforms/modularform_interfaces.py @@ -25,7 +25,7 @@ # #=============================================================================== -from builtins import object + from psage.modform.fourier_expansion_framework.gradedexpansions.gradedexpansion_element import GradedExpansion_abstract from psage.modform.fourier_expansion_framework.monoidpowerseries.monoidpowerseries_element import MonoidPowerSeries_abstract, \ EquivariantMonoidPowerSeries_abstract diff --git a/psage/modform/fourier_expansion_framework/modularforms/modularform_submodule.py b/psage/modform/fourier_expansion_framework/modularforms/modularform_submodule.py index e017310f..46c7a971 100644 --- a/psage/modform/fourier_expansion_framework/modularforms/modularform_submodule.py +++ b/psage/modform/fourier_expansion_framework/modularforms/modularform_submodule.py @@ -24,8 +24,8 @@ # #=============================================================================== -from builtins import map -from builtins import object + + from psage.modform.fourier_expansion_framework.gradedexpansions.gradedexpansion_ambient import GradedExpansionAmbient_abstract from psage.modform.fourier_expansion_framework.gradedexpansions.gradedexpansion_submodule import GradedExpansionSubmodule_ambient_pid, \ GradedExpansionSubmodule_submodule_pid, \ diff --git a/psage/modform/fourier_expansion_framework/modularforms/modularform_testtype.py b/psage/modform/fourier_expansion_framework/modularforms/modularform_testtype.py index 4ecfb140..bcb441d6 100644 --- a/psage/modform/fourier_expansion_framework/modularforms/modularform_testtype.py +++ b/psage/modform/fourier_expansion_framework/modularforms/modularform_testtype.py @@ -25,8 +25,8 @@ # #=============================================================================== -from builtins import map -from builtins import range + + from psage.modform.fourier_expansion_framework.gradedexpansions.gradedexpansion_grading import DegreeGrading from psage.modform.fourier_expansion_framework.modularforms.modularform_ambient import ModularFormsRing_generic,\ ModularFormsModule_generic diff --git a/psage/modform/fourier_expansion_framework/monoidpowerseries/monoidpowerseries_ambient.py b/psage/modform/fourier_expansion_framework/monoidpowerseries/monoidpowerseries_ambient.py index be895415..8f28122b 100644 --- a/psage/modform/fourier_expansion_framework/monoidpowerseries/monoidpowerseries_ambient.py +++ b/psage/modform/fourier_expansion_framework/monoidpowerseries/monoidpowerseries_ambient.py @@ -24,7 +24,7 @@ # #=============================================================================== -from builtins import object + from psage.modform.fourier_expansion_framework.monoidpowerseries.monoidpowerseries_element import MonoidPowerSeries, EquivariantMonoidPowerSeries from sage.rings.all import Integer from sage.structure.element import Element diff --git a/psage/modform/fourier_expansion_framework/monoidpowerseries/monoidpowerseries_basicmonoids.py b/psage/modform/fourier_expansion_framework/monoidpowerseries/monoidpowerseries_basicmonoids.py index bacbd06d..4cef7e7c 100644 --- a/psage/modform/fourier_expansion_framework/monoidpowerseries/monoidpowerseries_basicmonoids.py +++ b/psage/modform/fourier_expansion_framework/monoidpowerseries/monoidpowerseries_basicmonoids.py @@ -25,7 +25,7 @@ # #=============================================================================== -from builtins import range + from operator import xor from sage.misc.latex import latex from sage.categories.all import Rings diff --git a/psage/modform/fourier_expansion_framework/monoidpowerseries/monoidpowerseries_element.py b/psage/modform/fourier_expansion_framework/monoidpowerseries/monoidpowerseries_element.py index 153cc312..9efee726 100644 --- a/psage/modform/fourier_expansion_framework/monoidpowerseries/monoidpowerseries_element.py +++ b/psage/modform/fourier_expansion_framework/monoidpowerseries/monoidpowerseries_element.py @@ -24,7 +24,7 @@ # #=============================================================================== -from builtins import object + from copy import copy from sage.structure.element import AlgebraElement from sage.misc.latex import latex diff --git a/psage/modform/fourier_expansion_framework/monoidpowerseries/monoidpowerseries_lazyelement.py b/psage/modform/fourier_expansion_framework/monoidpowerseries/monoidpowerseries_lazyelement.py index cc04f2d2..e843cc06 100644 --- a/psage/modform/fourier_expansion_framework/monoidpowerseries/monoidpowerseries_lazyelement.py +++ b/psage/modform/fourier_expansion_framework/monoidpowerseries/monoidpowerseries_lazyelement.py @@ -24,7 +24,7 @@ # #=============================================================================== -from builtins import object + from psage.modform.fourier_expansion_framework.monoidpowerseries.monoidpowerseries_ambient import EquivariantMonoidPowerSeriesAmbient_abstract from psage.modform.fourier_expansion_framework.monoidpowerseries.monoidpowerseries_element import EquivariantMonoidPowerSeries_abstract from sage.structure.element import AlgebraElement diff --git a/psage/modform/hilbert/sqrt5/hmf.py b/psage/modform/hilbert/sqrt5/hmf.py index 83b565e8..8a02d88f 100644 --- a/psage/modform/hilbert/sqrt5/hmf.py +++ b/psage/modform/hilbert/sqrt5/hmf.py @@ -26,8 +26,8 @@ from __future__ import absolute_import from __future__ import division -from builtins import str -from builtins import object + + from sage.misc.cachefunc import cached_method from .sqrt5 import F, O_F diff --git a/psage/modform/hilbert/sqrt5/sqrt5.py b/psage/modform/hilbert/sqrt5/sqrt5.py index c7dce2f5..565bf20f 100644 --- a/psage/modform/hilbert/sqrt5/sqrt5.py +++ b/psage/modform/hilbert/sqrt5/sqrt5.py @@ -104,8 +104,8 @@ from __future__ import division -from builtins import range -from builtins import object + + from sage.all import NumberField, polygen, QQ, ZZ, QuaternionAlgebra, cached_function, disk_cached_function x = polygen(QQ,'x') diff --git a/psage/modform/hilbert/sqrt5/tables.py b/psage/modform/hilbert/sqrt5/tables.py index e28720de..44c2b199 100644 --- a/psage/modform/hilbert/sqrt5/tables.py +++ b/psage/modform/hilbert/sqrt5/tables.py @@ -1,8 +1,8 @@ from __future__ import print_function from __future__ import absolute_import #import sqrt5_fast -from builtins import str -from builtins import range + + from . import sqrt5 from sage.misc.all import cputime from sage.rings.all import Integer, ZZ diff --git a/psage/modform/hilbert/sqrt5/tests.py b/psage/modform/hilbert/sqrt5/tests.py index af5cc64b..ca33cc55 100644 --- a/psage/modform/hilbert/sqrt5/tests.py +++ b/psage/modform/hilbert/sqrt5/tests.py @@ -21,8 +21,8 @@ # ################################################################################# -from builtins import str -from builtins import range + + _multiprocess_can_split_ = True import random diff --git a/psage/modform/jacobi/module.py b/psage/modform/jacobi/module.py index afd0935f..96666b1b 100644 --- a/psage/modform/jacobi/module.py +++ b/psage/modform/jacobi/module.py @@ -27,7 +27,7 @@ # python imports -from builtins import map + from sage.modular.arithgroup.congroup_sl2z import * from sage.all import Integer, ModularFormsRing, CommutativeRing, Infinity, SageObject, Parent, IntegerRing, EisensteinForms from psage.modform.jacobi.space import * diff --git a/psage/modform/jacobiforms/jacobiformd1nn_fegenerators.py b/psage/modform/jacobiforms/jacobiformd1nn_fegenerators.py index ee2e7c83..2d9fa769 100644 --- a/psage/modform/jacobiforms/jacobiformd1nn_fegenerators.py +++ b/psage/modform/jacobiforms/jacobiformd1nn_fegenerators.py @@ -22,9 +22,9 @@ # #=============================================================================== -from builtins import map -from builtins import range -from builtins import object + + + from psage.modform.fourier_expansion_framework.monoidpowerseries.monoidpowerseries_lazyelement import \ EquivariantMonoidPowerSeries_lazy from psage.modform.jacobiforms.jacobiformd1nn_fourierexpansion import JacobiD1NNFourierExpansionModule diff --git a/psage/modform/jacobiforms/jacobiformd1nn_fegenerators_modular.py b/psage/modform/jacobiforms/jacobiformd1nn_fegenerators_modular.py index 5c33763f..5afb4eac 100644 --- a/psage/modform/jacobiforms/jacobiformd1nn_fegenerators_modular.py +++ b/psage/modform/jacobiforms/jacobiformd1nn_fegenerators_modular.py @@ -21,8 +21,8 @@ # #=============================================================================== -from builtins import map -from builtins import range + + from sage.misc.all import prod from sage.rings.all import PowerSeriesRing, GF from sage.rings.all import binomial, factorial diff --git a/psage/modform/jacobiforms/jacobiformd1nn_fourierexpansion.py b/psage/modform/jacobiforms/jacobiformd1nn_fourierexpansion.py index 80bfcfd6..3150df36 100644 --- a/psage/modform/jacobiforms/jacobiformd1nn_fourierexpansion.py +++ b/psage/modform/jacobiforms/jacobiformd1nn_fourierexpansion.py @@ -29,8 +29,8 @@ ## even weight ## c(n, r) = c(n', r') <=> r' \equiv \pm r (2m) and r'**2 - 4 n' m = r**2 - 4 n m -from builtins import map -from builtins import range + + from operator import xor from psage.modform.fourier_expansion_framework.monoidpowerseries.monoidpowerseries_basicmonoids import TrivialCharacterMonoid,\ TrivialRepresentation diff --git a/psage/modform/jacobiforms/jacobiformd1nn_types.py b/psage/modform/jacobiforms/jacobiformd1nn_types.py index e0642066..7a874000 100644 --- a/psage/modform/jacobiforms/jacobiformd1nn_types.py +++ b/psage/modform/jacobiforms/jacobiformd1nn_types.py @@ -25,8 +25,8 @@ # #=============================================================================== -from builtins import map -from builtins import range + + from operator import xor from psage.modform.fourier_expansion_framework.gradedexpansions.gradedexpansion_grading import TrivialGrading from psage.modform.fourier_expansion_framework.modularforms.modularform_ambient import ModularFormsModule_generic diff --git a/psage/modform/maass/automorphic_forms.py b/psage/modform/maass/automorphic_forms.py index 09d0977a..a87ca805 100644 --- a/psage/modform/maass/automorphic_forms.py +++ b/psage/modform/maass/automorphic_forms.py @@ -153,8 +153,8 @@ # http://www.gnu.org/licenses/ #***************************************************************************** -from builtins import str -from builtins import range + + import mpmath from sage.all import SageObject,Parent,ln,latex,random,divisors,ModularForms,prime_divisors,real,imag,PowerSeriesRing,\ PolynomialRing,CyclotomicField,dimension_cusp_forms,dimension_modular_forms,CuspForms,ZZ,RealField,DirichletGroup,\ diff --git a/psage/modform/maass/find_maass_forms.py b/psage/modform/maass/find_maass_forms.py index f03501ce..a46e8a9f 100644 --- a/psage/modform/maass/find_maass_forms.py +++ b/psage/modform/maass/find_maass_forms.py @@ -6,9 +6,9 @@ from __future__ import print_function from __future__ import division -from builtins import str -from builtins import map -from builtins import range + + + import logging from sage.all import RealField,RR,gcd,QQ,sqrt,log,ceil diff --git a/psage/modform/maass/harmonic_test.py b/psage/modform/maass/harmonic_test.py index 73a56d2d..e366645f 100644 --- a/psage/modform/maass/harmonic_test.py +++ b/psage/modform/maass/harmonic_test.py @@ -2,7 +2,7 @@ Python routines for calculating Harmonic Weak Maass forms """ from __future__ import print_function, division -from builtins import range + from sage.all import * from sage.all import MPComplexField,RealField, MatrixSpace,RR,ceil,log,sqrt,exp,gamma from psage import * diff --git a/psage/modform/maass/maass_forms.py b/psage/modform/maass/maass_forms.py index 75894b18..d1cc9c6c 100644 --- a/psage/modform/maass/maass_forms.py +++ b/psage/modform/maass/maass_forms.py @@ -18,9 +18,9 @@ from __future__ import print_function from __future__ import absolute_import from __future__ import division -from builtins import str -from builtins import map -from builtins import range + + + import mpmath as mpmath from sage.functions.all import ln,sqrt,floor from sage.arith.all import divisors,gcd,inverse_mod diff --git a/psage/modform/maass/multiplier_systems.py b/psage/modform/maass/multiplier_systems.py index fbe4546f..42963dce 100644 --- a/psage/modform/maass/multiplier_systems.py +++ b/psage/modform/maass/multiplier_systems.py @@ -35,8 +35,8 @@ from __future__ import print_function from __future__ import division -from builtins import str -from builtins import range + + from sage.all import SageObject,CyclotomicField,Integer,is_even,ZZ,QQ,Rational,kronecker,is_odd,SL2Z,Gamma0,matrix,floor,ceil,lcm,copy,trivial_character,var,DirichletGroup from sage.all import kronecker_character,kronecker_character_upside_down,I from sage.misc.cachefunc import cached_function,cached_method diff --git a/psage/modform/maass/poincare_series.py b/psage/modform/maass/poincare_series.py index 8540f101..ca4de112 100644 --- a/psage/modform/maass/poincare_series.py +++ b/psage/modform/maass/poincare_series.py @@ -7,7 +7,7 @@ from __future__ import absolute_import from __future__ import division -from builtins import range + from sage.all import ComplexField,inverse_mod,CyclotomicField,SageObject,Integer,RealField,gcd,factorial from .multiplier_systems import * from psage.modform.arithgroup.mysubgroup import * diff --git a/psage/modform/maass/poincare_series_vv.py b/psage/modform/maass/poincare_series_vv.py index c37dd4f5..09c28413 100755 --- a/psage/modform/maass/poincare_series_vv.py +++ b/psage/modform/maass/poincare_series_vv.py @@ -36,8 +36,8 @@ # https://www.gnu.org/licenses/ # **************************************************************************** -from builtins import str -from builtins import range + + import re import os p= re.compile('MatrixSpace') diff --git a/psage/modform/maass/vv_harmonic_weak_maass_forms.py b/psage/modform/maass/vv_harmonic_weak_maass_forms.py index f3346e03..8ace5ac1 100644 --- a/psage/modform/maass/vv_harmonic_weak_maass_forms.py +++ b/psage/modform/maass/vv_harmonic_weak_maass_forms.py @@ -48,9 +48,9 @@ from __future__ import absolute_import from __future__ import division -from builtins import map -from builtins import str -from builtins import range + + + import mpmath as mpmath # ugly fix to support pickling of mpmath matrices import mpmath.matrices.matrices diff --git a/psage/modform/maass/weil_rep_simple.py b/psage/modform/maass/weil_rep_simple.py index 39183f13..8e492099 100644 --- a/psage/modform/maass/weil_rep_simple.py +++ b/psage/modform/maass/weil_rep_simple.py @@ -22,8 +22,8 @@ from __future__ import print_function from __future__ import division -from builtins import str -from builtins import range + + from psage.modules.weil_module import WeilModule from sage.all import Parent,QQ,ZZ,Integer,SL2Z,CyclotomicField,lcm,odd_part,kronecker,gcd,IntegerModRing,matrix,is_odd,\ diff --git a/psage/modform/paramodularforms/paramodularformd2_element.py b/psage/modform/paramodularforms/paramodularformd2_element.py index 33efe26c..f13f9980 100644 --- a/psage/modform/paramodularforms/paramodularformd2_element.py +++ b/psage/modform/paramodularforms/paramodularformd2_element.py @@ -26,8 +26,8 @@ # #=============================================================================== -from builtins import range -from builtins import object + + from psage.modform.fourier_expansion_framework.modularforms.modularform_element import ModularForm_generic from psage.modform.paramodularforms.paramodularformd2_fourierexpansion import ParamodularFormD2Filter_trace from psage.modform.paramodularforms.paramodularformd2_fourierexpansion_cython import apply_GL_to_form diff --git a/psage/modform/paramodularforms/paramodularformd2_fegenerators.py b/psage/modform/paramodularforms/paramodularformd2_fegenerators.py index 8370d14e..ff483d74 100644 --- a/psage/modform/paramodularforms/paramodularformd2_fegenerators.py +++ b/psage/modform/paramodularforms/paramodularformd2_fegenerators.py @@ -27,7 +27,7 @@ # #=============================================================================== -from builtins import range + from psage.modform.jacobiforms.jacobiformd1nn_fegenerators import JacobiFormD1NNFactory from psage.modform.jacobiforms.jacobiformd1nn_types import JacobiFormsD1NN,\ JacobiFormD1NN_Gamma diff --git a/psage/modform/paramodularforms/paramodularformd2_fourierexpansion.py b/psage/modform/paramodularforms/paramodularformd2_fourierexpansion.py index 32f58df8..cc72074c 100644 --- a/psage/modform/paramodularforms/paramodularformd2_fourierexpansion.py +++ b/psage/modform/paramodularforms/paramodularformd2_fourierexpansion.py @@ -26,8 +26,8 @@ # #=============================================================================== -from builtins import map -from builtins import range + + from psage.modform.fourier_expansion_framework.monoidpowerseries.monoidpowerseries_basicmonoids import TrivialCharacterMonoid, \ TrivialRepresentation from psage.modform.fourier_expansion_framework.monoidpowerseries.monoidpowerseries_ring import EquivariantMonoidPowerSeriesRing diff --git a/psage/modform/paramodularforms/paramodularformd2_types.py b/psage/modform/paramodularforms/paramodularformd2_types.py index d82552f8..07ac5e1d 100644 --- a/psage/modform/paramodularforms/paramodularformd2_types.py +++ b/psage/modform/paramodularforms/paramodularformd2_types.py @@ -25,8 +25,8 @@ # #=============================================================================== -from builtins import map -from builtins import range + + from psage.modform.fourier_expansion_framework.gradedexpansions.expansion_module import ExpansionModule from psage.modform.fourier_expansion_framework.gradedexpansions.gradedexpansion_grading import TrivialGrading from psage.modform.fourier_expansion_framework.modularforms.modularform_ambient import ModularFormsModule_generic diff --git a/psage/modform/paramodularforms/siegelmodularformg2_element.py b/psage/modform/paramodularforms/siegelmodularformg2_element.py index 83bb2eb8..bc4106ad 100644 --- a/psage/modform/paramodularforms/siegelmodularformg2_element.py +++ b/psage/modform/paramodularforms/siegelmodularformg2_element.py @@ -25,8 +25,8 @@ # #=============================================================================== -from builtins import range -from builtins import object + + from psage.modform.fourier_expansion_framework.modularforms.modularform_element import ModularForm_generic, \ ModularFormVector_generic diff --git a/psage/modform/paramodularforms/siegelmodularformg2_fegenerators.py b/psage/modform/paramodularforms/siegelmodularformg2_fegenerators.py index 8825ccd6..5c788073 100644 --- a/psage/modform/paramodularforms/siegelmodularformg2_fegenerators.py +++ b/psage/modform/paramodularforms/siegelmodularformg2_fegenerators.py @@ -38,8 +38,8 @@ # #=============================================================================== -from builtins import range -from builtins import object + + from psage.modform.fourier_expansion_framework.monoidpowerseries.monoidpowerseries_lazyelement import EquivariantMonoidPowerSeries_lazy from psage.modform.paramodularforms.siegelmodularformg2_fourierexpansion import SiegelModularFormG2FourierExpansionRing from sage.combinat.partition import number_of_partitions diff --git a/psage/modform/paramodularforms/siegelmodularformg2_fourierexpansion.py b/psage/modform/paramodularforms/siegelmodularformg2_fourierexpansion.py index c7a49075..cf3751bc 100644 --- a/psage/modform/paramodularforms/siegelmodularformg2_fourierexpansion.py +++ b/psage/modform/paramodularforms/siegelmodularformg2_fourierexpansion.py @@ -26,8 +26,8 @@ # #=============================================================================== -from builtins import map -from builtins import range + + from psage.modform.fourier_expansion_framework.monoidpowerseries.monoidpowerseries_basicmonoids import TrivialCharacterMonoid, \ TrivialRepresentation from psage.modform.fourier_expansion_framework.monoidpowerseries.monoidpowerseries_ring import EquivariantMonoidPowerSeriesRing diff --git a/psage/modform/paramodularforms/siegelmodularformg2_maassproducts.py b/psage/modform/paramodularforms/siegelmodularformg2_maassproducts.py index c8c977d2..fb019db0 100644 --- a/psage/modform/paramodularforms/siegelmodularformg2_maassproducts.py +++ b/psage/modform/paramodularforms/siegelmodularformg2_maassproducts.py @@ -27,8 +27,8 @@ #=============================================================================== from builtins import zip -from builtins import map -from builtins import range + + from sage.matrix.constructor import matrix from sage.misc.all import prod from sage.arith.all import random_prime diff --git a/psage/modform/paramodularforms/siegelmodularformg2_submodule.py b/psage/modform/paramodularforms/siegelmodularformg2_submodule.py index bfccb4f1..5eb1ea40 100644 --- a/psage/modform/paramodularforms/siegelmodularformg2_submodule.py +++ b/psage/modform/paramodularforms/siegelmodularformg2_submodule.py @@ -25,9 +25,9 @@ # #=============================================================================== -from builtins import map -from builtins import range -from builtins import object + + + from psage.modform.fourier_expansion_framework.gradedexpansions.gradedexpansion_submodule import GradedExpansionSubmoduleVector_generic from psage.modform.fourier_expansion_framework.modularforms.modularform_submodule import ModularFormsSubmodule_singleweight_ambient_pid, \ ModularFormsSubmodule_heckeinvariant_submodule diff --git a/psage/modform/paramodularforms/siegelmodularformg2vv_fegenerators.py b/psage/modform/paramodularforms/siegelmodularformg2vv_fegenerators.py index a874952f..de3e69fe 100644 --- a/psage/modform/paramodularforms/siegelmodularformg2vv_fegenerators.py +++ b/psage/modform/paramodularforms/siegelmodularformg2vv_fegenerators.py @@ -26,7 +26,7 @@ # #=============================================================================== -from builtins import object + from psage.modform.paramodularforms.siegelmodularformg2_fourierexpansion import SiegelModularFormG2VVFourierExpansionRing from psage.modform.fourier_expansion_framework.monoidpowerseries.monoidpowerseries_ambient import EquivariantMonoidPowerSeriesAmbient_abstract from psage.modform.fourier_expansion_framework.monoidpowerseries.monoidpowerseries_lazyelement import EquivariantMonoidPowerSeries_lazy diff --git a/psage/modform/paramodularforms/siegelmodularformg4_fourierexpansion.py b/psage/modform/paramodularforms/siegelmodularformg4_fourierexpansion.py index 916c872a..b8844e04 100644 --- a/psage/modform/paramodularforms/siegelmodularformg4_fourierexpansion.py +++ b/psage/modform/paramodularforms/siegelmodularformg4_fourierexpansion.py @@ -24,8 +24,8 @@ # #=============================================================================== -from builtins import map -from builtins import range + + from copy import copy from psage.modform.fourier_expansion_framework.monoidpowerseries.monoidpowerseries_basicmonoids \ import TrivialCharacterMonoid, TrivialRepresentation diff --git a/psage/modform/paramodularforms/siegelmodularformgn_fegenerators.py b/psage/modform/paramodularforms/siegelmodularformgn_fegenerators.py index eb411ad3..5b23d154 100644 --- a/psage/modform/paramodularforms/siegelmodularformgn_fegenerators.py +++ b/psage/modform/paramodularforms/siegelmodularformgn_fegenerators.py @@ -27,7 +27,7 @@ #=============================================================================== from builtins import filter -from builtins import range + from sage.matrix.constructor import diagonal_matrix from sage.matrix.constructor import matrix from sage.misc.cachefunc import cached_method diff --git a/psage/modform/paramodularforms/siegelmodularformgn_fourierexpansion.py b/psage/modform/paramodularforms/siegelmodularformgn_fourierexpansion.py index ae0001e9..c9e55d64 100644 --- a/psage/modform/paramodularforms/siegelmodularformgn_fourierexpansion.py +++ b/psage/modform/paramodularforms/siegelmodularformgn_fourierexpansion.py @@ -26,8 +26,8 @@ # #=============================================================================== -from builtins import map -from builtins import range + + from psage.modform.fourier_expansion_framework.monoidpowerseries.monoidpowerseries_basicmonoids \ import TrivialCharacterMonoid, TrivialRepresentation from psage.modform.fourier_expansion_framework.monoidpowerseries.monoidpowerseries_ring \ diff --git a/psage/modform/periods/period_polynomials.py b/psage/modform/periods/period_polynomials.py index dce14356..53b9e77c 100644 --- a/psage/modform/periods/period_polynomials.py +++ b/psage/modform/periods/period_polynomials.py @@ -7,8 +7,8 @@ from __future__ import absolute_import from __future__ import division -from builtins import map -from builtins import range + + from sage.all import SL2Z,SageObject,is_squarefree,RealField,ComplexField,Matrix,conjugate,binomial,Gamma0,is_prime,ZZ,Cusp,gcd,ceil,floor,log,CyclotomicField,divisors diff --git a/psage/modform/rational/padic_lseries.py b/psage/modform/rational/padic_lseries.py index 10cbb288..d9ff072c 100644 --- a/psage/modform/rational/padic_lseries.py +++ b/psage/modform/rational/padic_lseries.py @@ -35,7 +35,7 @@ ###################################################################### -from builtins import range + from sage.rings.integer_ring import ZZ from sage.rings.rational_field import QQ from sage.rings.padics.factory import Qp, Zp diff --git a/psage/modform/rational/special.py b/psage/modform/rational/special.py index 062ec1f6..f9f69c74 100644 --- a/psage/modform/rational/special.py +++ b/psage/modform/rational/special.py @@ -26,8 +26,8 @@ from __future__ import print_function from builtins import zip -from builtins import range -from builtins import object + + import sys from sage.rings.all import ZZ, QQ, PolynomialRing from sage.modular.all import eisenstein_series_qexp, ModularForms diff --git a/psage/modform/siegel/pushout.py b/psage/modform/siegel/pushout.py index 43849962..069abf10 100644 --- a/psage/modform/siegel/pushout.py +++ b/psage/modform/siegel/pushout.py @@ -1,6 +1,6 @@ from __future__ import print_function -from builtins import str -from builtins import range + + from sage.categories.functor import Functor from sage.categories.basic import * diff --git a/psage/modform/siegel/siegel_modular_form.py b/psage/modform/siegel/siegel_modular_form.py index 0e72a4c2..a40715b3 100644 --- a/psage/modform/siegel/siegel_modular_form.py +++ b/psage/modform/siegel/siegel_modular_form.py @@ -46,8 +46,8 @@ # https://www.gnu.org/licenses/ # **************************************************************************** from __future__ import absolute_import, division -from builtins import str -from builtins import range + + try: import cPickle as pickle except ImportError: diff --git a/psage/modform/siegel/siegel_modular_form_prec.py b/psage/modform/siegel/siegel_modular_form_prec.py index 475d7393..36d1d0f5 100644 --- a/psage/modform/siegel/siegel_modular_form_prec.py +++ b/psage/modform/siegel/siegel_modular_form_prec.py @@ -5,8 +5,8 @@ from __future__ import division -from builtins import str -from builtins import range + + from copy import deepcopy import operator diff --git a/psage/modform/siegel/siegel_modular_forms_algebra.py b/psage/modform/siegel/siegel_modular_forms_algebra.py index daaf1c67..5fb6ed9e 100644 --- a/psage/modform/siegel/siegel_modular_forms_algebra.py +++ b/psage/modform/siegel/siegel_modular_forms_algebra.py @@ -1,5 +1,5 @@ from __future__ import absolute_import -from builtins import str + from .siegel_modular_form import SiegelModularForm, SiegelModularForm_class, SMF_DEFAULT_PREC from sage.algebras.algebra import Algebra from sage.misc.all import cached_method diff --git a/psage/modform/weilrep_tools/dimension.py b/psage/modform/weilrep_tools/dimension.py index c156a8e0..38e7854a 100644 --- a/psage/modform/weilrep_tools/dimension.py +++ b/psage/modform/weilrep_tools/dimension.py @@ -21,7 +21,7 @@ #***************************************************************************** #from psage.modules import * -from builtins import range + from sage.all import SageObject, Integer, RR, is_odd, next_prime, floor, \ RealField, ZZ, ceil, log, ComplexField, real, sqrt, exp, round, prime_range, dimension_cusp_forms, \ kronecker_character, Matrix, QQ diff --git a/psage/modform/weilrep_tools/test_global.py b/psage/modform/weilrep_tools/test_global.py index 0524fbb8..ff88d488 100644 --- a/psage/modform/weilrep_tools/test_global.py +++ b/psage/modform/weilrep_tools/test_global.py @@ -1,7 +1,7 @@ from __future__ import print_function from __future__ import division -from builtins import str -from builtins import range + + from sage.quadratic_forms.genera.genus import GenusSymbol_global_ring, Genus_Symbol_p_adic_ring, is_GlobalGenus from psage.modules.finite_quadratic_module import FiniteQuadraticModule from sage.matrix.matrix_space import MatrixSpace diff --git a/psage/modform/weilrep_tools/weight_one_half.py b/psage/modform/weilrep_tools/weight_one_half.py index c781fb01..3c6a8ea9 100644 --- a/psage/modform/weilrep_tools/weight_one_half.py +++ b/psage/modform/weilrep_tools/weight_one_half.py @@ -1,6 +1,6 @@ from __future__ import print_function from __future__ import division -from builtins import range + from sage.all import SageObject, Integer, RR, is_odd, next_prime, floor, RealField, ZZ, ceil, log, ComplexField, real, sqrt, exp, is_squarefree, lcm, Matrix, cached_function from psage.modules.finite_quadratic_module import FiniteQuadraticModule from psage.modules.weil_invariants import invariants diff --git a/psage/modules/finite_quadratic_module.py b/psage/modules/finite_quadratic_module.py index 40910ead..d52fab1b 100644 --- a/psage/modules/finite_quadratic_module.py +++ b/psage/modules/finite_quadratic_module.py @@ -88,9 +88,9 @@ from __future__ import print_function from __future__ import division -from builtins import map -from builtins import str -from builtins import range + + + from sage.functions.other import floor from sage.arith.all import divisors, is_prime, kronecker, lcm, gcd, prime_divisors, primitive_root, is_square, is_prime_power, inverse_mod, binomial from sage.rings.all import ZZ, QQ, Integer, PolynomialRing,CC diff --git a/psage/modules/weil_module.py b/psage/modules/weil_module.py index b54f0f90..1aa25911 100644 --- a/psage/modules/weil_module.py +++ b/psage/modules/weil_module.py @@ -44,7 +44,7 @@ #from sage.all_cmdline import * # import sage library -from builtins import range + from sage.all import Integer,RR,CC,QQ,ZZ,sgn,cached_method,copy,CyclotomicField,lcm,is_square,matrix,SL2Z,MatrixSpace,\ floor,ceil,is_odd,is_even,hilbert_symbol,sqrt,inverse_mod,xgcd,latex,kronecker,gcd,divisors,odd_part,gcd,valuation,\ vector diff --git a/psage/rh/low_zeros.py b/psage/rh/low_zeros.py index e333379d..9cbfbf95 100644 --- a/psage/rh/low_zeros.py +++ b/psage/rh/low_zeros.py @@ -22,8 +22,8 @@ """ We study low zeros. """ -from builtins import range -from builtins import object + + from sage.all import is_fundamental_discriminant, ZZ, parallel, var, sgn, fundamental_discriminant, kronecker_character,\ log,find_root import os diff --git a/psage/rh/mazur_stein/book.py b/psage/rh/mazur_stein/book.py index fe177b4e..5c9fdcbe 100644 --- a/psage/rh/mazur_stein/book.py +++ b/psage/rh/mazur_stein/book.py @@ -25,9 +25,9 @@ """ from __future__ import print_function, division -from builtins import str -from builtins import range -from builtins import object + + + import math import os import sys diff --git a/psage/rh/mazur_stein/game2.py b/psage/rh/mazur_stein/game2.py index dcc930d1..fc555720 100644 --- a/psage/rh/mazur_stein/game2.py +++ b/psage/rh/mazur_stein/game2.py @@ -1,5 +1,5 @@ from __future__ import division -from builtins import object + from sage.all import prime_range, I class J_E(object): diff --git a/psage/zfunctions/selberg_z.py b/psage/zfunctions/selberg_z.py index b436dc37..e7fbf2d7 100644 --- a/psage/zfunctions/selberg_z.py +++ b/psage/zfunctions/selberg_z.py @@ -41,8 +41,8 @@ #***************************************************************************** -from builtins import map -from builtins import range + + import mpmath as mpmath from sage.all import Parent,RR,ZZ,QQ,is_even,matrix,zeta,is_odd,is_even,ceil,log,gamma,tan,cos,sin,latex,\ CyclotomicField,MatrixSpace,sign,binomial,RealField,exp,Rational, arg