# Ticket #9944: coerce.diff

File coerce.diff, 20.8 KB (added by , 12 years ago) |
---|

Line | |
---|---|

1 | 5c5 |

2 | < # Parent 900987e90d34a4d8b3075b3ce15fb9ea5b176cce |

3 | --- |

4 | > # Parent 216c066ba7528d60ef6439664addd703d9670480 |

5 | 10,13c10,13 |

6 | < diff --git a/sage/categories/category.py b/sage/categories/category.py |

7 | < --- a/sage/categories/category.py |

8 | < +++ b/sage/categories/category.py |

9 | < @@ -971,9 +971,9 @@ |

10 | --- |

11 | > diff -r 216c066ba752 sage/categories/category.py |

12 | > --- a/sage/categories/category.py Fri May 06 15:36:00 2011 +0200 |

13 | > +++ b/sage/categories/category.py Thu May 19 14:34:14 2011 +0200 |

14 | > @@ -989,9 +989,9 @@ |

15 | 25,27c25,27 |

16 | < diff --git a/sage/categories/pushout.py b/sage/categories/pushout.py |

17 | < --- a/sage/categories/pushout.py |

18 | < +++ b/sage/categories/pushout.py |

19 | --- |

20 | > diff -r 216c066ba752 sage/categories/pushout.py |

21 | > --- a/sage/categories/pushout.py Fri May 06 15:36:00 2011 +0200 |

22 | > +++ b/sage/categories/pushout.py Thu May 19 14:34:14 2011 +0200 |

23 | 125,127c125,127 |

24 | < diff --git a/sage/modular/cusps.py b/sage/modular/cusps.py |

25 | < --- a/sage/modular/cusps.py |

26 | < +++ b/sage/modular/cusps.py |

27 | --- |

28 | > diff -r 216c066ba752 sage/modular/cusps.py |

29 | > --- a/sage/modular/cusps.py Fri May 06 15:36:00 2011 +0200 |

30 | > +++ b/sage/modular/cusps.py Thu May 19 14:34:14 2011 +0200 |

31 | 161,163c161,163 |

32 | < diff --git a/sage/modular/cusps_nf.py b/sage/modular/cusps_nf.py |

33 | < --- a/sage/modular/cusps_nf.py |

34 | < +++ b/sage/modular/cusps_nf.py |

35 | --- |

36 | > diff -r 216c066ba752 sage/modular/cusps_nf.py |

37 | > --- a/sage/modular/cusps_nf.py Fri May 06 15:36:00 2011 +0200 |

38 | > +++ b/sage/modular/cusps_nf.py Thu May 19 14:34:14 2011 +0200 |

39 | 209,211c209,211 |

40 | < diff --git a/sage/modular/overconvergent/genus0.py b/sage/modular/overconvergent/genus0.py |

41 | < --- a/sage/modular/overconvergent/genus0.py |

42 | < +++ b/sage/modular/overconvergent/genus0.py |

43 | --- |

44 | > diff -r 216c066ba752 sage/modular/overconvergent/genus0.py |

45 | > --- a/sage/modular/overconvergent/genus0.py Fri May 06 15:36:00 2011 +0200 |

46 | > +++ b/sage/modular/overconvergent/genus0.py Thu May 19 14:34:14 2011 +0200 |

47 | 251,253c251,253 |

48 | < diff --git a/sage/modular/overconvergent/weightspace.py b/sage/modular/overconvergent/weightspace.py |

49 | < --- a/sage/modular/overconvergent/weightspace.py |

50 | < +++ b/sage/modular/overconvergent/weightspace.py |

51 | --- |

52 | > diff -r 216c066ba752 sage/modular/overconvergent/weightspace.py |

53 | > --- a/sage/modular/overconvergent/weightspace.py Fri May 06 15:36:00 2011 +0200 |

54 | > +++ b/sage/modular/overconvergent/weightspace.py Thu May 19 14:34:14 2011 +0200 |

55 | 282,284c282,284 |

56 | < diff --git a/sage/modules/free_module_homspace.py b/sage/modules/free_module_homspace.py |

57 | < --- a/sage/modules/free_module_homspace.py |

58 | < +++ b/sage/modules/free_module_homspace.py |

59 | --- |

60 | > diff -r 216c066ba752 sage/modules/free_module_homspace.py |

61 | > --- a/sage/modules/free_module_homspace.py Fri May 06 15:36:00 2011 +0200 |

