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/libs/gap/element.pyx

@@ -27,8 +27,8 @@ from sage.cpython.string cimport str_to_bytes, char_to_str
 from sage.misc.cachefunc import cached_method
 from sage.structure.sage_object cimport SageObject
 from sage.structure.parent import Parent
-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_double import RDF
 
 from sage.groups.perm_gps.permgroup_element cimport PermutationGroupElement

src/sage/libs/giac/giac.pyx

@@ -154,8 +154,8 @@ from sage.ext.stdsage cimport PY_NEW
 
 from sage.libs.gmp.mpz cimport mpz_t, mpz_init_set
 
-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.finite_rings.integer_mod_ring import IntegerModRing
 from sage.rings.integer cimport Integer
 from sage.rings.rational cimport Rational

src/sage/numerical/backends/generic_backend.pyx

@@ -1759,7 +1759,7 @@ cpdef GenericBackend get_solver(constraint_generation = False, solver = None, ba
 
         if base_ring is not None:
             base_ring = base_ring.fraction_field()
-            from sage.rings.rational_field import Q as QQ
+            from sage.rings.rational_field import QQ
             from sage.rings.real_double import RDF
             if base_ring is QQ:
                 solver = "Ppl"

src/sage/numerical/interactive_simplex_method.py

@@ -197,9 +197,9 @@
 lazy_import("sage.plot.all", ["Graphics", "arrow", "line", "point", "rainbow", "text"])
 from sage.rings.infinity import Infinity
 from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
-from sage.rings.rational_field import Q as QQ
+from sage.rings.rational_field import QQ
 from sage.rings.real_double import RDF
-from sage.rings.integer_ring import Z as ZZ
+from sage.rings.integer_ring import ZZ
 from sage.structure.all import SageObject
 from sage.symbolic.ring import SR
 

src/sage/stats/distributions/discrete_gaussian_lattice.py

@@ -60,8 +60,8 @@
 from sage.functions.other import ceil
 from sage.rings.real_mpfr import RealField
 from sage.rings.real_mpfr import RR
-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 .discrete_gaussian_integer import DiscreteGaussianDistributionIntegerSampler
 from sage.structure.sage_object import SageObject
 from sage.matrix.constructor import matrix, identity_matrix