Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions src/sage/crypto/mq/sr.py
Original file line number Diff line number Diff line change
Expand Up @@ -308,23 +308,21 @@
- [MR2002]_
"""

from sage.rings.finite_rings.finite_field_constructor import FiniteField as GF
from sage.rings.integer_ring import ZZ
from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing, BooleanPolynomialRing_constructor as BooleanPolynomialRing

from sage.structure.element import is_Matrix
from sage.matrix.constructor import Matrix, random_matrix
from sage.matrix.matrix_space import MatrixSpace

from sage.misc.verbose import get_verbose
from sage.misc.flatten import flatten

from sage.misc.verbose import get_verbose
from sage.modules.vector_modn_dense import Vector_modn_dense

from sage.rings.finite_rings.finite_field_constructor import FiniteField as GF
from sage.rings.integer_ring import ZZ
from sage.rings.polynomial.multi_polynomial_sequence import PolynomialSequence
from .mpolynomialsystemgenerator import MPolynomialSystemGenerator

from sage.rings.polynomial.polynomial_ring_constructor import \
BooleanPolynomialRing_constructor as BooleanPolynomialRing
from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
from sage.rings.polynomial.term_order import TermOrder
from sage.structure.element import is_Matrix

from .mpolynomialsystemgenerator import MPolynomialSystemGenerator


def SR(n=1, r=1, c=1, e=4, star=False, **kwargs):
Expand Down
7 changes: 5 additions & 2 deletions src/sage/groups/matrix_gps/finitely_generated_gap.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
from sage.modules.free_module_element import vector
from sage.rings.fraction_field import FractionField
from sage.rings.integer_ring import ZZ
from sage.rings.polynomial.multi_polynomial_sequence import PolynomialSequence
from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
from sage.rings.power_series_ring import PowerSeriesRing
from sage.rings.polynomial.multi_polynomial_sequence import PolynomialSequence


class FinitelyGeneratedMatrixGroup_gap(MatrixGroup_gap):
Expand Down Expand Up @@ -313,8 +313,9 @@ def invariant_generators(self):
- S. King, "Minimal Generating Sets of non-modular invariant
rings of finite groups", :arxiv:`math/0703035`.
"""
from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
from sage.interfaces.singular import singular
from sage.rings.polynomial.polynomial_ring_constructor import \
PolynomialRing
gens = self.gens()
singular.LIB("finvar.lib")
n = self.degree() # len((gens[0].matrix()).rows())
Expand Down Expand Up @@ -755,6 +756,7 @@ def reynolds_operator(self, poly, chi=None):
if chi is None: # then this is the trivial character
if R.characteristic() == 0:
from sage.rings.qqbar import QQbar

# non-modular case
if C == QQbar or R == QQbar:
L = QQbar
Expand Down Expand Up @@ -788,6 +790,7 @@ def reynolds_operator(self, poly, chi=None):
K = chi.values()[0].parent()
if R.characteristic() == 0:
from sage.rings.qqbar import QQbar

# extend base_ring to compositum
if C == QQbar or K == QQbar or R == QQbar:
L = QQbar
Expand Down
10 changes: 5 additions & 5 deletions src/sage/parallel/map_reduce.py
Original file line number Diff line number Diff line change
Expand Up @@ -548,17 +548,17 @@
# https://www.gnu.org/licenses/
# ****************************************************************************
import copy
import sys
import random
import queue
import ctypes
import logging
import multiprocessing as mp
import queue
import random
import sys
from collections import deque
from threading import Thread

from sage.sets.recursively_enumerated_set import RecursivelyEnumeratedSet # _generic
from sage.misc.lazy_attribute import lazy_attribute
from sage.sets.recursively_enumerated_set import RecursivelyEnumeratedSet # _generic

logger = logging.getLogger(__name__)
logger.__doc__ = ("""
Expand Down Expand Up @@ -1895,8 +1895,8 @@ def __init__(self, maxl=9):
<sage.parallel.map_reduce.RESetMPExample object at 0x...>
"""
RESetMapReduce.__init__(self)
from sage.rings.polynomial.polynomial_ring import polygen
from sage.rings.integer_ring import ZZ
from sage.rings.polynomial.polynomial_ring import polygen
self.x = polygen(ZZ, 'x')
self.maxl = maxl

Expand Down
8 changes: 5 additions & 3 deletions src/sage/repl/ipython_kernel/install.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,14 @@

"""

import os
import errno
import os
import warnings

from sage.env import (
SAGE_DOC, SAGE_VENV, SAGE_EXTCODE,
SAGE_DOC,
SAGE_EXTCODE,
SAGE_VENV,
SAGE_VERSION,
THREEJS_DIR,
)
Expand Down Expand Up @@ -257,7 +259,7 @@ def check(cls):
sage: from sage.repl.ipython_kernel.install import SageKernelSpec
sage: SageKernelSpec.check() # random
"""
from jupyter_client.kernelspec import get_kernel_spec, NoSuchKernel
from jupyter_client.kernelspec import NoSuchKernel, get_kernel_spec
ident = cls.identifier()
try:
spec = get_kernel_spec(ident)
Expand Down
Loading