sage.rings.function_field: Update from #35095

Author: Matthias Koeppe

src/sage/rings/function_field/drinfeld_modules/drinfeld_module.py

@@ -36,12 +36,12 @@
 from sage.rings.integer_ring import ZZ
 from sage.rings.polynomial.ore_polynomial_element import OrePolynomial
 from sage.rings.polynomial.polynomial_ring import PolynomialRing_general
-from sage.rings.ring_extension import RingExtension_generic
 from sage.structure.parent import Parent
 from sage.structure.sage_object import SageObject
 from sage.structure.sequence import Sequence
 from sage.structure.unique_representation import UniqueRepresentation
 
+lazy_import('sage.rings.ring_extension', 'RingExtension_generic')
 lazy_import('sage.rings.lazy_series_ring', 'LazyPowerSeriesRing')
 
 

src/sage/rings/function_field/function_field.py

@@ -1015,11 +1015,7 @@ def space_of_holomorphic_differentials(self):
         EXAMPLES::
 
             sage: K.<t> = FunctionField(QQ)
-<<<<<<< HEAD
-            sage: K.space_of_holomorphic_differentials()                                # optional - sage.modules
-=======
             sage: K.space_of_holomorphic_differentials()                                # needs sage.libs.pari sage.modules
->>>>>>> 0e22212ec9 (./sage -fixdoctests --distribution sagemath-categories --probe all --only-tags src/sage/rings/function_field)
             (Vector space of dimension 0 over Rational Field,
              Linear map:
                From: Vector space of dimension 0 over Rational Field
@@ -1052,11 +1048,7 @@ def basis_of_holomorphic_differentials(self):
         EXAMPLES::
 
             sage: K.<t> = FunctionField(QQ)
-<<<<<<< HEAD
-            sage: K.basis_of_holomorphic_differentials()                                # optional - sage.modules
-=======
             sage: K.basis_of_holomorphic_differentials()                                # needs sage.libs.pari sage.modules
->>>>>>> 0e22212ec9 (./sage -fixdoctests --distribution sagemath-categories --probe all --only-tags src/sage/rings/function_field)
             []
 
             sage: K.<x> = FunctionField(GF(5)); _.<Y> = K[]