62 | > +++ b/sage/modules/free_module_homspace.py Thu May 19 14:34:14 2011 +0200 |

63 | 383,385c383,385 |

64 | < diff --git a/sage/rings/finite_rings/element_givaro.pyx b/sage/rings/finite_rings/element_givaro.pyx |

65 | < --- a/sage/rings/finite_rings/element_givaro.pyx |

66 | < +++ b/sage/rings/finite_rings/element_givaro.pyx |

67 | --- |

68 | > diff -r 216c066ba752 sage/rings/finite_rings/element_givaro.pyx |

69 | > --- a/sage/rings/finite_rings/element_givaro.pyx Fri May 06 15:36:00 2011 +0200 |

70 | > +++ b/sage/rings/finite_rings/element_givaro.pyx Thu May 19 14:34:14 2011 +0200 |

71 | 434,436c434,436 |

72 | < diff --git a/sage/rings/finite_rings/finite_field_givaro.py b/sage/rings/finite_rings/finite_field_givaro.py |

73 | < --- a/sage/rings/finite_rings/finite_field_givaro.py |

74 | < +++ b/sage/rings/finite_rings/finite_field_givaro.py |

75 | --- |

76 | > diff -r 216c066ba752 sage/rings/finite_rings/finite_field_givaro.py |

77 | > --- a/sage/rings/finite_rings/finite_field_givaro.py Fri May 06 15:36:00 2011 +0200 |

78 | > +++ b/sage/rings/finite_rings/finite_field_givaro.py Thu May 19 14:34:14 2011 +0200 |

79 | 534,536c534,536 |

80 | < diff --git a/sage/rings/polynomial/infinite_polynomial_element.py b/sage/rings/polynomial/infinite_polynomial_element.py |

81 | < --- a/sage/rings/polynomial/infinite_polynomial_element.py |

82 | < +++ b/sage/rings/polynomial/infinite_polynomial_element.py |

83 | --- |

84 | > diff -r 216c066ba752 sage/rings/polynomial/infinite_polynomial_element.py |

85 | > --- a/sage/rings/polynomial/infinite_polynomial_element.py Fri May 06 15:36:00 2011 +0200 |

86 | > +++ b/sage/rings/polynomial/infinite_polynomial_element.py Thu May 19 14:34:14 2011 +0200 |

87 | 552,554c552,554 |

88 | < diff --git a/sage/rings/polynomial/laurent_polynomial_ring.py b/sage/rings/polynomial/laurent_polynomial_ring.py |

89 | < --- a/sage/rings/polynomial/laurent_polynomial_ring.py |

90 | < +++ b/sage/rings/polynomial/laurent_polynomial_ring.py |

91 | --- |

92 | > diff -r 216c066ba752 sage/rings/polynomial/laurent_polynomial_ring.py |

93 | > --- a/sage/rings/polynomial/laurent_polynomial_ring.py Fri May 06 15:36:00 2011 +0200 |

94 | > +++ b/sage/rings/polynomial/laurent_polynomial_ring.py Thu May 19 14:34:14 2011 +0200 |

95 | 591,593c591,593 |

96 | < diff --git a/sage/rings/polynomial/multi_polynomial_element.py b/sage/rings/polynomial/multi_polynomial_element.py |

97 | < --- a/sage/rings/polynomial/multi_polynomial_element.py |

98 | < +++ b/sage/rings/polynomial/multi_polynomial_element.py |

99 | --- |

100 | > diff -r 216c066ba752 sage/rings/polynomial/multi_polynomial_element.py |

101 | > --- a/sage/rings/polynomial/multi_polynomial_element.py Fri May 06 15:36:00 2011 +0200 |

102 | > +++ b/sage/rings/polynomial/multi_polynomial_element.py Thu May 19 14:34:14 2011 +0200 |

103 | 619,621c619,621 |

104 | < diff --git a/sage/rings/polynomial/multi_polynomial_libsingular.pxd b/sage/rings/polynomial/multi_polynomial_libsingular.pxd |

105 | < --- a/sage/rings/polynomial/multi_polynomial_libsingular.pxd |

106 | < +++ b/sage/rings/polynomial/multi_polynomial_libsingular.pxd |

107 | --- |

108 | > diff -r 216c066ba752 sage/rings/polynomial/multi_polynomial_libsingular.pxd |

