git grep -l -E ' (Q as QQ|Z as ZZ)' | xargs sed -i.bak 's/ Q as QQ/ QQ/;s/ Z as ZZ/ ZZ/;'

Author: Matthias Koeppe

src/sage/schemes/elliptic_curves/BSD.py

@@ -2,7 +2,7 @@
 "Birch and Swinnerton-Dyer formulas"
 
 from sage.arith.misc import prime_divisors
-from sage.rings.integer_ring import Z as ZZ
+from sage.rings.integer_ring import ZZ
 from sage.rings.infinity import Infinity
 from sage.rings.number_field.number_field import QuadraticField
 from sage.functions.other import ceil

src/sage/schemes/elliptic_curves/cardinality.py

@@ -22,7 +22,7 @@
 from .constructor import EllipticCurve, EllipticCurve_from_j
 from sage.schemes.curves.projective_curve import Hasse_bounds
 from sage.rings.integer import Integer
-from sage.rings.integer_ring import Z as ZZ
+from sage.rings.integer_ring import ZZ
 from sage.rings.finite_rings.finite_field_constructor import FiniteField as GF
 from sage.rings.polynomial.polynomial_ring import polygen
 from sage.groups.generic import order_from_bounds

src/sage/schemes/elliptic_curves/cm.py

@@ -35,8 +35,8 @@
 
 from sage.interfaces.magma import magma
 from sage.rings.integer import Integer
-from sage.rings.rational_field import Q as QQ
-from sage.rings.integer_ring import Z as ZZ
+from sage.rings.rational_field import QQ
+from sage.rings.integer_ring import ZZ
 from sage.rings.integer_ring import IntegerRing
 from sage.rings.number_field.number_field import is_fundamental_discriminant
 from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing

src/sage/schemes/elliptic_curves/ell_finite_field.py

@@ -29,7 +29,7 @@
 from .constructor import EllipticCurve
 from sage.schemes.hyperelliptic_curves.hyperelliptic_finite_field import HyperellipticCurve_finite_field
 from sage.rings.integer import Integer
-from sage.rings.integer_ring import Z as ZZ
+from sage.rings.integer_ring import ZZ
 from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
 from sage.rings.finite_rings.finite_field_constructor import FiniteField as GF
 from sage.rings.polynomial.polynomial_ring import polygen

src/sage/schemes/elliptic_curves/ell_point.py

@@ -3261,7 +3261,7 @@ def elliptic_logarithm(self, embedding=None, precision=100,
         from sage.rings.number_field.number_field import refine_embedding
         from sage.rings.real_mpfr import RealField
         from sage.rings.complex_mpfr import ComplexField
-        from sage.rings.rational_field import Q as QQ
+        from sage.rings.rational_field import QQ
 
         # Check the trivial case:
 

src/sage/schemes/elliptic_curves/ell_rational_field.py

@@ -76,8 +76,8 @@
 import sage.rings.all as rings
 from sage.rings.power_series_ring import PowerSeriesRing
 from sage.rings.infinity import Infinity as oo
-from sage.rings.integer_ring import Z as ZZ
-from sage.rings.rational_field import Q as QQ
+from sage.rings.integer_ring import ZZ
+from sage.rings.rational_field import QQ
 from sage.rings.integer import Integer
 from sage.rings.integer_ring import IntegerRing
 from sage.rings.real_mpfr import RealField

src/sage/schemes/elliptic_curves/gal_reps_number_field.py

@@ -54,8 +54,8 @@
 from sage.arith.misc import primes
 from sage.sets.set import Set
 from sage.rings.integer import Integer
-from sage.rings.integer_ring import Z as ZZ
-from sage.rings.rational_field import Q as QQ
+from sage.rings.integer_ring import ZZ
+from sage.rings.rational_field import QQ
 from sage.rings.infinity import Infinity
 
 

src/sage/schemes/elliptic_curves/heegner.py

@@ -105,9 +105,9 @@
 import sage.rings.number_field.number_field_element
 import sage.rings.number_field.number_field as number_field
 import sage.rings.all as rings
-from sage.rings.integer_ring import Z as ZZ
+from sage.rings.integer_ring import ZZ
 from sage.rings.finite_rings.finite_field_constructor import FiniteField as GF
-from sage.rings.rational_field import Q as QQ
+from sage.rings.rational_field import QQ
 from sage.rings.complex_double import CDF
 from sage.rings.finite_rings.integer_mod_ring import IntegerModRing as Integers
 from sage.rings.real_mpfr import RealField

src/sage/schemes/elliptic_curves/modular_parametrization.py

@@ -47,7 +47,7 @@
 from sage.rings.laurent_series_ring import LaurentSeriesRing
 from sage.rings.rational_field import RationalField
 from sage.rings.complex_mpfr import ComplexField
-from sage.rings.rational_field import Q as QQ
+from sage.rings.rational_field import QQ
 
 
 class ModularParameterization:

src/sage/schemes/elliptic_curves/period_lattice.py

@@ -97,8 +97,8 @@
 """
 
 from sage.modules.free_module import FreeModule_generic_pid
-from sage.rings.integer_ring import Z as ZZ
-from sage.rings.rational_field import Q as QQ
+from sage.rings.integer_ring import ZZ
+from sage.rings.rational_field import QQ
 from sage.rings.real_mpfr import RealField
 from sage.rings.complex_mpfr import ComplexField
 from sage.rings.qqbar import QQbar