remove most imports from builtins (range, str, object, map)

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

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,

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

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

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

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())

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
 

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
 

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 != '?'])
 

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

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
 

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

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):

psage/lmfdb/objectdb.py

@@ -29,7 +29,7 @@
 MongoDB.
 """
 
-from builtins import object
+
 class ObjectDB(object):
     def __init__(self, db):
         from gridfs import GridFS

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

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:

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

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']
 

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

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

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

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) :

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

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

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

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

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

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

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

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

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, \

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

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.

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

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, \

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

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

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

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

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