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: 10 additions & 10 deletions src/sage/structure/all.py
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
from .factorization import Factorization
from sage.structure.factorization import Factorization

from .sequence import Sequence, seq
from sage.structure.sequence import Sequence, seq

from .unique_representation import UniqueRepresentation
from sage.structure.unique_representation import UniqueRepresentation

from .sage_object import SageObject
from sage.structure.sage_object import SageObject

from .element import (
from sage.structure.element import (
canonical_coercion,
coercion_model,
get_coercion_model,
coercion_traceback,
parent
)

from .parent import Parent
from sage.structure.parent import Parent

from .parent_gens import localvars
from sage.structure.parent_gens import localvars

from .proof import all as proof
from sage.structure.proof import all as proof

from sage.misc.lazy_import import lazy_import
lazy_import('sage.structure.formal_sum', ['FormalSums', 'FormalSum'])
del lazy_import

from .mutability import Mutability
from sage.structure.mutability import Mutability

from .element_wrapper import ElementWrapper
from sage.structure.element_wrapper import ElementWrapper
4 changes: 2 additions & 2 deletions src/sage/structure/coerce.pxd
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from .parent cimport Parent
from .coerce_dict cimport TripleDict
from sage.structure.parent cimport Parent
from sage.structure.coerce_dict cimport TripleDict

cpdef py_scalar_parent(py_type)
cpdef py_scalar_to_element(py)
Expand Down
10 changes: 5 additions & 5 deletions src/sage/structure/coerce.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,11 @@ cimport gmpy2
cdef mul, truediv
from operator import mul, truediv

from .richcmp cimport rich_to_bool, revop
from .sage_object cimport SageObject
from .parent cimport Parent_richcmp_element_without_coercion
from .element cimport bin_op_exception, parent, Element
from .coerce_exceptions import CoercionException
from sage.structure.richcmp cimport rich_to_bool, revop
from sage.structure.sage_object cimport SageObject
from sage.structure.parent cimport Parent_richcmp_element_without_coercion
from sage.structure.element cimport bin_op_exception, parent, Element
from sage.structure.coerce_exceptions import CoercionException
from sage.rings.integer_fake cimport is_Integer
from sage.categories.map cimport Map
from sage.categories.morphism import IdentityMorphism
Expand Down
8 changes: 4 additions & 4 deletions src/sage/structure/coerce_actions.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ from cpython.long cimport *
from cpython.number cimport *
from cysignals.signals cimport sig_check

from .coerce cimport coercion_model
from .element cimport parent, Element, ModuleElement
from .parent cimport Parent
from .coerce_exceptions import CoercionException
from sage.structure.coerce cimport coercion_model
from sage.structure.element cimport parent, Element, ModuleElement
from sage.structure.parent cimport Parent
from sage.structure.coerce_exceptions import CoercionException
from sage.categories.action cimport InverseAction, PrecomposedAction
from sage.arith.long cimport integer_check_long

Expand Down
4 changes: 2 additions & 2 deletions src/sage/structure/element.pxd
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from .sage_object cimport SageObject
from .parent cimport Parent
from sage.structure.sage_object cimport SageObject
from sage.structure.parent cimport Parent
from sage.misc.inherit_comparison cimport InheritComparisonMetaclass


Expand Down
2 changes: 1 addition & 1 deletion src/sage/structure/factory.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ AUTHORS:

import types

from .sage_object cimport SageObject
from sage.structure.sage_object cimport SageObject

cdef sage_version
from sage.version import version as sage_version
Expand Down
12 changes: 6 additions & 6 deletions src/sage/structure/parent.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,13 @@ from sage.misc.lazy_attribute import lazy_attribute
from sage.categories.sets_cat import Sets, EmptySetError
from sage.misc.lazy_string cimport _LazyString
from sage.sets.pythonclass cimport Set_PythonType_class
from .category_object import CategoryObject
from .coerce cimport coercion_model
from .coerce cimport parent_is_integers
from .coerce_exceptions import CoercionException
from .coerce_maps cimport (NamedConvertMap, DefaultConvertMap,
from sage.structure.category_object import CategoryObject
from sage.structure.coerce cimport coercion_model
from sage.structure.coerce cimport parent_is_integers
from sage.structure.coerce_exceptions import CoercionException
from sage.structure.coerce_maps cimport (NamedConvertMap, DefaultConvertMap,
DefaultConvertMap_unique, CallableConvertMap)
from .element cimport parent
from sage.structure.element cimport parent


cdef _record_exception():
Expand Down
2 changes: 1 addition & 1 deletion src/sage/structure/parent_base.pxd
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# https://www.gnu.org/licenses/
###############################################################################

from .parent_old cimport Parent as Parent_old
from sage.structure.parent_old cimport Parent as Parent_old

cdef class ParentWithBase(Parent_old):
pass
2 changes: 1 addition & 1 deletion src/sage/structure/parent_base.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Base class for old-style parent objects with a base ring
# ****************************************************************************

cimport sage.structure.parent as parent
from .coerce_exceptions import CoercionException
from sage.structure.coerce_exceptions import CoercionException

cdef inline check_old_coerce(parent.Parent p):
if p._element_constructor is not None:
Expand Down
2 changes: 1 addition & 1 deletion src/sage/structure/parent_gens.pxd
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Parent objects with generators
# http://www.gnu.org/licenses/
#*****************************************************************************

from .parent_base cimport ParentWithBase
from sage.structure.parent_base cimport ParentWithBase


cdef class ParentWithGens(ParentWithBase):
Expand Down
2 changes: 1 addition & 1 deletion src/sage/structure/parent_old.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ This came up in some subtle bug once::
# https://www.gnu.org/licenses/
# ****************************************************************************
from sage.misc.superseded import deprecation
from .coerce cimport py_scalar_parent
from sage.structure.coerce cimport py_scalar_parent
from sage.ext.stdsage cimport HAS_DICTIONARY
from sage.sets.pythonclass cimport Set_PythonType, Set_PythonType_class

Expand Down
3 changes: 2 additions & 1 deletion src/sage/structure/sage_object_test.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@

import pytest
from .sage_object import SageObject
from sage.structure.sage_object import SageObject


class SageObjectTests:

Expand Down