109 | > --- a/sage/rings/polynomial/multi_polynomial_libsingular.pxd Fri May 06 15:36:00 2011 +0200 |

110 | > +++ b/sage/rings/polynomial/multi_polynomial_libsingular.pxd Thu May 19 14:34:14 2011 +0200 |

111 | 644,646c644,646 |

112 | < diff --git a/sage/rings/polynomial/multi_polynomial_libsingular.pyx b/sage/rings/polynomial/multi_polynomial_libsingular.pyx |

113 | < --- a/sage/rings/polynomial/multi_polynomial_libsingular.pyx |

114 | < +++ b/sage/rings/polynomial/multi_polynomial_libsingular.pyx |

115 | --- |

116 | > diff -r 216c066ba752 sage/rings/polynomial/multi_polynomial_libsingular.pyx |

117 | > --- a/sage/rings/polynomial/multi_polynomial_libsingular.pyx Fri May 06 15:36:00 2011 +0200 |

118 | > +++ b/sage/rings/polynomial/multi_polynomial_libsingular.pyx Thu May 19 14:34:14 2011 +0200 |

119 | 721,723c721,723 |

120 | < diff --git a/sage/rings/polynomial/multi_polynomial_ring.py b/sage/rings/polynomial/multi_polynomial_ring.py |

121 | < --- a/sage/rings/polynomial/multi_polynomial_ring.py |

122 | < +++ b/sage/rings/polynomial/multi_polynomial_ring.py |

123 | --- |

124 | > diff -r 216c066ba752 sage/rings/polynomial/multi_polynomial_ring.py |

125 | > --- a/sage/rings/polynomial/multi_polynomial_ring.py Fri May 06 15:36:00 2011 +0200 |

126 | > +++ b/sage/rings/polynomial/multi_polynomial_ring.py Thu May 19 14:34:14 2011 +0200 |

127 | 733,735c733,735 |

128 | < diff --git a/sage/rings/polynomial/padics/polynomial_padic_capped_relative_dense.py b/sage/rings/polynomial/padics/polynomial_padic_capped_relative_dense.py |

129 | < --- a/sage/rings/polynomial/padics/polynomial_padic_capped_relative_dense.py |

130 | < +++ b/sage/rings/polynomial/padics/polynomial_padic_capped_relative_dense.py |

131 | --- |

132 | > diff -r 216c066ba752 sage/rings/polynomial/padics/polynomial_padic_capped_relative_dense.py |

133 | > --- a/sage/rings/polynomial/padics/polynomial_padic_capped_relative_dense.py Fri May 06 15:36:00 2011 +0200 |

134 | > +++ b/sage/rings/polynomial/padics/polynomial_padic_capped_relative_dense.py Thu May 19 14:34:14 2011 +0200 |

135 | 823,825c823,825 |

136 | < diff --git a/sage/rings/polynomial/polynomial_compiled.pyx b/sage/rings/polynomial/polynomial_compiled.pyx |

137 | < --- a/sage/rings/polynomial/polynomial_compiled.pyx |

138 | < +++ b/sage/rings/polynomial/polynomial_compiled.pyx |

139 | --- |

140 | > diff -r 216c066ba752 sage/rings/polynomial/polynomial_compiled.pyx |

141 | > --- a/sage/rings/polynomial/polynomial_compiled.pyx Fri May 06 15:36:00 2011 +0200 |

142 | > +++ b/sage/rings/polynomial/polynomial_compiled.pyx Thu May 19 14:34:14 2011 +0200 |

143 | 836,838c836,838 |

144 | < diff --git a/sage/rings/polynomial/polynomial_element.pxd b/sage/rings/polynomial/polynomial_element.pxd |

145 | < --- a/sage/rings/polynomial/polynomial_element.pxd |

146 | < +++ b/sage/rings/polynomial/polynomial_element.pxd |

147 | --- |

148 | > diff -r 216c066ba752 sage/rings/polynomial/polynomial_element.pxd |

149 | > --- a/sage/rings/polynomial/polynomial_element.pxd Fri May 06 15:36:00 2011 +0200 |

150 | > +++ b/sage/rings/polynomial/polynomial_element.pxd Thu May 19 14:34:14 2011 +0200 |

151 | 870,872c870,872 |

152 | < diff --git a/sage/rings/polynomial/polynomial_element.pyx b/sage/rings/polynomial/polynomial_element.pyx |

