Fixing build and doctest errors

Author: roed314

src/sage/misc/session.pyx

@@ -215,7 +215,7 @@ def show_identifiers(hidden=False):
         ['__', '_i', '_6', '_4', '_3', '_1', '_ii', '__doc__', '__builtins__', '___', '_9', '__name__', '_', 'a', '_i12', '_i14', 'factor', '__file__', '_hello', '_i13', '_i11', '_i10', '_i15', '_i5', '_13', '_10', '_iii', '_i9', '_i8', '_i7', '_i6', '_i4', '_i3', '_i2', '_i1', '_init_cmdline', '_14']
     """
     state = caller_locals()
-    return [x for x, v in state.iteritems() if _is_new_var(x, v, hidden)]
+    return sorted([x for x, v in state.iteritems() if _is_new_var(x, v, hidden)])
 
 def save_session(name='sage_session', verbose=False):
     r"""
@@ -288,6 +288,7 @@ def save_session(name='sage_session', verbose=False):
 
         sage: g = cython_lambda('double x', 'x*x + 1.5')
         sage: save_session(tmp_f, verbose=True)
+        Saving...
         Not saving g: g is a function, method, class or type
         ...
     """

src/sage/rings/padics/padic_base_leaves.py

@@ -457,7 +457,7 @@ def _coerce_map_from_(self, R):
         if isinstance(R, pAdicRingFloatingPoint) and R.prime() == self.prime():
             if R.precision_cap() > self.precision_cap():
                 return True
-            elif R.precision_cap() == self.precision_cap() and self._printer.cmp_modes(R._printer) <= 0:
+            elif R.precision_cap() == self.precision_cap() and self._printer.richcmp_modes(R._printer, op_LE):
                 return True
 
     def _repr_(self, do_latex=False):
@@ -784,7 +784,7 @@ def _coerce_map_from_(self, R):
         if isinstance(R, (pAdicRingFloatingPoint, pAdicFieldFloatingPoint)) and R.prime() == self.prime():
             if R.precision_cap() > self.precision_cap():
                 return True
-            elif R.precision_cap() == self.precision_cap() and self._printer.cmp_modes(R._printer) <= 0:
+            elif R.precision_cap() == self.precision_cap() and self._printer.richcmp_modes(R._printer, op_LE):
                 return True
 
     def _repr_(self, do_latex=False):

src/sage/rings/padics/padic_floating_point_element.pxd

@@ -1,5 +1,5 @@
 from sage.libs.gmp.types cimport mpz_t
-from sage.libs.cypari2.gen cimport gen as pari_gen
+from sage.libs.cypari2.gen cimport Gen as pari_gen
 
 ctypedef mpz_t celement
 include "FP_template_header.pxi"

src/sage/rings/padics/padic_floating_point_element.pyx

@@ -21,7 +21,7 @@ AUTHORS:
 include "sage/libs/linkages/padics/mpz.pxi"
 include "FP_template.pxi"
 
-from sage.libs.cypari2.pari_instance cimport pari_instance as pari
+from sage.libs.pari.all import pari
 from sage.libs.pari.convert_gmp cimport new_gen_from_padic
 from sage.rings.finite_rings.integer_mod import Mod
 

src/sage/rings/padics/qadic_flint_FP.pxd

@@ -1,4 +1,4 @@
-from sage.libs.cypari2.gen cimport gen as pari_gen
+from sage.libs.cypari2.gen cimport Gen as pari_gen
 from sage.libs.flint.fmpz_poly cimport fmpz_poly_t
 from sage.rings.padics.pow_computer_flint cimport PowComputer_flint_unram
 cdef class PowComputer_(PowComputer_flint_unram):