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/interfaces/axiom.py

@@ -837,7 +837,7 @@ def _sage_(self):
 
         if type == "Float":
             from sage.rings.real_mpfr import RealField
-            from sage.rings.integer_ring import Z as ZZ
+            from sage.rings.integer_ring import ZZ
             prec = max(self.mantissa().length()._sage_(), 53)
             R = RealField(prec)
             x,e,b = self.unparsed_input_form().lstrip('float(').rstrip(')').split(',')

src/sage/interfaces/genus2reduction.py

@@ -34,8 +34,8 @@
 # ****************************************************************************
 
 from sage.structure.sage_object import SageObject
-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.polynomial.polynomial_ring_constructor import PolynomialRing
 from sage.libs.pari.all import pari
 

src/sage/interfaces/singular.py

@@ -1656,7 +1656,7 @@ def sage_global_ring(self):
             br = ZZ
             is_extension = False
         elif charstr[0] in ['0', 'QQ']:
-            from sage.rings.rational_field import Q as QQ
+            from sage.rings.rational_field import QQ
             br = QQ
         elif charstr[0].startswith('Float'):
             from sage.rings.real_mpfr import RealField