153 | < --- a/sage/rings/polynomial/polynomial_element.pyx |

154 | < +++ b/sage/rings/polynomial/polynomial_element.pyx |

155 | --- |

156 | > diff -r 216c066ba752 sage/rings/polynomial/polynomial_element.pyx |

157 | > --- a/sage/rings/polynomial/polynomial_element.pyx Fri May 06 15:36:00 2011 +0200 |

158 | > +++ b/sage/rings/polynomial/polynomial_element.pyx Thu May 19 14:34:14 2011 +0200 |

159 | 1067c1067 |

160 | < @@ -5171,14 +5193,14 @@ |

161 | --- |

162 | > @@ -5173,14 +5195,14 @@ |

163 | 1085c1085 |

164 | < @@ -5303,7 +5325,7 @@ |

165 | --- |

166 | > @@ -5305,7 +5327,7 @@ |

167 | 1094c1094 |

168 | < @@ -5325,7 +5347,7 @@ |

169 | --- |

170 | > @@ -5327,7 +5349,7 @@ |

171 | 1103c1103 |

172 | < @@ -5335,7 +5357,8 @@ |

173 | --- |

174 | > @@ -5337,7 +5359,8 @@ |

175 | 1113c1113 |

176 | < @@ -5543,6 +5566,13 @@ |

177 | --- |

178 | > @@ -5545,6 +5568,13 @@ |

179 | 1127c1127 |

180 | < @@ -5558,12 +5588,19 @@ |

181 | --- |

182 | > @@ -5560,12 +5590,19 @@ |

183 | 1149c1149 |

184 | < @@ -5573,56 +5610,70 @@ |

185 | --- |

186 | > @@ -5575,56 +5612,70 @@ |

187 | 1244c1244 |

188 | < @@ -5675,7 +5726,7 @@ |

189 | --- |

190 | > @@ -5677,7 +5728,7 @@ |

191 | 1253c1253 |

192 | < @@ -5696,7 +5747,7 @@ |

193 | --- |

194 | > @@ -5698,7 +5749,7 @@ |

195 | 1262c1262 |

196 | < @@ -5727,7 +5778,7 @@ |

197 | --- |

198 | > @@ -5729,7 +5780,7 @@ |

199 | 1271c1271 |

200 | < @@ -5748,10 +5799,11 @@ |

201 | --- |

202 | > @@ -5750,10 +5801,11 @@ |

203 | 1286c1286 |

204 | < @@ -5770,11 +5822,11 @@ |

205 | --- |

206 | > @@ -5772,11 +5824,11 @@ |

207 | 1300c1300 |

208 | < @@ -5806,11 +5858,11 @@ |

209 | --- |

210 | > @@ -5808,11 +5860,11 @@ |

211 | 1314c1314 |

212 | < @@ -5833,9 +5885,10 @@ |

213 | --- |

214 | > @@ -5835,9 +5887,10 @@ |

215 | 1328c1328 |

216 | < @@ -5844,9 +5897,10 @@ |

217 | --- |

218 | > @@ -5846,9 +5899,10 @@ |

219 | 1342c1342 |

220 | < @@ -5876,7 +5930,7 @@ |

221 | --- |

222 | > @@ -5878,7 +5932,7 @@ |

223 | 1351c1351 |

224 | < @@ -5942,14 +5996,14 @@ |

225 | --- |

226 | > @@ -5944,14 +5998,14 @@ |

227 | 1369c1369 |

228 | < @@ -5978,10 +6032,12 @@ |

229 | --- |

230 | > @@ -5980,10 +6034,12 @@ |

231 | 1386c1386 |

232 | < @@ -5999,8 +6055,28 @@ |

233 | --- |

234 | > @@ -6001,8 +6057,28 @@ |

235 | 1417c1417 |

236 | < @@ -6021,7 +6097,10 @@ |

237 | --- |

238 | > @@ -6023,7 +6099,10 @@ |

239 | 1429c1429 |

240 | < @@ -6030,52 +6109,44 @@ |

241 | --- |

242 | > @@ -6032,52 +6111,44 @@ |

243 | 1436c1436 |

244 | < - the base ring element with the One by means of ``_rmul_``. |

245 | --- |

246 | > - the base ring element with the One by means of `_rmul_`. |

247 | 1449,1450c1449,1450 |

248 | < - We use ``_rmul_`` and not ``_lmul_`` since for many polynomial rings |

