From e545deaaf7864321f4c10eb786aeea171215c496 Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Sun, 29 Jan 2023 18:34:43 -0800
Subject: [PATCH] git grep -l -E ' (Q as QQ|Z as ZZ)' | xargs sed -i.bak 's/ Q
 as QQ/ QQ/;s/ Z as ZZ/ ZZ/;'

---
 src/sage/schemes/elliptic_curves/BSD.py                       | 2 +-
 src/sage/schemes/elliptic_curves/cardinality.py               | 2 +-
 src/sage/schemes/elliptic_curves/cm.py                        | 4 ++--
 src/sage/schemes/elliptic_curves/ell_finite_field.py          | 2 +-
 src/sage/schemes/elliptic_curves/ell_point.py                 | 2 +-
 src/sage/schemes/elliptic_curves/ell_rational_field.py        | 4 ++--
 src/sage/schemes/elliptic_curves/gal_reps_number_field.py     | 4 ++--
 src/sage/schemes/elliptic_curves/heegner.py                   | 4 ++--
 src/sage/schemes/elliptic_curves/modular_parametrization.py   | 2 +-
 src/sage/schemes/elliptic_curves/period_lattice.py            | 4 ++--
 src/sage/schemes/elliptic_curves/sha_tate.py                  | 2 +-
 .../hyperelliptic_curves/hyperelliptic_finite_field.py        | 4 ++--
 .../schemes/hyperelliptic_curves/hyperelliptic_padic_field.py | 4 ++--
 .../hyperelliptic_curves/jacobian_endomorphism_utils.py       | 4 ++--
 src/sage/schemes/hyperelliptic_curves/jacobian_generic.py     | 2 +-
 src/sage/schemes/hyperelliptic_curves/monsky_washnitzer.py    | 4 ++--
 src/sage/schemes/plane_conics/con_rational_field.py           | 4 ++--
 17 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/sage/schemes/elliptic_curves/BSD.py b/src/sage/schemes/elliptic_curves/BSD.py
index 994e397a2f3..b44ef5d9c16 100644
--- a/src/sage/schemes/elliptic_curves/BSD.py
+++ b/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
diff --git a/src/sage/schemes/elliptic_curves/cardinality.py b/src/sage/schemes/elliptic_curves/cardinality.py
index 7b86027b69e..345b0e761d4 100644
--- a/src/sage/schemes/elliptic_curves/cardinality.py
+++ b/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
diff --git a/src/sage/schemes/elliptic_curves/cm.py b/src/sage/schemes/elliptic_curves/cm.py
index 72910220d76..9bb1552b68e 100644
--- a/src/sage/schemes/elliptic_curves/cm.py
+++ b/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
diff --git a/src/sage/schemes/elliptic_curves/ell_finite_field.py b/src/sage/schemes/elliptic_curves/ell_finite_field.py
index 6573319bc3e..c607b460603 100644
--- a/src/sage/schemes/elliptic_curves/ell_finite_field.py
+++ b/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
diff --git a/src/sage/schemes/elliptic_curves/ell_point.py b/src/sage/schemes/elliptic_curves/ell_point.py
index 53b83b3884f..07d7a3c18be 100644
--- a/src/sage/schemes/elliptic_curves/ell_point.py
+++ b/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:
 
diff --git a/src/sage/schemes/elliptic_curves/ell_rational_field.py b/src/sage/schemes/elliptic_curves/ell_rational_field.py
index 34eeb483a16..433eebfa3e6 100644
--- a/src/sage/schemes/elliptic_curves/ell_rational_field.py
+++ b/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
diff --git a/src/sage/schemes/elliptic_curves/gal_reps_number_field.py b/src/sage/schemes/elliptic_curves/gal_reps_number_field.py
index e2cefb5eff4..5b0dd7161bb 100644
--- a/src/sage/schemes/elliptic_curves/gal_reps_number_field.py
+++ b/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
 
 
diff --git a/src/sage/schemes/elliptic_curves/heegner.py b/src/sage/schemes/elliptic_curves/heegner.py
index 4e2a329fc24..c23e6bb5a46 100644
--- a/src/sage/schemes/elliptic_curves/heegner.py
+++ b/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
diff --git a/src/sage/schemes/elliptic_curves/modular_parametrization.py b/src/sage/schemes/elliptic_curves/modular_parametrization.py
index 43bb52678a7..57a90190fe5 100644
--- a/src/sage/schemes/elliptic_curves/modular_parametrization.py
+++ b/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:
diff --git a/src/sage/schemes/elliptic_curves/period_lattice.py b/src/sage/schemes/elliptic_curves/period_lattice.py
index 260bdda608b..cc75366a917 100644
--- a/src/sage/schemes/elliptic_curves/period_lattice.py
+++ b/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
diff --git a/src/sage/schemes/elliptic_curves/sha_tate.py b/src/sage/schemes/elliptic_curves/sha_tate.py
index f1b86b0d48f..1e4fe251ff6 100644
--- a/src/sage/schemes/elliptic_curves/sha_tate.py
+++ b/src/sage/schemes/elliptic_curves/sha_tate.py
@@ -84,7 +84,7 @@
 from sage.rings.real_mpfr import RealField
 from sage.rings.rational_field import RationalField
 from sage.rings.real_mpfi import RIF
