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/crypto/lwe.py

@@ -100,7 +100,7 @@
 from sage.modules.free_module import FreeModule
 from sage.modules.free_module_element import random_vector, vector
 from sage.numerical.optimize import find_root
-from sage.rings.integer_ring import Z as ZZ
+from sage.rings.integer_ring import ZZ
 from sage.rings.finite_rings.integer_mod_ring import IntegerModRing
 from sage.rings.real_mpfr import RR
 from sage.arith.misc import next_prime

src/sage/lfunctions/pari.py

@@ -22,7 +22,7 @@
 from cypari2.gen import Gen
 from sage.libs.pari import pari
 from sage.structure.sage_object import SageObject
-from sage.rings.integer_ring import Z as ZZ
+from sage.rings.integer_ring import ZZ
 from sage.rings.real_mpfr import RealField
 from sage.rings.complex_mpfr import ComplexField
 from sage.rings.power_series_ring import PowerSeriesRing

src/sage/quadratic_forms/binary_qf.py

@@ -52,7 +52,7 @@
 from functools import total_ordering
 
 from sage.libs.pari.all import pari_gen
-from sage.rings.integer_ring import Z as ZZ
+from sage.rings.integer_ring import ZZ
 from sage.rings.number_field.number_field import is_fundamental_discriminant
 from sage.arith.misc import GCD as gcd
 from sage.structure.sage_object import SageObject

src/sage/quadratic_forms/genera/normal_form.py

@@ -88,7 +88,7 @@
 # ****************************************************************************
 
 from sage.rings.padics.factory import Zp
-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.matrix.constructor import Matrix
 from copy import copy

src/sage/quadratic_forms/genera/spinor_genus.py

@@ -27,8 +27,8 @@
 
 from sage.groups.abelian_gps.abelian_group_gap import (AbelianGroupGap,
                                                        AbelianGroupElement_gap)
-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
 
 
 class SpinorOperator(AbelianGroupElement_gap):

src/sage/quadratic_forms/qfsolve.py

@@ -26,8 +26,8 @@
 #                  http://www.gnu.org/licenses/
 #*****************************************************************************
 
-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.modules.free_module_element import vector
 from sage.matrix.constructor import Matrix

src/sage/quadratic_forms/quadratic_form.py

@@ -30,7 +30,7 @@
 from sage.arith.misc import GCD
 from sage.arith.functions import lcm as LCM
 from sage.rings.ideal import Ideal
-from sage.rings.rational_field import Q as QQ
+from sage.rings.rational_field import QQ
 from sage.rings.ring import is_Ring, PrincipalIdealDomain
 from sage.structure.element import is_Vector
 from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing

src/sage/quadratic_forms/quadratic_form__neighbors.py

@@ -5,7 +5,7 @@
 from sage.modules.free_module_element import vector
 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 copy import deepcopy
 from sage.matrix.constructor import matrix