249 | < - ``_lmul_`` simply calls ``_rmul_``. |

250 | --- |

251 | > - We use `_rmul_` and not `_lmul_` since for many polynomial rings |

252 | > - `_lmul_` simply calls `_rmul_`. |

253 | 1488,1489c1488,1489 |

254 | < - By trac ticket #9944, there are now only very few exceptions:: |

255 | < - |

256 | --- |

257 | > By trac ticket #9944, there are now only very few exceptions:: |

258 | > |

259 | 1491,1492d1490 |

260 | < + There are only very few exceptions:: |

261 | < + |

262 | 1497c1495 |

263 | < @@ -6083,7 +6154,7 @@ |

264 | --- |

265 | > @@ -6085,7 +6156,7 @@ |

266 | 1506c1504 |

267 | < @@ -6109,34 +6180,12 @@ |

268 | --- |

269 | > @@ -6111,34 +6182,12 @@ |

270 | 1544c1542 |

271 | < @@ -6150,9 +6199,7 @@ |

272 | --- |

273 | > @@ -6152,9 +6201,7 @@ |

274 | 1555c1553 |

275 | < @@ -6162,7 +6209,12 @@ |

276 | --- |

277 | > @@ -6164,7 +6211,12 @@ |

278 | 1569,1571c1567,1569 |

279 | < diff --git a/sage/rings/polynomial/polynomial_element_generic.py b/sage/rings/polynomial/polynomial_element_generic.py |

280 | < --- a/sage/rings/polynomial/polynomial_element_generic.py |

281 | < +++ b/sage/rings/polynomial/polynomial_element_generic.py |

282 | --- |

283 | > diff -r 216c066ba752 sage/rings/polynomial/polynomial_element_generic.py |

284 | > --- a/sage/rings/polynomial/polynomial_element_generic.py Fri May 06 15:36:00 2011 +0200 |

285 | > +++ b/sage/rings/polynomial/polynomial_element_generic.py Thu May 19 14:34:14 2011 +0200 |

286 | 1591,1593c1589,1591 |

287 | < diff --git a/sage/rings/polynomial/polynomial_integer_dense_flint.pxd b/sage/rings/polynomial/polynomial_integer_dense_flint.pxd |

288 | < --- a/sage/rings/polynomial/polynomial_integer_dense_flint.pxd |

289 | < +++ b/sage/rings/polynomial/polynomial_integer_dense_flint.pxd |

290 | --- |

291 | > diff -r 216c066ba752 sage/rings/polynomial/polynomial_integer_dense_flint.pxd |

292 | > --- a/sage/rings/polynomial/polynomial_integer_dense_flint.pxd Fri May 06 15:36:00 2011 +0200 |

293 | > +++ b/sage/rings/polynomial/polynomial_integer_dense_flint.pxd Thu May 19 14:34:14 2011 +0200 |

294 | 1602,1604c1600,1602 |

295 | < diff --git a/sage/rings/polynomial/polynomial_integer_dense_flint.pyx b/sage/rings/polynomial/polynomial_integer_dense_flint.pyx |

296 | < --- a/sage/rings/polynomial/polynomial_integer_dense_flint.pyx |

297 | < +++ b/sage/rings/polynomial/polynomial_integer_dense_flint.pyx |

298 | --- |

299 | > diff -r 216c066ba752 sage/rings/polynomial/polynomial_integer_dense_flint.pyx |

300 | > --- a/sage/rings/polynomial/polynomial_integer_dense_flint.pyx Fri May 06 15:36:00 2011 +0200 |

301 | > +++ b/sage/rings/polynomial/polynomial_integer_dense_flint.pyx Thu May 19 14:34:14 2011 +0200 |

302 | 1635,1637c1633,1635 |

303 | < diff --git a/sage/rings/polynomial/polynomial_rational_flint.pxd b/sage/rings/polynomial/polynomial_rational_flint.pxd |

304 | < --- a/sage/rings/polynomial/polynomial_rational_flint.pxd |

305 | < +++ b/sage/rings/polynomial/polynomial_rational_flint.pxd |

306 | --- |

307 | > diff -r 216c066ba752 sage/rings/polynomial/polynomial_rational_flint.pxd |

308 | > --- a/sage/rings/polynomial/polynomial_rational_flint.pxd Fri May 06 15:36:00 2011 +0200 |

