Skip to content

Commit 6e96393

Browse files
author
Matthias Koeppe
committed
Replace relative imports by absolute imports because pytest
1 parent feb6525 commit 6e96393

9 files changed

+31
-37
lines changed

src/sage/crypto/public_key/blum_goldwasser.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,14 @@
3131
from operator import xor
3232

3333
from sage.arith.misc import GCD as gcd, power_mod, XGCD as xgcd
34+
from sage.crypto.cryptosystem import PublicKeyCryptosystem
35+
from sage.crypto.util import is_blum_prime, least_significant_bits, random_blum_prime
3436
from sage.functions.log import log
3537
from sage.functions.other import Function_floor
3638
from sage.monoids.string_monoid import BinaryStrings
3739
from sage.rings.finite_rings.integer_mod import Mod as mod
3840
from sage.rings.finite_rings.integer_mod_ring import IntegerModFactory
3941

40-
from ..cryptosystem import PublicKeyCryptosystem
41-
from ..util import is_blum_prime, least_significant_bits, random_blum_prime
42-
4342

4443
floor = Function_floor()
4544
IntegerModRing = IntegerModFactory("IntegerModRing")

src/sage/crypto/stream.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,14 @@
1313
#*****************************************************************************
1414

1515
from sage.arith.misc import GCD as gcd, power_mod
16+
from sage.crypto.cryptosystem import SymmetricKeyCryptosystem
17+
from sage.crypto.stream_cipher import LFSRCipher, ShrinkingGeneratorCipher
18+
from sage.crypto.util import random_blum_prime
1619
from sage.monoids.string_monoid import BinaryStrings
1720
from sage.rings.finite_rings.finite_field_constructor import FiniteField
1821
from sage.rings.finite_rings.integer_mod_ring import IntegerModFactory
1922
from sage.rings.polynomial.polynomial_element import Polynomial
2023

21-
from .cryptosystem import SymmetricKeyCryptosystem
22-
from .stream_cipher import LFSRCipher, ShrinkingGeneratorCipher
23-
from .util import random_blum_prime
24-
2524

2625
IntegerModRing = IntegerModFactory("IntegerModRing")
2726

src/sage/dynamics/arithmetic_dynamics/projective_ds.py

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,17 @@ class initialization directly.
6565
from sage.categories.function_fields import FunctionFields
6666
from sage.categories.homset import End
6767
from sage.categories.number_fields import NumberFields
68+
from sage.dynamics.arithmetic_dynamics.endPN_automorphism_group import (
69+
automorphism_group_QQ_CRT,
70+
automorphism_group_QQ_fixedpoints,
71+
conjugating_set_helper,
72+
conjugating_set_initializer,
73+
is_conjugate_helper)
74+
from sage.dynamics.arithmetic_dynamics.endPN_automorphism_group import automorphism_group_FF
75+
from sage.dynamics.arithmetic_dynamics.generic_ds import DynamicalSystem
76+
from sage.dynamics.arithmetic_dynamics.projective_ds_helper import (
77+
_fast_possible_periods,
78+
_all_periodic_points)
6879
from sage.functions.other import ceil
6980
from sage.libs.pari.all import PariError
7081
from sage.matrix.constructor import matrix, identity_matrix
@@ -107,16 +118,6 @@ class initialization directly.
107118
from sage.structure.element import get_coercion_model
108119
from sage.symbolic.constants import e
109120

110-
from .endPN_automorphism_group import (
111-
automorphism_group_QQ_CRT,
112-
automorphism_group_QQ_fixedpoints,
113-
conjugating_set_helper,
114-
conjugating_set_initializer,
115-
is_conjugate_helper)
116-
from .endPN_automorphism_group import automorphism_group_FF
117-
from .generic_ds import DynamicalSystem
118-
from .projective_ds_helper import _fast_possible_periods, _all_periodic_points
119-
120121

121122
class DynamicalSystem_projective(SchemeMorphism_polynomial_projective_space,
122123
DynamicalSystem):

src/sage/quadratic_forms/quadratic_form__equivalence_testing.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,10 @@
1212
legendre_symbol,
1313
prime_divisors,
1414
valuation)
15+
from sage.quadratic_forms.quadratic_form import is_QuadraticForm
1516
from sage.rings.integer_ring import ZZ
1617
from sage.rings.rational_field import QQ
1718

18-
from .quadratic_form import is_QuadraticForm
19-
2019

