summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeroen Demeyer <jdemeyer@cage.ugent.be>2017-06-02 21:16:33 +0200
committerJeroen Demeyer <jdemeyer@cage.ugent.be>2017-06-02 21:16:33 +0200
commit031761f6ead116e4fa0a0fd3bf21fca5546df6d7 (patch)
treebd3568a69dba09329891814970f69f13bcfe3c33
parentMerge tag '8.0.beta9' into t/23103/move_richcmp_stuff_to_new_file (diff)
-rw-r--r--src/sage/rings/padics/padic_generic.py2
-rw-r--r--src/sage/schemes/elliptic_curves/weierstrass_morphism.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/sage/rings/padics/padic_generic.py b/src/sage/rings/padics/padic_generic.py
index 079d2cd..67ca667 100644
--- a/src/sage/rings/padics/padic_generic.py
+++ b/src/sage/rings/padics/padic_generic.py
@@ -38,7 +38,7 @@ from sage.rings.integer import Integer
from sage.rings.padics.padic_printing import pAdicPrinter
from sage.rings.padics.precision_error import PrecisionError
from sage.misc.cachefunc import cached_method
-from sage.structure.sage_object import richcmp_not_equal
+from sage.structure.richcmp import richcmp_not_equal
class pAdicGeneric(PrincipalIdealDomain, LocalGeneric):
diff --git a/src/sage/schemes/elliptic_curves/weierstrass_morphism.py b/src/sage/schemes/elliptic_curves/weierstrass_morphism.py
index 86648d7..8e39aba 100644
--- a/src/sage/schemes/elliptic_curves/weierstrass_morphism.py
+++ b/src/sage/schemes/elliptic_curves/weierstrass_morphism.py
@@ -26,8 +26,8 @@ from __future__ import absolute_import
from sage.categories.morphism import Morphism
from .constructor import EllipticCurve
from sage.categories.homset import Hom
-from sage.structure.sage_object import (richcmp, richcmp_not_equal,
- op_NE, op_EQ, op_LT)
+from sage.structure.richcmp import (richcmp, richcmp_not_equal,
+ op_NE, op_EQ, op_LT)
class baseWI: