trac 21887 undo aliasing in pxi files too

src/sage/rings/padics/CA_template.pxi

@@ -605,7 +605,7 @@ cdef class CAElement(pAdicTemplateElement):
                 return True
         return mpz_cmp_si((<Integer>absprec).value, val) <= 0
 
-    def __bool__(self):
+    def __nonzero__(self):
         """
         Whether this element should be considered true in a boolean context.
 
@@ -621,8 +621,6 @@ cdef class CAElement(pAdicTemplateElement):
         """
         return not ciszero(self.value, self.prime_pow)
 
-    __nonzero__ = __bool__
-
     def is_equal_to(self, _right, absprec=None):
         r"""
         Determines whether the inputs are equal modulo

src/sage/rings/padics/CR_template.pxi

@@ -959,7 +959,7 @@ cdef class CRElement(pAdicTemplateElement):
                 return True
         return mpz_cmp_si((<Integer>absprec).value, self.ordp) <= 0
 
-    def __bool__(self):
+    def __nonzero__(self):
         """
         Returns True if self is distinguishable from zero.
 
@@ -975,8 +975,6 @@ cdef class CRElement(pAdicTemplateElement):
         """
         return self.relprec != 0
 
-    __nonzero__ = __bool__
-
     def is_equal_to(self, _right, absprec=None):
         r"""
         Returns whether self is equal to right modulo

src/sage/rings/padics/FM_template.pxi

@@ -481,7 +481,7 @@ cdef class FMElement(pAdicTemplateElement):
         cdef long val = self.valuation_c()
         return mpz_cmp_si((<Integer>absprec).value, val) <= 0
 
-    def __bool__(self):
+    def __nonzero__(self):
         """
         Returns True if this element is distinguishable from zero.
 
@@ -497,8 +497,6 @@ cdef class FMElement(pAdicTemplateElement):
         """
         return not ciszero(self.value, self.prime_pow)
 
-    __nonzero__ = __bool__
-
     def is_equal_to(self, _right, absprec=None):
         r"""
         Returns whether this element is equal to ``right`` modulo `p^{\mbox{absprec}}`.

src/sage/rings/polynomial/polynomial_template.pxi

@@ -517,7 +517,7 @@ cdef class Polynomial_template(Polynomial):
             raise ValueError("Cannot coerce polynomial with degree %d to integer."%(self.degree()))
         return int(self[0])
 
-    def __bool__(self):
+    def __nonzero__(self):
         """
         EXAMPLE::
 
@@ -529,8 +529,6 @@ cdef class Polynomial_template(Polynomial):
         """
         return not celement_is_zero(&self.x, (<Polynomial_template>self)._cparent)
 
-    __nonzero__ = __bool__
-
     cpdef int _cmp_(left, right) except -2:
         """
         EXAMPLE::