-from sage.rings.integer_ring import Z as ZZ
+from sage.rings.integer_ring import ZZ
 from sage.functions.log import log
 from math import sqrt
 from sage.misc.verbose import verbose
diff --git a/src/sage/schemes/hyperelliptic_curves/hyperelliptic_finite_field.py b/src/sage/schemes/hyperelliptic_curves/hyperelliptic_finite_field.py
index 9f0f5096ffc..97d660ea2ed 100644
--- a/src/sage/schemes/hyperelliptic_curves/hyperelliptic_finite_field.py
+++ b/src/sage/schemes/hyperelliptic_curves/hyperelliptic_finite_field.py
@@ -48,9 +48,9 @@
 #                  https://www.gnu.org/licenses/
 # ****************************************************************************
 
-from sage.rings.integer_ring import Z as ZZ
+from sage.rings.integer_ring import ZZ
 from sage.rings.real_mpfr import RR
-from sage.rings.rational_field import Q as QQ
+from sage.rings.rational_field import QQ
 from sage.rings.finite_rings.finite_field_constructor import FiniteField as GF
 from sage.arith.misc import binomial
 from sage.rings.power_series_ring import PowerSeriesRing
diff --git a/src/sage/schemes/hyperelliptic_curves/hyperelliptic_padic_field.py b/src/sage/schemes/hyperelliptic_curves/hyperelliptic_padic_field.py
index ba7ee7c8a19..030d8dab2e7 100644
--- a/src/sage/schemes/hyperelliptic_curves/hyperelliptic_padic_field.py
+++ b/src/sage/schemes/hyperelliptic_curves/hyperelliptic_padic_field.py
@@ -14,8 +14,8 @@
 
 from sage.rings.power_series_ring import PowerSeriesRing
 from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
-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.padics.factory import Qp as pAdicField
 from sage.rings.finite_rings.finite_field_constructor import FiniteField as GF
 from sage.rings.real_mpfr import RR
diff --git a/src/sage/schemes/hyperelliptic_curves/jacobian_endomorphism_utils.py b/src/sage/schemes/hyperelliptic_curves/jacobian_endomorphism_utils.py
index 1f841af40aa..5c7c4b22c5c 100644
--- a/src/sage/schemes/hyperelliptic_curves/jacobian_endomorphism_utils.py
+++ b/src/sage/schemes/hyperelliptic_curves/jacobian_endomorphism_utils.py
@@ -90,8 +90,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.polynomial.polynomial_ring_constructor import PolynomialRing
 from sage.rings.finite_rings.finite_field_constructor import FiniteField
 from sage.rings.number_field.number_field import NumberField
diff --git a/src/sage/schemes/hyperelliptic_curves/jacobian_generic.py b/src/sage/schemes/hyperelliptic_curves/jacobian_generic.py
index df3ecffe989..21de152a878 100644
--- a/src/sage/schemes/hyperelliptic_curves/jacobian_generic.py
+++ b/src/sage/schemes/hyperelliptic_curves/jacobian_generic.py
@@ -9,7 +9,7 @@
 # ****************************************************************************
 
 from sage.rings.integer import Integer
-from sage.rings.rational_field import Q as QQ
+from sage.rings.rational_field import QQ
 from sage.misc.lazy_attribute import lazy_attribute
 from sage.schemes.jacobians.abstract_jacobian import Jacobian_generic
 from . import jacobian_homset
diff --git a/src/sage/schemes/hyperelliptic_curves/monsky_washnitzer.py b/src/sage/schemes/hyperelliptic_curves/monsky_washnitzer.py
index 9947a7303de..f5599b2c7ea 100644
--- a/src/sage/schemes/hyperelliptic_curves/monsky_washnitzer.py
+++ b/src/sage/schemes/hyperelliptic_curves/monsky_washnitzer.py
@@ -65,8 +65,8 @@
 from sage.rings.rational_field import RationalField as Rationals
 from sage.rings.rational import Rational
 from sage.rings.laurent_series_ring import LaurentSeriesRing
-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.ring import IntegralDomain
 from sage.rings.infinity import Infinity
 from sage.rings.laurent_series_ring import is_LaurentSeriesRing
diff --git a/src/sage/schemes/plane_conics/con_rational_field.py b/src/sage/schemes/plane_conics/con_rational_field.py
index d7e65a8c40c..8e14d1e2ba7 100644
--- a/src/sage/schemes/plane_conics/con_rational_field.py
+++ b/src/sage/schemes/plane_conics/con_rational_field.py
@@ -25,8 +25,8 @@
 # ****************************************************************************
 
 from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
-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
 
 import sage.rings.abc