309 | > +++ b/sage/rings/polynomial/polynomial_rational_flint.pxd Thu May 19 14:34:14 2011 +0200 |

310 | 1646,1648c1644,1646 |

311 | < diff --git a/sage/rings/polynomial/polynomial_rational_flint.pyx b/sage/rings/polynomial/polynomial_rational_flint.pyx |

312 | < --- a/sage/rings/polynomial/polynomial_rational_flint.pyx |

313 | < +++ b/sage/rings/polynomial/polynomial_rational_flint.pyx |

314 | --- |

315 | > diff -r 216c066ba752 sage/rings/polynomial/polynomial_rational_flint.pyx |

316 | > --- a/sage/rings/polynomial/polynomial_rational_flint.pyx Fri May 06 15:36:00 2011 +0200 |

317 | > +++ b/sage/rings/polynomial/polynomial_rational_flint.pyx Thu May 19 14:34:14 2011 +0200 |

318 | 1696,1698c1694,1696 |

319 | < diff --git a/sage/rings/polynomial/polynomial_real_mpfr_dense.pyx b/sage/rings/polynomial/polynomial_real_mpfr_dense.pyx |

320 | < --- a/sage/rings/polynomial/polynomial_real_mpfr_dense.pyx |

321 | < +++ b/sage/rings/polynomial/polynomial_real_mpfr_dense.pyx |

322 | --- |

323 | > diff -r 216c066ba752 sage/rings/polynomial/polynomial_real_mpfr_dense.pyx |

324 | > --- a/sage/rings/polynomial/polynomial_real_mpfr_dense.pyx Fri May 06 15:36:00 2011 +0200 |

325 | > +++ b/sage/rings/polynomial/polynomial_real_mpfr_dense.pyx Thu May 19 14:34:14 2011 +0200 |

326 | 1721,1723c1719,1721 |

327 | < diff --git a/sage/rings/polynomial/polynomial_ring.py b/sage/rings/polynomial/polynomial_ring.py |

328 | < --- a/sage/rings/polynomial/polynomial_ring.py |

329 | < +++ b/sage/rings/polynomial/polynomial_ring.py |

330 | --- |

331 | > diff -r 216c066ba752 sage/rings/polynomial/polynomial_ring.py |

332 | > --- a/sage/rings/polynomial/polynomial_ring.py Fri May 06 15:36:00 2011 +0200 |

333 | > +++ b/sage/rings/polynomial/polynomial_ring.py Thu May 19 14:34:14 2011 +0200 |

334 | 2006,2008c2004,2006 |

335 | < diff --git a/sage/rings/polynomial/polynomial_ring_constructor.py b/sage/rings/polynomial/polynomial_ring_constructor.py |

336 | < --- a/sage/rings/polynomial/polynomial_ring_constructor.py |

337 | < +++ b/sage/rings/polynomial/polynomial_ring_constructor.py |

338 | --- |

339 | > diff -r 216c066ba752 sage/rings/polynomial/polynomial_ring_constructor.py |

340 | > --- a/sage/rings/polynomial/polynomial_ring_constructor.py Fri May 06 15:36:00 2011 +0200 |

341 | > +++ b/sage/rings/polynomial/polynomial_ring_constructor.py Thu May 19 14:34:14 2011 +0200 |

342 | 2217,2219c2215,2217 |

343 | < diff --git a/sage/rings/polynomial/polynomial_template.pxi b/sage/rings/polynomial/polynomial_template.pxi |

344 | < --- a/sage/rings/polynomial/polynomial_template.pxi |

345 | < +++ b/sage/rings/polynomial/polynomial_template.pxi |

346 | --- |

347 | > diff -r 216c066ba752 sage/rings/polynomial/polynomial_template.pxi |

348 | > --- a/sage/rings/polynomial/polynomial_template.pxi Fri May 06 15:36:00 2011 +0200 |

349 | > +++ b/sage/rings/polynomial/polynomial_template.pxi Thu May 19 14:34:14 2011 +0200 |

350 | 2237,2239c2235,2237 |

351 | < diff --git a/sage/rings/polynomial/polynomial_zmod_flint.pxd b/sage/rings/polynomial/polynomial_zmod_flint.pxd |

352 | < --- a/sage/rings/polynomial/polynomial_zmod_flint.pxd |

353 | < +++ b/sage/rings/polynomial/polynomial_zmod_flint.pxd |

354 | --- |

