Ticket #11868: trac_11868-remove_workarounds.patch

sage/libs/pari/gen.pyx

@@ -7474 +7474 @@
 
             sage: x = polygen(QQ)
             sage: K.<t> = NumberField(x^3 - x + 1)
-            sage: pari(K).nfhilbert(t, t+2)  # not tested, known bug #11868
+            sage: pari(K).nfhilbert(t, t + 2)
             -1
             sage: pari(K).nfhilbert(pari(t), pari(t+2))
             -1
             sage: P = K.ideal(t^2 + t - 2)   # Prime ideal above 5
+            sage: pari(K).nfhilbert(t, t + 2, P.pari_prime())
+            -1
             sage: pari(K).nfhilbert(pari(t), pari(t+2), P.pari_prime())
             -1
             sage: P = K.ideal(t^2 + 3*t - 1) # Prime ideal above 23, ramified
+            sage: pari(K).nfhilbert(t, t + 2, P.pari_prime())
+            1
             sage: pari(K).nfhilbert(pari(t), pari(t+2), P.pari_prime())
             1
         """

sage/rings/number_field/number_field.py

@@ -7699 +7699 @@
         a = self(a)
         b = self(b)
         if P is None:
-            # We MUST convert a and b to pari before calling the function
-            # to work around Trac #11868 -- Jeroen Demeyer
-            return pari(self).nfhilbert(pari(a), pari(b))
+            return pari(self).nfhilbert(a, b)
 
         from sage.rings.morphism import is_RingHomomorphism
         if is_RingHomomorphism(P):
@@ -7728 +7726 @@
             raise ValueError, "P (=%s) should be an ideal of self (=%s) in hilbert_symbol, not of %s" % (P, self, P.number_field())
         if not P.is_prime():
             raise ValueError, "Non-prime ideal P (=%s) in hilbert_symbol" % P
-        # We MUST convert a and b to pari before calling the function
-        # to work around Trac #11868 -- Jeroen Demeyer
-        return pari(self).nfhilbert(pari(a), pari(b), P.pari_prime())
+        return pari(self).nfhilbert(a, b, P.pari_prime())
         
     def hilbert_conductor(self,a,b):
         """

sage/schemes/elliptic_curves/ell_point.py

@@ -431 +431 @@
             sage: P._pari_()
             [Mod(1, 11), Mod(2, 11)]
 
-        We need to explicitly call ``pari()`` because of :trac:`11868`::
-
-            sage: pari(E).elladd(pari(O), pari(P))
+        We no longer need to explicitly call ``pari(O)`` and ``pari(P)``
+        after :trac:`11868`::
+
+            sage: pari(E).elladd(O, P)
             [Mod(1, 11), Mod(2, 11)]
         """
         if self[2]: