summaryrefslogtreecommitdiffstats
path: root/src/sage/rings
diff options
context:
space:
mode:
Diffstat (limited to 'src/sage/rings')
-rw-r--r--src/sage/rings/asymptotic/misc.py2
-rw-r--r--src/sage/rings/complex_double.pyx2
-rw-r--r--src/sage/rings/complex_mpc.pyx2
-rw-r--r--src/sage/rings/finite_rings/element_givaro.pyx3
-rw-r--r--src/sage/rings/finite_rings/element_ntl_gf2e.pyx5
-rw-r--r--src/sage/rings/finite_rings/residue_field.pyx2
-rw-r--r--src/sage/rings/fraction_field_element.pyx2
-rw-r--r--src/sage/rings/function_field/function_field_element.pyx2
-rw-r--r--src/sage/rings/integer.pyx3
-rw-r--r--src/sage/rings/integer_ring.pyx2
-rw-r--r--src/sage/rings/laurent_series_ring_element.pyx2
-rw-r--r--src/sage/rings/morphism.pyx4
-rw-r--r--src/sage/rings/multi_power_series_ring_element.py2
-rw-r--r--src/sage/rings/number_field/number_field_element.pyx2
-rw-r--r--src/sage/rings/number_field/number_field_element_quadratic.pyx2
-rw-r--r--src/sage/rings/padics/morphism.pyx4
-rw-r--r--src/sage/rings/padics/padic_base_leaves.py2
-rw-r--r--src/sage/rings/padics/padic_extension_generic.py2
-rw-r--r--src/sage/rings/padics/padic_printing.pyx2
-rw-r--r--src/sage/rings/padics/pow_computer.pyx2
-rw-r--r--src/sage/rings/padics/pow_computer_flint.pyx2
-rw-r--r--src/sage/rings/polynomial/laurent_polynomial.pyx2
-rw-r--r--src/sage/rings/polynomial/multi_polynomial_libsingular.pyx2
-rw-r--r--src/sage/rings/polynomial/multi_polynomial_ring_generic.pyx2
-rw-r--r--src/sage/rings/polynomial/pbori.pyx2
-rw-r--r--src/sage/rings/polynomial/polynomial_element.pyx2
-rw-r--r--src/sage/rings/polynomial/polynomial_element_generic.py4
-rw-r--r--src/sage/rings/polynomial/polynomial_template.pxi2
-rw-r--r--src/sage/rings/polynomial/symmetric_reduction.pyx2
-rw-r--r--src/sage/rings/power_series_ring_element.pyx2
-rw-r--r--src/sage/rings/qqbar.py9
-rw-r--r--src/sage/rings/real_double.pyx2
-rw-r--r--src/sage/rings/real_lazy.pyx2
-rw-r--r--src/sage/rings/real_mpfi.pyx2
-rw-r--r--src/sage/rings/real_mpfr.pyx2
-rw-r--r--src/sage/rings/universal_cyclotomic_field.py2
36 files changed, 47 insertions, 43 deletions
diff --git a/src/sage/rings/asymptotic/misc.py b/src/sage/rings/asymptotic/misc.py
index 6c0eba0..2782fd9 100644
--- a/src/sage/rings/asymptotic/misc.py
+++ b/src/sage/rings/asymptotic/misc.py
@@ -820,7 +820,7 @@ def richcmp_by_eq_and_lt(left, right, op):
sage: z < x, x < z, z > x, x > z, z <= x, x <= z, z >= x, x >= z
(False, True, True, False, False, True, True, False)
"""
- from sage.structure.sage_object import (rich_to_bool,
+ from sage.structure.richcmp import (rich_to_bool,
op_NE, op_EQ,
op_LT, op_LE, op_GT, op_GE)
diff --git a/src/sage/rings/complex_double.pyx b/src/sage/rings/complex_double.pyx
index 2595e15..05f8eba 100644
--- a/src/sage/rings/complex_double.pyx
+++ b/src/sage/rings/complex_double.pyx
@@ -84,7 +84,7 @@ cimport sage.rings.integer
from sage.structure.element cimport RingElement, Element, ModuleElement, FieldElement
from sage.structure.parent cimport Parent
from sage.structure.parent_gens import ParentWithGens
-from sage.structure.sage_object cimport rich_to_bool
+from sage.structure.richcmp cimport rich_to_bool
from sage.categories.morphism cimport Morphism
from sage.structure.coerce cimport is_numpy_type
diff --git a/src/sage/rings/complex_mpc.pyx b/src/sage/rings/complex_mpc.pyx
index 2c1b137..abd46a3 100644
--- a/src/sage/rings/complex_mpc.pyx
+++ b/src/sage/rings/complex_mpc.pyx
@@ -77,7 +77,7 @@ from sage.misc.randstate cimport randstate, current_randstate
from sage.misc.superseded import deprecated_function_alias
from .real_mpfr cimport RealField_class, RealNumber
from .real_mpfr import mpfr_prec_min, mpfr_prec_max
-from sage.structure.sage_object cimport rich_to_bool, richcmp
+from sage.structure.richcmp cimport rich_to_bool, richcmp
NumberFieldElement_quadratic = None
AlgebraicNumber_base = None
diff --git a/src/sage/rings/finite_rings/element_givaro.pyx b/src/sage/rings/finite_rings/element_givaro.pyx
index 743ac9f..cb0ed43 100644
--- a/src/sage/rings/finite_rings/element_givaro.pyx
+++ b/src/sage/rings/finite_rings/element_givaro.pyx
@@ -61,7 +61,8 @@ from sage.rings.finite_rings.finite_field_base cimport FiniteField
from sage.rings.ring cimport Ring
from .element_ext_pari import FiniteField_ext_pariElement
from .element_pari_ffelt cimport FiniteFieldElement_pari_ffelt
-from sage.structure.sage_object cimport SageObject, richcmp
+from sage.structure.richcmp cimport richcmp
+from sage.structure.sage_object cimport SageObject
from sage.structure.element cimport Element, ModuleElement, RingElement
import operator
import sage.arith.all
diff --git a/src/sage/rings/finite_rings/element_ntl_gf2e.pyx b/src/sage/rings/finite_rings/element_ntl_gf2e.pyx
index c46207d..3c974ed 100644
--- a/src/sage/rings/finite_rings/element_ntl_gf2e.pyx
+++ b/src/sage/rings/finite_rings/element_ntl_gf2e.pyx
@@ -25,8 +25,9 @@ include "cysignals/signals.pxi"
include "sage/libs/ntl/decl.pxi"
from cypari2.paridecl cimport *
-from sage.structure.sage_object cimport (SageObject, richcmp,
- richcmp_not_equal, rich_to_bool)
+from sage.structure.richcmp cimport (richcmp,
+ richcmp_not_equal, rich_to_bool)
+from sage.structure.sage_object cimport SageObject
from sage.structure.element cimport Element, ModuleElement, RingElement
from sage.structure.parent cimport Parent
diff --git a/src/sage/rings/finite_rings/residue_field.pyx b/src/sage/rings/finite_rings/residue_field.pyx
index 7a58502..ca389e1 100644
--- a/src/sage/rings/finite_rings/residue_field.pyx
+++ b/src/sage/rings/finite_rings/residue_field.pyx
@@ -172,7 +172,7 @@ from sage.rings.polynomial.polynomial_element import is_Polynomial
from sage.structure.factory import UniqueFactory
from sage.structure.element cimport parent
-from sage.structure.sage_object cimport richcmp, richcmp_not_equal
+from sage.structure.richcmp cimport richcmp, richcmp_not_equal
class ResidueFieldFactory(UniqueFactory):
diff --git a/src/sage/rings/fraction_field_element.pyx b/src/sage/rings/fraction_field_element.pyx
index afefa43..80b3b00 100644
--- a/src/sage/rings/fraction_field_element.pyx
+++ b/src/sage/rings/fraction_field_element.pyx
@@ -39,7 +39,7 @@ import operator
from sage.structure.element cimport (FieldElement, ModuleElement, RingElement,
Element)
from sage.structure.element import parent
-from sage.structure.sage_object cimport richcmp
+from sage.structure.richcmp cimport richcmp
import integer_ring
from integer_ring import ZZ
diff --git a/src/sage/rings/function_field/function_field_element.pyx b/src/sage/rings/function_field/function_field_element.pyx
index 8023903..7b5fb6f 100644
--- a/src/sage/rings/function_field/function_field_element.pyx
+++ b/src/sage/rings/function_field/function_field_element.pyx
@@ -25,7 +25,7 @@ AUTHORS:
from sage.structure.element cimport FieldElement, RingElement, ModuleElement, Element
-from sage.structure.sage_object cimport richcmp, richcmp_not_equal
+from sage.structure.richcmp cimport richcmp, richcmp_not_equal
def is_FunctionFieldElement(x):
diff --git a/src/sage/rings/integer.pyx b/src/sage/rings/integer.pyx
index 3f01782..8f4a94d 100644
--- a/src/sage/rings/integer.pyx
+++ b/src/sage/rings/integer.pyx
@@ -339,7 +339,8 @@ cdef _digits_internal(mpz_t v,l,int offset,int power_index,power_list,digits):
mpz_clear(mpz_quot)
mpz_clear(mpz_res)
-from sage.structure.sage_object cimport SageObject, rich_to_bool_sgn
+from sage.structure.sage_object cimport SageObject
+from sage.structure.richcmp cimport rich_to_bool_sgn
from sage.structure.element cimport EuclideanDomainElement, ModuleElement, Element
from sage.structure.element import bin_op
from sage.structure.coerce_exceptions import CoercionException
diff --git a/src/sage/rings/integer_ring.pyx b/src/sage/rings/integer_ring.pyx
index 14639f7..1e4d05e 100644
--- a/src/sage/rings/integer_ring.pyx
+++ b/src/sage/rings/integer_ring.pyx
@@ -64,7 +64,7 @@ from sage.categories.infinite_enumerated_sets import InfiniteEnumeratedSets
from sage.structure.coerce cimport is_numpy_type
from sage.structure.parent_gens import ParentWithGens
from sage.structure.parent cimport Parent
-from sage.structure.sage_object cimport rich_to_bool
+from sage.structure.richcmp cimport rich_to_bool
from sage.structure.sequence import Sequence
from sage.misc.misc_c import prod
diff --git a/src/sage/rings/laurent_series_ring_element.pyx b/src/sage/rings/laurent_series_ring_element.pyx
index 35442e8..53518ac 100644
--- a/src/sage/rings/laurent_series_ring_element.pyx
+++ b/src/sage/rings/laurent_series_ring_element.pyx
@@ -63,7 +63,7 @@ from sage.rings.integer import Integer
from sage.rings.polynomial.laurent_polynomial import LaurentPolynomial_univariate
from .power_series_ring_element cimport PowerSeries
from sage.structure.element cimport Element, ModuleElement, RingElement, AlgebraElement
-from sage.structure.sage_object cimport richcmp_not_equal, rich_to_bool
+from sage.structure.richcmp cimport richcmp_not_equal, rich_to_bool
from sage.misc.derivative import multi_derivative
diff --git a/src/sage/rings/morphism.pyx b/src/sage/rings/morphism.pyx
index 9e2a88d..47e429f 100644
--- a/src/sage/rings/morphism.pyx
+++ b/src/sage/rings/morphism.pyx
@@ -357,8 +357,8 @@ from __future__ import print_function
import ideal
import homset
from cpython.object cimport Py_EQ, Py_NE
-from sage.structure.sage_object cimport (richcmp, rich_to_bool,
- richcmp_not_equal)
+from sage.structure.richcmp cimport (richcmp, rich_to_bool,
+ richcmp_not_equal)
def is_RingHomomorphism(phi):
diff --git a/src/sage/rings/multi_power_series_ring_element.py b/src/sage/rings/multi_power_series_ring_element.py
index be398ae..45d67d5 100644
--- a/src/sage/rings/multi_power_series_ring_element.py
+++ b/src/sage/rings/multi_power_series_ring_element.py
@@ -157,7 +157,7 @@ AUTHORS:
#*****************************************************************************
from six import iteritems, integer_types
-from sage.structure.sage_object import richcmp
+from sage.structure.richcmp import richcmp
from sage.rings.finite_rings.integer_mod_ring import Zmod
from sage.rings.infinity import infinity, is_Infinite
diff --git a/src/sage/rings/number_field/number_field_element.pyx b/src/sage/rings/number_field/number_field_element.pyx
index 772ceba..4aaeb6b 100644
--- a/src/sage/rings/number_field/number_field_element.pyx
+++ b/src/sage/rings/number_field/number_field_element.pyx
@@ -44,7 +44,7 @@ from sage.libs.mpfi cimport mpfi_t, mpfi_init, mpfi_set, mpfi_clear, mpfi_div_z,
from sage.libs.mpfr cimport mpfr_less_p, mpfr_greater_p, mpfr_greaterequal_p
from sage.libs.ntl.error import NTLError
from cpython.object cimport Py_EQ, Py_NE, Py_LT, Py_GT, Py_LE, Py_GE
-from sage.structure.sage_object cimport rich_to_bool
+from sage.structure.richcmp cimport rich_to_bool
import sage.rings.infinity
import sage.rings.polynomial.polynomial_element
diff --git a/src/sage/rings/number_field/number_field_element_quadratic.pyx b/src/sage/rings/number_field/number_field_element_quadratic.pyx
index 7ac8c88..4762ad2 100644
--- a/src/sage/rings/number_field/number_field_element_quadratic.pyx
+++ b/src/sage/rings/number_field/number_field_element_quadratic.pyx
@@ -42,7 +42,7 @@ from sage.libs.mpfi cimport mpfi_set_z, mpfi_set_q, mpfi_sqrt, mpfi_add_z, mpfi_
from sage.structure.parent_base cimport ParentWithBase
from sage.structure.element cimport Element, ModuleElement, RingElement
-from sage.structure.sage_object cimport rich_to_bool_sgn
+from sage.structure.richcmp cimport rich_to_bool_sgn
from sage.rings.rational cimport Rational
from sage.rings.integer_ring import ZZ
diff --git a/src/sage/rings/padics/morphism.pyx b/src/sage/rings/padics/morphism.pyx
index 3e33397..7accf76 100644
--- a/src/sage/rings/padics/morphism.pyx
+++ b/src/sage/rings/padics/morphism.pyx
@@ -18,8 +18,8 @@ from sage.rings.infinity import Infinity
from sage.rings.ring import CommutativeRing
from sage.categories.homset import Hom
from sage.structure.element cimport Element
-from sage.structure.sage_object cimport (richcmp, rich_to_bool,
- richcmp_not_equal)
+from sage.structure.richcmp cimport (richcmp, rich_to_bool,
+ richcmp_not_equal)
from sage.rings.morphism cimport RingHomomorphism
from padic_generic import pAdicGeneric
diff --git a/src/sage/rings/padics/padic_base_leaves.py b/src/sage/rings/padics/padic_base_leaves.py
index 376c859..5cb7012 100644
--- a/src/sage/rings/padics/padic_base_leaves.py
+++ b/src/sage/rings/padics/padic_base_leaves.py
@@ -188,7 +188,7 @@ from __future__ import absolute_import
#
# http://www.gnu.org/licenses/
#*****************************************************************************
-from sage.structure.sage_object import op_LE
+from sage.structure.richcmp import op_LE
from .generic_nodes import pAdicFieldBaseGeneric, \
pAdicCappedRelativeFieldGeneric, \
diff --git a/src/sage/rings/padics/padic_extension_generic.py b/src/sage/rings/padics/padic_extension_generic.py
index d1c36d6..cd904fd 100644
--- a/src/sage/rings/padics/padic_extension_generic.py
+++ b/src/sage/rings/padics/padic_extension_generic.py
@@ -22,7 +22,7 @@ from __future__ import absolute_import
from .padic_generic import pAdicGeneric
from .padic_base_generic import pAdicBaseGeneric
-from sage.structure.sage_object import op_EQ
+from sage.structure.richcmp import op_EQ
from functools import