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/modules/filtered_vector_space.py

@@ -108,8 +108,8 @@
 #                  http://www.gnu.org/licenses/
 #*****************************************************************************
 
-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.real_double import RDF
 from sage.rings.real_mpfr import RR
 from sage.rings.integer import Integer

src/sage/modules/multi_filtered_vector_space.py

@@ -39,8 +39,8 @@
 #                  https://www.gnu.org/licenses/
 # ****************************************************************************
 
-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 import Integer
 from sage.rings.infinity import infinity, minus_infinity
 from sage.categories.fields import Fields

src/sage/modules/torsion_quadratic_module.py

@@ -20,9 +20,9 @@
 from sage.modules.fg_pid.fgp_element import FGP_Element
 from sage.modules.free_quadratic_module import FreeQuadraticModule
 from sage.arith.misc import gcd
-from sage.rings.integer_ring import Z as ZZ
+from sage.rings.integer_ring import ZZ
 from sage.rings.padics.factory import Zp
-from sage.rings.rational_field import Q as QQ
+from sage.rings.rational_field import QQ
 from sage.rings.finite_rings.integer_mod_ring import IntegerModRing
 from sage.groups.additive_abelian.qmodnz import QmodnZ
 from sage.matrix.constructor import matrix

src/sage/rings/number_field/number_field_rel.py

@@ -105,8 +105,8 @@
 from sage.modules.free_module_element import vector
 
 from sage.rings.real_mpfr import RR
-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
 
 
 def is_RelativeNumberField(x):

src/sage/rings/tests.py

@@ -93,7 +93,7 @@ def integer_mod_ring():
         sage: R.cardinality() <= 50000
         True
     """
-    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
     n = ZZ.random_element(x=2, y=50000)
     return IntegerModRing(n)
@@ -110,7 +110,7 @@ def padic_field():
         sage: sage.rings.tests.padic_field()
         ...-adic Field with capped relative precision ...
     """
-    from sage.rings.integer_ring import Z as ZZ
+    from sage.rings.integer_ring import ZZ
     from sage.rings.padics.factory import Qp
     prec = ZZ.random_element(x=10, y=100)
     p = ZZ.random_element(x=2, y=10**4 - 30).next_prime()
@@ -127,7 +127,7 @@ def quadratic_number_field():
         sage: K = sage.rings.tests.quadratic_number_field(); K
         Number Field in a with defining polynomial x^2 ... with a = ...
     """
-    from sage.rings.integer_ring import Z as ZZ
+    from sage.rings.integer_ring import ZZ
     from sage.rings.number_field.number_field import QuadraticField
     while True:
         d = ZZ.random_element(x=-10**5, y=10**5)
@@ -147,7 +147,7 @@ def absolute_number_field(maxdeg=10):
         sage: K.degree() <= 10
         True
     """
-    from sage.rings.integer_ring import Z as ZZ
+    from sage.rings.integer_ring import ZZ
     from sage.rings.number_field.number_field import NumberField
     R = ZZ['x']
     while True:
@@ -278,7 +278,7 @@ def rings1():
     from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
     from sage.rings.power_series_ring import PowerSeriesRing
     from sage.rings.polynomial.laurent_polynomial_ring import LaurentPolynomialRing
-    from sage.rings.integer_ring import Z as ZZ
+    from sage.rings.integer_ring import ZZ
     v = [(lambda: PolynomialRing(next(X), names='x'),
           'univariate polynomial ring over level 0 ring'),
          (lambda: PowerSeriesRing(next(X), names='x'),