5c5
< # Parent 900987e90d34a4d8b3075b3ce15fb9ea5b176cce
---
> # Parent 216c066ba7528d60ef6439664addd703d9670480
10,13c10,13
< diff --git a/sage/categories/category.py b/sage/categories/category.py
< --- a/sage/categories/category.py
< +++ b/sage/categories/category.py
< @@ -971,9 +971,9 @@
---
> diff -r 216c066ba752 sage/categories/category.py
> --- a/sage/categories/category.py Fri May 06 15:36:00 2011 +0200
> +++ b/sage/categories/category.py Thu May 19 14:34:14 2011 +0200
> @@ -989,9 +989,9 @@
25,27c25,27
< diff --git a/sage/categories/pushout.py b/sage/categories/pushout.py
< --- a/sage/categories/pushout.py
< +++ b/sage/categories/pushout.py
---
> diff -r 216c066ba752 sage/categories/pushout.py
> --- a/sage/categories/pushout.py Fri May 06 15:36:00 2011 +0200
> +++ b/sage/categories/pushout.py Thu May 19 14:34:14 2011 +0200
125,127c125,127
< diff --git a/sage/modular/cusps.py b/sage/modular/cusps.py
< --- a/sage/modular/cusps.py
< +++ b/sage/modular/cusps.py
---
> diff -r 216c066ba752 sage/modular/cusps.py
> --- a/sage/modular/cusps.py Fri May 06 15:36:00 2011 +0200
> +++ b/sage/modular/cusps.py Thu May 19 14:34:14 2011 +0200
161,163c161,163
< diff --git a/sage/modular/cusps_nf.py b/sage/modular/cusps_nf.py
< --- a/sage/modular/cusps_nf.py
< +++ b/sage/modular/cusps_nf.py
---
> diff -r 216c066ba752 sage/modular/cusps_nf.py
> --- a/sage/modular/cusps_nf.py Fri May 06 15:36:00 2011 +0200
> +++ b/sage/modular/cusps_nf.py Thu May 19 14:34:14 2011 +0200
209,211c209,211
< diff --git a/sage/modular/overconvergent/genus0.py b/sage/modular/overconvergent/genus0.py
< --- a/sage/modular/overconvergent/genus0.py
< +++ b/sage/modular/overconvergent/genus0.py
---
> diff -r 216c066ba752 sage/modular/overconvergent/genus0.py
> --- a/sage/modular/overconvergent/genus0.py Fri May 06 15:36:00 2011 +0200
> +++ b/sage/modular/overconvergent/genus0.py Thu May 19 14:34:14 2011 +0200
251,253c251,253
< diff --git a/sage/modular/overconvergent/weightspace.py b/sage/modular/overconvergent/weightspace.py
< --- a/sage/modular/overconvergent/weightspace.py
< +++ b/sage/modular/overconvergent/weightspace.py
---
> diff -r 216c066ba752 sage/modular/overconvergent/weightspace.py
> --- a/sage/modular/overconvergent/weightspace.py Fri May 06 15:36:00 2011 +0200
> +++ b/sage/modular/overconvergent/weightspace.py Thu May 19 14:34:14 2011 +0200
282,284c282,284
< diff --git a/sage/modules/free_module_homspace.py b/sage/modules/free_module_homspace.py
< --- a/sage/modules/free_module_homspace.py
< +++ b/sage/modules/free_module_homspace.py
---
> diff -r 216c066ba752 sage/modules/free_module_homspace.py
> --- a/sage/modules/free_module_homspace.py Fri May 06 15:36:00 2011 +0200
> +++ b/sage/modules/free_module_homspace.py Thu May 19 14:34:14 2011 +0200
383,385c383,385
< diff --git a/sage/rings/finite_rings/element_givaro.pyx b/sage/rings/finite_rings/element_givaro.pyx
< --- a/sage/rings/finite_rings/element_givaro.pyx
< +++ b/sage/rings/finite_rings/element_givaro.pyx
---
> diff -r 216c066ba752 sage/rings/finite_rings/element_givaro.pyx
> --- a/sage/rings/finite_rings/element_givaro.pyx Fri May 06 15:36:00 2011 +0200
> +++ b/sage/rings/finite_rings/element_givaro.pyx Thu May 19 14:34:14 2011 +0200
434,436c434,436
< diff --git a/sage/rings/finite_rings/finite_field_givaro.py b/sage/rings/finite_rings/finite_field_givaro.py
< --- a/sage/rings/finite_rings/finite_field_givaro.py
< +++ b/sage/rings/finite_rings/finite_field_givaro.py
---
> diff -r 216c066ba752 sage/rings/finite_rings/finite_field_givaro.py
> --- a/sage/rings/finite_rings/finite_field_givaro.py Fri May 06 15:36:00 2011 +0200
> +++ b/sage/rings/finite_rings/finite_field_givaro.py Thu May 19 14:34:14 2011 +0200
534,536c534,536
< diff --git a/sage/rings/polynomial/infinite_polynomial_element.py b/sage/rings/polynomial/infinite_polynomial_element.py
< --- a/sage/rings/polynomial/infinite_polynomial_element.py
< +++ b/sage/rings/polynomial/infinite_polynomial_element.py
---
> diff -r 216c066ba752 sage/rings/polynomial/infinite_polynomial_element.py
> --- a/sage/rings/polynomial/infinite_polynomial_element.py Fri May 06 15:36:00 2011 +0200
> +++ b/sage/rings/polynomial/infinite_polynomial_element.py Thu May 19 14:34:14 2011 +0200
552,554c552,554
< diff --git a/sage/rings/polynomial/laurent_polynomial_ring.py b/sage/rings/polynomial/laurent_polynomial_ring.py
< --- a/sage/rings/polynomial/laurent_polynomial_ring.py
< +++ b/sage/rings/polynomial/laurent_polynomial_ring.py
---
> diff -r 216c066ba752 sage/rings/polynomial/laurent_polynomial_ring.py
> --- a/sage/rings/polynomial/laurent_polynomial_ring.py Fri May 06 15:36:00 2011 +0200
> +++ b/sage/rings/polynomial/laurent_polynomial_ring.py Thu May 19 14:34:14 2011 +0200
591,593c591,593
< diff --git a/sage/rings/polynomial/multi_polynomial_element.py b/sage/rings/polynomial/multi_polynomial_element.py
< --- a/sage/rings/polynomial/multi_polynomial_element.py
< +++ b/sage/rings/polynomial/multi_polynomial_element.py
---
> diff -r 216c066ba752 sage/rings/polynomial/multi_polynomial_element.py
> --- a/sage/rings/polynomial/multi_polynomial_element.py Fri May 06 15:36:00 2011 +0200
> +++ b/sage/rings/polynomial/multi_polynomial_element.py Thu May 19 14:34:14 2011 +0200
619,621c619,621
< diff --git a/sage/rings/polynomial/multi_polynomial_libsingular.pxd b/sage/rings/polynomial/multi_polynomial_libsingular.pxd
< --- a/sage/rings/polynomial/multi_polynomial_libsingular.pxd
< +++ b/sage/rings/polynomial/multi_polynomial_libsingular.pxd
---
> diff -r 216c066ba752 sage/rings/polynomial/multi_polynomial_libsingular.pxd
> --- a/sage/rings/polynomial/multi_polynomial_libsingular.pxd Fri May 06 15:36:00 2011 +0200
> +++ b/sage/rings/polynomial/multi_polynomial_libsingular.pxd Thu May 19 14:34:14 2011 +0200
644,646c644,646
< diff --git a/sage/rings/polynomial/multi_polynomial_libsingular.pyx b/sage/rings/polynomial/multi_polynomial_libsingular.pyx
< --- a/sage/rings/polynomial/multi_polynomial_libsingular.pyx
< +++ b/sage/rings/polynomial/multi_polynomial_libsingular.pyx
---
> diff -r 216c066ba752 sage/rings/polynomial/multi_polynomial_libsingular.pyx
> --- a/sage/rings/polynomial/multi_polynomial_libsingular.pyx Fri May 06 15:36:00 2011 +0200
> +++ b/sage/rings/polynomial/multi_polynomial_libsingular.pyx Thu May 19 14:34:14 2011 +0200
721,723c721,723
< diff --git a/sage/rings/polynomial/multi_polynomial_ring.py b/sage/rings/polynomial/multi_polynomial_ring.py
< --- a/sage/rings/polynomial/multi_polynomial_ring.py
< +++ b/sage/rings/polynomial/multi_polynomial_ring.py
---
> diff -r 216c066ba752 sage/rings/polynomial/multi_polynomial_ring.py
> --- a/sage/rings/polynomial/multi_polynomial_ring.py Fri May 06 15:36:00 2011 +0200
> +++ b/sage/rings/polynomial/multi_polynomial_ring.py Thu May 19 14:34:14 2011 +0200
733,735c733,735
< diff --git a/sage/rings/polynomial/padics/polynomial_padic_capped_relative_dense.py b/sage/rings/polynomial/padics/polynomial_padic_capped_relative_dense.py
< --- a/sage/rings/polynomial/padics/polynomial_padic_capped_relative_dense.py
< +++ b/sage/rings/polynomial/padics/polynomial_padic_capped_relative_dense.py
---
> diff -r 216c066ba752 sage/rings/polynomial/padics/polynomial_padic_capped_relative_dense.py
> --- a/sage/rings/polynomial/padics/polynomial_padic_capped_relative_dense.py Fri May 06 15:36:00 2011 +0200
> +++ b/sage/rings/polynomial/padics/polynomial_padic_capped_relative_dense.py Thu May 19 14:34:14 2011 +0200
823,825c823,825
< diff --git a/sage/rings/polynomial/polynomial_compiled.pyx b/sage/rings/polynomial/polynomial_compiled.pyx
< --- a/sage/rings/polynomial/polynomial_compiled.pyx
< +++ b/sage/rings/polynomial/polynomial_compiled.pyx
---
> diff -r 216c066ba752 sage/rings/polynomial/polynomial_compiled.pyx
> --- a/sage/rings/polynomial/polynomial_compiled.pyx Fri May 06 15:36:00 2011 +0200
> +++ b/sage/rings/polynomial/polynomial_compiled.pyx Thu May 19 14:34:14 2011 +0200
836,838c836,838
< diff --git a/sage/rings/polynomial/polynomial_element.pxd b/sage/rings/polynomial/polynomial_element.pxd
< --- a/sage/rings/polynomial/polynomial_element.pxd
< +++ b/sage/rings/polynomial/polynomial_element.pxd
---
> diff -r 216c066ba752 sage/rings/polynomial/polynomial_element.pxd
> --- a/sage/rings/polynomial/polynomial_element.pxd Fri May 06 15:36:00 2011 +0200
> +++ b/sage/rings/polynomial/polynomial_element.pxd Thu May 19 14:34:14 2011 +0200
870,872c870,872
< diff --git a/sage/rings/polynomial/polynomial_element.pyx b/sage/rings/polynomial/polynomial_element.pyx
< --- a/sage/rings/polynomial/polynomial_element.pyx
< +++ b/sage/rings/polynomial/polynomial_element.pyx
---
> diff -r 216c066ba752 sage/rings/polynomial/polynomial_element.pyx
> --- a/sage/rings/polynomial/polynomial_element.pyx Fri May 06 15:36:00 2011 +0200
> +++ b/sage/rings/polynomial/polynomial_element.pyx Thu May 19 14:34:14 2011 +0200
1067c1067
< @@ -5171,14 +5193,14 @@
---
> @@ -5173,14 +5195,14 @@
1085c1085
< @@ -5303,7 +5325,7 @@
---
> @@ -5305,7 +5327,7 @@
1094c1094
< @@ -5325,7 +5347,7 @@
---
> @@ -5327,7 +5349,7 @@
1103c1103
< @@ -5335,7 +5357,8 @@
---
> @@ -5337,7 +5359,8 @@
1113c1113
< @@ -5543,6 +5566,13 @@
---
> @@ -5545,6 +5568,13 @@
1127c1127
< @@ -5558,12 +5588,19 @@
---
> @@ -5560,12 +5590,19 @@
1149c1149
< @@ -5573,56 +5610,70 @@
---
> @@ -5575,56 +5612,70 @@
1244c1244
< @@ -5675,7 +5726,7 @@
---
> @@ -5677,7 +5728,7 @@
1253c1253
< @@ -5696,7 +5747,7 @@
---
> @@ -5698,7 +5749,7 @@
1262c1262
< @@ -5727,7 +5778,7 @@
---
> @@ -5729,7 +5780,7 @@
1271c1271
< @@ -5748,10 +5799,11 @@
---
> @@ -5750,10 +5801,11 @@
1286c1286
< @@ -5770,11 +5822,11 @@
---
> @@ -5772,11 +5824,11 @@
1300c1300
< @@ -5806,11 +5858,11 @@
---
> @@ -5808,11 +5860,11 @@
1314c1314
< @@ -5833,9 +5885,10 @@
---
> @@ -5835,9 +5887,10 @@
1328c1328
< @@ -5844,9 +5897,10 @@
---
> @@ -5846,9 +5899,10 @@
1342c1342
< @@ -5876,7 +5930,7 @@
---
> @@ -5878,7 +5932,7 @@
1351c1351
< @@ -5942,14 +5996,14 @@
---
> @@ -5944,14 +5998,14 @@
1369c1369
< @@ -5978,10 +6032,12 @@
---
> @@ -5980,10 +6034,12 @@
1386c1386
< @@ -5999,8 +6055,28 @@
---
> @@ -6001,8 +6057,28 @@
1417c1417
< @@ -6021,7 +6097,10 @@
---
> @@ -6023,7 +6099,10 @@
1429c1429
< @@ -6030,52 +6109,44 @@
---
> @@ -6032,52 +6111,44 @@
1436c1436
< - the base ring element with the One by means of ``_rmul_``.
---
> - the base ring element with the One by means of `_rmul_`.
1449,1450c1449,1450
< - We use ``_rmul_`` and not ``_lmul_`` since for many polynomial rings
< - ``_lmul_`` simply calls ``_rmul_``.
---
> - We use `_rmul_` and not `_lmul_` since for many polynomial rings
> - `_lmul_` simply calls `_rmul_`.
1488,1489c1488,1489
< - By trac ticket #9944, there are now only very few exceptions::
< -
---
> By trac ticket #9944, there are now only very few exceptions::
>
1491,1492d1490
< + There are only very few exceptions::
< +
1497c1495
< @@ -6083,7 +6154,7 @@
---
> @@ -6085,7 +6156,7 @@
1506c1504
< @@ -6109,34 +6180,12 @@
---
> @@ -6111,34 +6182,12 @@
1544c1542
< @@ -6150,9 +6199,7 @@
---
> @@ -6152,9 +6201,7 @@
1555c1553
< @@ -6162,7 +6209,12 @@
---
> @@ -6164,7 +6211,12 @@
1569,1571c1567,1569
< diff --git a/sage/rings/polynomial/polynomial_element_generic.py b/sage/rings/polynomial/polynomial_element_generic.py
< --- a/sage/rings/polynomial/polynomial_element_generic.py
< +++ b/sage/rings/polynomial/polynomial_element_generic.py
---
> diff -r 216c066ba752 sage/rings/polynomial/polynomial_element_generic.py
> --- a/sage/rings/polynomial/polynomial_element_generic.py Fri May 06 15:36:00 2011 +0200
> +++ b/sage/rings/polynomial/polynomial_element_generic.py Thu May 19 14:34:14 2011 +0200
1591,1593c1589,1591
< diff --git a/sage/rings/polynomial/polynomial_integer_dense_flint.pxd b/sage/rings/polynomial/polynomial_integer_dense_flint.pxd
< --- a/sage/rings/polynomial/polynomial_integer_dense_flint.pxd
< +++ b/sage/rings/polynomial/polynomial_integer_dense_flint.pxd
---
> diff -r 216c066ba752 sage/rings/polynomial/polynomial_integer_dense_flint.pxd
> --- a/sage/rings/polynomial/polynomial_integer_dense_flint.pxd Fri May 06 15:36:00 2011 +0200
> +++ b/sage/rings/polynomial/polynomial_integer_dense_flint.pxd Thu May 19 14:34:14 2011 +0200
1602,1604c1600,1602
< diff --git a/sage/rings/polynomial/polynomial_integer_dense_flint.pyx b/sage/rings/polynomial/polynomial_integer_dense_flint.pyx
< --- a/sage/rings/polynomial/polynomial_integer_dense_flint.pyx
< +++ b/sage/rings/polynomial/polynomial_integer_dense_flint.pyx
---
> diff -r 216c066ba752 sage/rings/polynomial/polynomial_integer_dense_flint.pyx
> --- a/sage/rings/polynomial/polynomial_integer_dense_flint.pyx Fri May 06 15:36:00 2011 +0200
> +++ b/sage/rings/polynomial/polynomial_integer_dense_flint.pyx Thu May 19 14:34:14 2011 +0200
1635,1637c1633,1635
< diff --git a/sage/rings/polynomial/polynomial_rational_flint.pxd b/sage/rings/polynomial/polynomial_rational_flint.pxd
< --- a/sage/rings/polynomial/polynomial_rational_flint.pxd
< +++ b/sage/rings/polynomial/polynomial_rational_flint.pxd
---
> diff -r 216c066ba752 sage/rings/polynomial/polynomial_rational_flint.pxd
> --- a/sage/rings/polynomial/polynomial_rational_flint.pxd Fri May 06 15:36:00 2011 +0200
> +++ b/sage/rings/polynomial/polynomial_rational_flint.pxd Thu May 19 14:34:14 2011 +0200
1646,1648c1644,1646
< diff --git a/sage/rings/polynomial/polynomial_rational_flint.pyx b/sage/rings/polynomial/polynomial_rational_flint.pyx
< --- a/sage/rings/polynomial/polynomial_rational_flint.pyx
< +++ b/sage/rings/polynomial/polynomial_rational_flint.pyx
---
> diff -r 216c066ba752 sage/rings/polynomial/polynomial_rational_flint.pyx
> --- a/sage/rings/polynomial/polynomial_rational_flint.pyx Fri May 06 15:36:00 2011 +0200
> +++ b/sage/rings/polynomial/polynomial_rational_flint.pyx Thu May 19 14:34:14 2011 +0200
1696,1698c1694,1696
< diff --git a/sage/rings/polynomial/polynomial_real_mpfr_dense.pyx b/sage/rings/polynomial/polynomial_real_mpfr_dense.pyx
< --- a/sage/rings/polynomial/polynomial_real_mpfr_dense.pyx
< +++ b/sage/rings/polynomial/polynomial_real_mpfr_dense.pyx
---
> diff -r 216c066ba752 sage/rings/polynomial/polynomial_real_mpfr_dense.pyx
> --- a/sage/rings/polynomial/polynomial_real_mpfr_dense.pyx Fri May 06 15:36:00 2011 +0200
> +++ b/sage/rings/polynomial/polynomial_real_mpfr_dense.pyx Thu May 19 14:34:14 2011 +0200
1721,1723c1719,1721
< diff --git a/sage/rings/polynomial/polynomial_ring.py b/sage/rings/polynomial/polynomial_ring.py
< --- a/sage/rings/polynomial/polynomial_ring.py
< +++ b/sage/rings/polynomial/polynomial_ring.py
---
> diff -r 216c066ba752 sage/rings/polynomial/polynomial_ring.py
> --- a/sage/rings/polynomial/polynomial_ring.py Fri May 06 15:36:00 2011 +0200
> +++ b/sage/rings/polynomial/polynomial_ring.py Thu May 19 14:34:14 2011 +0200
2006,2008c2004,2006
< diff --git a/sage/rings/polynomial/polynomial_ring_constructor.py b/sage/rings/polynomial/polynomial_ring_constructor.py
< --- a/sage/rings/polynomial/polynomial_ring_constructor.py
< +++ b/sage/rings/polynomial/polynomial_ring_constructor.py
---
> diff -r 216c066ba752 sage/rings/polynomial/polynomial_ring_constructor.py
> --- a/sage/rings/polynomial/polynomial_ring_constructor.py Fri May 06 15:36:00 2011 +0200
> +++ b/sage/rings/polynomial/polynomial_ring_constructor.py Thu May 19 14:34:14 2011 +0200
2217,2219c2215,2217
< diff --git a/sage/rings/polynomial/polynomial_template.pxi b/sage/rings/polynomial/polynomial_template.pxi
< --- a/sage/rings/polynomial/polynomial_template.pxi
< +++ b/sage/rings/polynomial/polynomial_template.pxi
---
> diff -r 216c066ba752 sage/rings/polynomial/polynomial_template.pxi
> --- a/sage/rings/polynomial/polynomial_template.pxi Fri May 06 15:36:00 2011 +0200
> +++ b/sage/rings/polynomial/polynomial_template.pxi Thu May 19 14:34:14 2011 +0200
2237,2239c2235,2237
< diff --git a/sage/rings/polynomial/polynomial_zmod_flint.pxd b/sage/rings/polynomial/polynomial_zmod_flint.pxd
< --- a/sage/rings/polynomial/polynomial_zmod_flint.pxd
< +++ b/sage/rings/polynomial/polynomial_zmod_flint.pxd
---
> diff -r 216c066ba752 sage/rings/polynomial/polynomial_zmod_flint.pxd
> --- a/sage/rings/polynomial/polynomial_zmod_flint.pxd Fri May 06 15:36:00 2011 +0200
> +++ b/sage/rings/polynomial/polynomial_zmod_flint.pxd Thu May 19 14:34:14 2011 +0200
2248,2250c2246,2248
< diff --git a/sage/rings/polynomial/polynomial_zmod_flint.pyx b/sage/rings/polynomial/polynomial_zmod_flint.pyx
< --- a/sage/rings/polynomial/polynomial_zmod_flint.pyx
< +++ b/sage/rings/polynomial/polynomial_zmod_flint.pyx
---
> diff -r 216c066ba752 sage/rings/polynomial/polynomial_zmod_flint.pyx
> --- a/sage/rings/polynomial/polynomial_zmod_flint.pyx Fri May 06 15:36:00 2011 +0200
> +++ b/sage/rings/polynomial/polynomial_zmod_flint.pyx Thu May 19 14:34:14 2011 +0200
2287,2289c2285,2287
< diff --git a/sage/rings/polynomial/polynomial_zz_pex.pyx b/sage/rings/polynomial/polynomial_zz_pex.pyx
< --- a/sage/rings/polynomial/polynomial_zz_pex.pyx
< +++ b/sage/rings/polynomial/polynomial_zz_pex.pyx
---
> diff -r 216c066ba752 sage/rings/polynomial/polynomial_zz_pex.pyx
> --- a/sage/rings/polynomial/polynomial_zz_pex.pyx Fri May 06 15:36:00 2011 +0200
> +++ b/sage/rings/polynomial/polynomial_zz_pex.pyx Thu May 19 14:34:14 2011 +0200
2340,2342c2338,2340
< diff --git a/sage/rings/power_series_poly.pyx b/sage/rings/power_series_poly.pyx
< --- a/sage/rings/power_series_poly.pyx
< +++ b/sage/rings/power_series_poly.pyx
---
> diff -r 216c066ba752 sage/rings/power_series_poly.pyx
> --- a/sage/rings/power_series_poly.pyx Fri May 06 15:36:00 2011 +0200
> +++ b/sage/rings/power_series_poly.pyx Thu May 19 14:34:14 2011 +0200
2370,2372c2368,2370
< diff --git a/sage/rings/power_series_ring_element.pyx b/sage/rings/power_series_ring_element.pyx
< --- a/sage/rings/power_series_ring_element.pyx
< +++ b/sage/rings/power_series_ring_element.pyx
---
> diff -r 216c066ba752 sage/rings/power_series_ring_element.pyx
> --- a/sage/rings/power_series_ring_element.pyx Fri May 06 15:36:00 2011 +0200
> +++ b/sage/rings/power_series_ring_element.pyx Thu May 19 14:34:14 2011 +0200
2384,2386c2382,2384
< diff --git a/sage/rings/qqbar.py b/sage/rings/qqbar.py
< --- a/sage/rings/qqbar.py
< +++ b/sage/rings/qqbar.py
---
> diff -r 216c066ba752 sage/rings/qqbar.py
> --- a/sage/rings/qqbar.py Fri May 06 15:36:00 2011 +0200
> +++ b/sage/rings/qqbar.py Thu May 19 14:34:14 2011 +0200
2424,2426c2422,2424
< diff --git a/sage/rings/ring.pyx b/sage/rings/ring.pyx
< --- a/sage/rings/ring.pyx
< +++ b/sage/rings/ring.pyx
---
> diff -r 216c066ba752 sage/rings/ring.pyx
> --- a/sage/rings/ring.pyx Fri May 06 15:36:00 2011 +0200
> +++ b/sage/rings/ring.pyx Thu May 19 14:34:14 2011 +0200
2445,2447c2443,2445
< diff --git a/sage/schemes/elliptic_curves/monsky_washnitzer.py b/sage/schemes/elliptic_curves/monsky_washnitzer.py
< --- a/sage/schemes/elliptic_curves/monsky_washnitzer.py
< +++ b/sage/schemes/elliptic_curves/monsky_washnitzer.py
---
> diff -r 216c066ba752 sage/schemes/elliptic_curves/monsky_washnitzer.py
> --- a/sage/schemes/elliptic_curves/monsky_washnitzer.py Fri May 06 15:36:00 2011 +0200
> +++ b/sage/schemes/elliptic_curves/monsky_washnitzer.py Thu May 19 14:34:14 2011 +0200
2465,2467c2463,2465
< diff --git a/sage/schemes/hyperelliptic_curves/hyperelliptic_padic_field.py b/sage/schemes/hyperelliptic_curves/hyperelliptic_padic_field.py
< --- a/sage/schemes/hyperelliptic_curves/hyperelliptic_padic_field.py
< +++ b/sage/schemes/hyperelliptic_curves/hyperelliptic_padic_field.py
---
> diff -r 216c066ba752 sage/schemes/hyperelliptic_curves/hyperelliptic_padic_field.py
> --- a/sage/schemes/hyperelliptic_curves/hyperelliptic_padic_field.py Fri May 06 15:36:00 2011 +0200
> +++ b/sage/schemes/hyperelliptic_curves/hyperelliptic_padic_field.py Thu May 19 14:34:14 2011 +0200
3290,3292c3288,3290
< diff --git a/sage/structure/coerce.pyx b/sage/structure/coerce.pyx
< --- a/sage/structure/coerce.pyx
< +++ b/sage/structure/coerce.pyx
---
> diff -r 216c066ba752 sage/structure/coerce.pyx
> --- a/sage/structure/coerce.pyx Fri May 06 15:36:00 2011 +0200
> +++ b/sage/structure/coerce.pyx Thu May 19 14:34:14 2011 +0200
3302,3304c3300,3302
< diff --git a/sage/structure/coerce_actions.pyx b/sage/structure/coerce_actions.pyx
< --- a/sage/structure/coerce_actions.pyx
< +++ b/sage/structure/coerce_actions.pyx
---
> diff -r 216c066ba752 sage/structure/coerce_actions.pyx
> --- a/sage/structure/coerce_actions.pyx Fri May 06 15:36:00 2011 +0200
> +++ b/sage/structure/coerce_actions.pyx Thu May 19 14:34:14 2011 +0200
3332,3335c3330,3333
< diff --git a/sage/structure/element.pyx b/sage/structure/element.pyx
< --- a/sage/structure/element.pyx
< +++ b/sage/structure/element.pyx
< @@ -761,7 +761,7 @@
---
> diff -r 216c066ba752 sage/structure/element.pyx
> --- a/sage/structure/element.pyx Fri May 06 15:36:00 2011 +0200
> +++ b/sage/structure/element.pyx Thu May 19 14:34:14 2011 +0200
> @@ -766,7 +766,7 @@
3344c3342
< @@ -1273,7 +1273,7 @@
---
> @@ -1278,7 +1278,7 @@
3353,3355c3351,3353
< diff --git a/sage/structure/parent_old.pyx b/sage/structure/parent_old.pyx
< --- a/sage/structure/parent_old.pyx
< +++ b/sage/structure/parent_old.pyx
---
> diff -r 216c066ba752 sage/structure/parent_old.pyx
> --- a/sage/structure/parent_old.pyx Fri May 06 15:36:00 2011 +0200
> +++ b/sage/structure/parent_old.pyx Thu May 19 14:34:14 2011 +0200