355 | > diff -r 216c066ba752 sage/rings/polynomial/polynomial_zmod_flint.pxd |

356 | > --- a/sage/rings/polynomial/polynomial_zmod_flint.pxd Fri May 06 15:36:00 2011 +0200 |

357 | > +++ b/sage/rings/polynomial/polynomial_zmod_flint.pxd Thu May 19 14:34:14 2011 +0200 |

358 | 2248,2250c2246,2248 |

359 | < diff --git a/sage/rings/polynomial/polynomial_zmod_flint.pyx b/sage/rings/polynomial/polynomial_zmod_flint.pyx |

360 | < --- a/sage/rings/polynomial/polynomial_zmod_flint.pyx |

361 | < +++ b/sage/rings/polynomial/polynomial_zmod_flint.pyx |

362 | --- |

363 | > diff -r 216c066ba752 sage/rings/polynomial/polynomial_zmod_flint.pyx |

364 | > --- a/sage/rings/polynomial/polynomial_zmod_flint.pyx Fri May 06 15:36:00 2011 +0200 |

365 | > +++ b/sage/rings/polynomial/polynomial_zmod_flint.pyx Thu May 19 14:34:14 2011 +0200 |

366 | 2287,2289c2285,2287 |

367 | < diff --git a/sage/rings/polynomial/polynomial_zz_pex.pyx b/sage/rings/polynomial/polynomial_zz_pex.pyx |

368 | < --- a/sage/rings/polynomial/polynomial_zz_pex.pyx |

369 | < +++ b/sage/rings/polynomial/polynomial_zz_pex.pyx |

370 | --- |

371 | > diff -r 216c066ba752 sage/rings/polynomial/polynomial_zz_pex.pyx |

372 | > --- a/sage/rings/polynomial/polynomial_zz_pex.pyx Fri May 06 15:36:00 2011 +0200 |

373 | > +++ b/sage/rings/polynomial/polynomial_zz_pex.pyx Thu May 19 14:34:14 2011 +0200 |

374 | 2340,2342c2338,2340 |

375 | < diff --git a/sage/rings/power_series_poly.pyx b/sage/rings/power_series_poly.pyx |

376 | < --- a/sage/rings/power_series_poly.pyx |

377 | < +++ b/sage/rings/power_series_poly.pyx |

378 | --- |

379 | > diff -r 216c066ba752 sage/rings/power_series_poly.pyx |

380 | > --- a/sage/rings/power_series_poly.pyx Fri May 06 15:36:00 2011 +0200 |

381 | > +++ b/sage/rings/power_series_poly.pyx Thu May 19 14:34:14 2011 +0200 |

382 | 2370,2372c2368,2370 |

383 | < diff --git a/sage/rings/power_series_ring_element.pyx b/sage/rings/power_series_ring_element.pyx |

384 | < --- a/sage/rings/power_series_ring_element.pyx |

385 | < +++ b/sage/rings/power_series_ring_element.pyx |

386 | --- |

387 | > diff -r 216c066ba752 sage/rings/power_series_ring_element.pyx |

388 | > --- a/sage/rings/power_series_ring_element.pyx Fri May 06 15:36:00 2011 +0200 |

389 | > +++ b/sage/rings/power_series_ring_element.pyx Thu May 19 14:34:14 2011 +0200 |

390 | 2384,2386c2382,2384 |

391 | < diff --git a/sage/rings/qqbar.py b/sage/rings/qqbar.py |

392 | < --- a/sage/rings/qqbar.py |

393 | < +++ b/sage/rings/qqbar.py |

394 | --- |

395 | > diff -r 216c066ba752 sage/rings/qqbar.py |

396 | > --- a/sage/rings/qqbar.py Fri May 06 15:36:00 2011 +0200 |

397 | > +++ b/sage/rings/qqbar.py Thu May 19 14:34:14 2011 +0200 |

398 | 2424,2426c2422,2424 |

399 | < diff --git a/sage/rings/ring.pyx b/sage/rings/ring.pyx |

400 | < --- a/sage/rings/ring.pyx |

401 | < +++ b/sage/rings/ring.pyx |

402 | --- |

403 | > diff -r 216c066ba752 sage/rings/ring.pyx |

404 | > --- a/sage/rings/ring.pyx Fri May 06 15:36:00 2011 +0200 |

405 | > +++ b/sage/rings/ring.pyx Thu May 19 14:34:14 2011 +0200 |

