|
141 | 141 | from sage.misc.randstate import current_randstate
|
142 | 142 | from sage.groups.group import FiniteGroup
|
143 | 143 |
|
144 |
| -from sage.rings.all import QQ, Integer |
| 144 | +from sage.rings.rational_field import Q as QQ |
| 145 | +from sage.rings.integer import Integer |
145 | 146 | from sage.interfaces.abc import ExpectElement, GapElement
|
146 | 147 | from sage.libs.gap.libgap import libgap
|
147 | 148 | from sage.libs.gap.element import GapElement as LibGapElement
|
|
151 | 152 | from sage.misc.cachefunc import cached_method
|
152 | 153 | from sage.groups.class_function import ClassFunction_libgap
|
153 | 154 | from sage.sets.finite_enumerated_set import FiniteEnumeratedSet
|
154 |
| -from sage.categories.all import FiniteEnumeratedSets |
| 155 | +from sage.categories.finite_enumerated_sets import FiniteEnumeratedSets |
155 | 156 | from sage.groups.conjugacy_classes import ConjugacyClassGAP
|
156 | 157 | from sage.structure.richcmp import (richcmp_method,
|
157 | 158 | richcmp, rich_to_bool, op_EQ, op_NE)
|
@@ -195,7 +196,7 @@ def hap_decorator(f):
|
195 | 196 | @wraps(f)
|
196 | 197 | def wrapped(self, n, p=0):
|
197 | 198 | load_hap()
|
198 |
| - from sage.arith.all import is_prime |
| 199 | + from sage.arith.misc import is_prime |
199 | 200 | if not (p == 0 or is_prime(p)):
|
200 | 201 | raise ValueError("p must be 0 or prime")
|
201 | 202 |
|
@@ -3421,13 +3422,13 @@ def character_table(self):
|
3421 | 3422 | irrG = G.Irr()
|
3422 | 3423 | ct = [[irrG[i, j] for j in range(n)] for i in range(n)]
|
3423 | 3424 |
|
3424 |
| - from sage.rings.all import CyclotomicField |
| 3425 | + from sage.rings.number_field.number_field import CyclotomicField |
3425 | 3426 | e = irrG.Flat().Conductor()
|
3426 | 3427 | K = CyclotomicField(e)
|
3427 | 3428 | ct = [[K(x) for x in v] for v in ct]
|
3428 | 3429 |
|
3429 | 3430 | # Finally return the result as a matrix.
|
3430 |
| - from sage.matrix.all import MatrixSpace |
| 3431 | + from sage.matrix.matrix_space import MatrixSpace |
3431 | 3432 | MS = MatrixSpace(K, n)
|
3432 | 3433 | return MS(ct)
|
3433 | 3434 |
|
@@ -4742,7 +4743,7 @@ def poincare_series(self, p=2, n=10):
|
4742 | 4743 |
|
4743 | 4744 | """
|
4744 | 4745 | load_hap()
|
4745 |
| - from sage.arith.all import is_prime |
| 4746 | + from sage.arith.misc import is_prime |
4746 | 4747 | if not (p == 0 or is_prime(p)):
|
4747 | 4748 | raise ValueError("p must be 0 or prime")
|
4748 | 4749 |
|
|
0 commit comments