Fixing problems revealed by tests

sagemath · Jun 14, 2017 · a88b630 · a88b630
1 parent e16f79f
commit a88b630
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/sage/rings/padics/local_generic.py b/src/sage/rings/padics/local_generic.py
@@ -212,8 +212,8 @@ def change(self, **kwds):
         You can also change print modes::
 
             sage: R = Zp(5).change(prec=5, print_mode='digits')
-            sage: ~R(17)
-            ...13403
+            sage: repr(~R(17))
+            '...13403'
 
         You can change extensions::
 
@@ -256,6 +256,11 @@ def change(self, **kwds):
                 field = kwds.pop('field')
                 if field:
                     ring = ring.fraction_field()
+                    if 'type' not in kwds:
+                        if self._prec_type() == 'capped-abs':
+                            kwds['type'] = 'capped-rel'
+                        elif self._prec_type() == 'fixed-mod':
+                            raise TypeError('You must specify the type explicitly')
                 else:
                     ring = ring.ring_of_integers()
             for atr in ('p', 'prec', 'type'):
@@ -294,9 +299,11 @@ def change(self, **kwds):
             elif n is not None:
                 functor.polys = [n]
             for atr in ('names', 'var_name', 'res_name', 'unram_name', 'ram_name'):
-                functor.kwds[atr] = kwds.pop(atr)
+                if atr in kwds:
+                    functor.kwds[atr] = kwds.pop(atr)
             for atr in ('print_mode', 'halt', 'print_pos', 'print_sep', 'print_alphabet', 'print_max_terms', 'check'):
-                functor.kwds[atr] = kwds[atr]
+                if atr in kwds:
+                    functor.kwds[atr] = kwds[atr]
             try:
                 ring = ring.change(**kwds)
             except AttributeError:

diff --git a/src/sage/rings/padics/padic_extension_generic.py b/src/sage/rings/padics/padic_extension_generic.py
@@ -264,7 +264,7 @@ def construction(self):
         """
         from sage.categories.pushout import AlgebraicExtensionFunctor as AEF
         print_mode = self._printer.dict()
-        return (AEF([self._given_poly], [self.variable_name()],
+        return (AEF([self._pre_poly], [self.variable_name()],
                     prec=self.precision_cap(), print_mode=self._printer.dict(),
                     implementation=self._implementation),
                 self.base_ring())