406 | 2445,2447c2443,2445 |

407 | < diff --git a/sage/schemes/elliptic_curves/monsky_washnitzer.py b/sage/schemes/elliptic_curves/monsky_washnitzer.py |

408 | < --- a/sage/schemes/elliptic_curves/monsky_washnitzer.py |

409 | < +++ b/sage/schemes/elliptic_curves/monsky_washnitzer.py |

410 | --- |

411 | > diff -r 216c066ba752 sage/schemes/elliptic_curves/monsky_washnitzer.py |

412 | > --- a/sage/schemes/elliptic_curves/monsky_washnitzer.py Fri May 06 15:36:00 2011 +0200 |

413 | > +++ b/sage/schemes/elliptic_curves/monsky_washnitzer.py Thu May 19 14:34:14 2011 +0200 |

414 | 2465,2467c2463,2465 |

415 | < diff --git a/sage/schemes/hyperelliptic_curves/hyperelliptic_padic_field.py b/sage/schemes/hyperelliptic_curves/hyperelliptic_padic_field.py |

416 | < --- a/sage/schemes/hyperelliptic_curves/hyperelliptic_padic_field.py |

417 | < +++ b/sage/schemes/hyperelliptic_curves/hyperelliptic_padic_field.py |

418 | --- |

419 | > diff -r 216c066ba752 sage/schemes/hyperelliptic_curves/hyperelliptic_padic_field.py |

420 | > --- a/sage/schemes/hyperelliptic_curves/hyperelliptic_padic_field.py Fri May 06 15:36:00 2011 +0200 |

421 | > +++ b/sage/schemes/hyperelliptic_curves/hyperelliptic_padic_field.py Thu May 19 14:34:14 2011 +0200 |

422 | 3290,3292c3288,3290 |

423 | < diff --git a/sage/structure/coerce.pyx b/sage/structure/coerce.pyx |

424 | < --- a/sage/structure/coerce.pyx |

425 | < +++ b/sage/structure/coerce.pyx |

426 | --- |

427 | > diff -r 216c066ba752 sage/structure/coerce.pyx |

428 | > --- a/sage/structure/coerce.pyx Fri May 06 15:36:00 2011 +0200 |

429 | > +++ b/sage/structure/coerce.pyx Thu May 19 14:34:14 2011 +0200 |

430 | 3302,3304c3300,3302 |

431 | < diff --git a/sage/structure/coerce_actions.pyx b/sage/structure/coerce_actions.pyx |

432 | < --- a/sage/structure/coerce_actions.pyx |

433 | < +++ b/sage/structure/coerce_actions.pyx |

434 | --- |

435 | > diff -r 216c066ba752 sage/structure/coerce_actions.pyx |

436 | > --- a/sage/structure/coerce_actions.pyx Fri May 06 15:36:00 2011 +0200 |

437 | > +++ b/sage/structure/coerce_actions.pyx Thu May 19 14:34:14 2011 +0200 |

438 | 3332,3335c3330,3333 |

439 | < diff --git a/sage/structure/element.pyx b/sage/structure/element.pyx |

440 | < --- a/sage/structure/element.pyx |

441 | < +++ b/sage/structure/element.pyx |

442 | < @@ -761,7 +761,7 @@ |

443 | --- |

444 | > diff -r 216c066ba752 sage/structure/element.pyx |

445 | > --- a/sage/structure/element.pyx Fri May 06 15:36:00 2011 +0200 |

446 | > +++ b/sage/structure/element.pyx Thu May 19 14:34:14 2011 +0200 |

447 | > @@ -766,7 +766,7 @@ |

448 | 3344c3342 |

449 | < @@ -1273,7 +1273,7 @@ |

450 | --- |

451 | > @@ -1278,7 +1278,7 @@ |

452 | 3353,3355c3351,3353 |

453 | < diff --git a/sage/structure/parent_old.pyx b/sage/structure/parent_old.pyx |

454 | < --- a/sage/structure/parent_old.pyx |

455 | < +++ b/sage/structure/parent_old.pyx |

456 | --- |

457 | > diff -r 216c066ba752 sage/structure/parent_old.pyx |

458 | > --- a/sage/structure/parent_old.pyx Fri May 06 15:36:00 2011 +0200 |

459 | > +++ b/sage/structure/parent_old.pyx Thu May 19 14:34:14 2011 +0200 |