2120
##############################################################################
2221
# Routines to test if two quadratic forms over ZZ are globally equivalent. #

src/sage/quadratic_forms/quadratic_form__mass__Conway_Sloane_masses.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@
77
legendre_symbol,
88
prime_divisors)
99
from sage.misc.misc_c import prod
10+
from sage.quadratic_forms.special_values import gamma__exact, zeta__exact, quadratic_L_function__exact
1011
from sage.rings.integer_ring import ZZ
1112
from sage.rings.rational_field import QQ
1213
from sage.symbolic.constants import pi
1314

14-
from .special_values import gamma__exact, zeta__exact, quadratic_L_function__exact
15-
1615

1716
def parity(self, allow_rescaling_flag=True):
1817
"""

src/sage/quadratic_forms/quadratic_form__mass__Siegel_densities.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,12 @@
1818
from sage.misc.functional import squarefree_part
1919
from sage.misc.misc_c import prod
2020
from sage.misc.mrange import mrange
21+
from sage.quadratic_forms.special_values import gamma__exact, zeta__exact, quadratic_L_function__exact
2122
from sage.rings.finite_rings.integer_mod_ring import IntegerModRing
2223
from sage.rings.integer_ring import ZZ
2324
from sage.rings.rational_field import QQ
2425
from sage.symbolic.constants import pi
2526

26-
from .special_values import gamma__exact, zeta__exact, quadratic_L_function__exact
27-
2827

2928
def mass__by_Siegel_densities(self, odd_algorithm="Pall", even_algorithm="Watson"):
3029
"""

src/sage/quadratic_forms/quadratic_form__siegel_product.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,10 @@
1616
prime_divisors)
1717
from sage.misc.functional import sqrt
1818
from sage.misc.verbose import verbose
19+
from sage.quadratic_forms.special_values import QuadraticBernoulliNumber
1920
from sage.rings.integer_ring import ZZ
2021
from sage.rings.rational_field import QQ
2122

22-
from .special_values import QuadraticBernoulliNumber
23-
2423

2524
#/*! \brief Computes the product of all local densities for comparison with independently computed Eisenstein coefficients.
2625
# *

src/sage/quadratic_forms/quadratic_form__ternary_Tornaria.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,9 @@
2222
from sage.misc.misc_c import prod
2323
from sage.modules.free_module import FreeModule
2424
from sage.modules.free_module_element import vector
25+
from sage.quadratic_forms.quadratic_form import QuadraticForm__constructor as QuadraticForm
2526
from sage.rings.integer_ring import ZZ
2627

27-
from .quadratic_form import QuadraticForm__constructor as QuadraticForm
28-
2928

3029
# TO DO -- Add second argument
3130
# def __call__(self,v,w=None):

src/sage/quadratic_forms/ternary_qf.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,23 +29,23 @@
2929
from sage.arith.misc import GCD as gcd, kronecker as kronecker_symbol
3030
from sage.matrix.constructor import matrix, identity_matrix
3131
from sage.misc.prandom import randint
32+
from sage.quadratic_forms.quadratic_form import QuadraticForm
33+
from sage.quadratic_forms..ternary import (_basic_lemma,
34+
_find_a_ternary_qf_by_level_disc,
35+
_find_all_ternary_qf_by_level_disc,
36+
_find_p_neighbor_from_vec,
37+
_find_zeros_mod_p_2,
38+
_find_zeros_mod_p_odd,
39+
_reduced_ternary_form_eisenstein_with_matrix,
40+
_reduced_ternary_form_eisenstein_without_matrix)
41+
3242
from sage.rings.finite_rings.integer_mod import mod
3343
from sage.rings.integer_ring import ZZ
3444
from sage.rings.polynomial.polynomial_ring import polygens
3545
from sage.rings.ring import is_Ring
3646
from sage.structure.element import is_Vector, is_Matrix
3747
from sage.structure.sage_object import SageObject
3848

39-
from .quadratic_form import QuadraticForm
40-
from .ternary import (_basic_lemma,
41-
_find_a_ternary_qf_by_level_disc,
42-
_find_all_ternary_qf_by_level_disc,
43-
_find_p_neighbor_from_vec,
44-
_find_zeros_mod_p_2,
45-
_find_zeros_mod_p_odd,
46-
_reduced_ternary_form_eisenstein_with_matrix,
47-
_reduced_ternary_form_eisenstein_without_matrix)
48-
4949

5050
class TernaryQF(SageObject):
5151
"""

0 commit comments

Comments
 (0)