some pep8 fixes in symbolic (E305 and others)

Author: fchapoton

src/sage/symbolic/callable.py

@@ -60,14 +60,15 @@
     ...
     SyntaxError: can...t assign to function call...
 """
-
 import sage.rings.abc
 from sage.symbolic.ring import SymbolicRing, SR
 from sage.categories.pushout import ConstructionFunctor
+from sage.structure.factory import UniqueFactory
 
-#########################################################################################
+
+######################################################################
 #  Callable functions
-#########################################################################################
+######################################################################
 def is_CallableSymbolicExpressionRing(x):
     """
     Return ``True`` if ``x`` is a callable symbolic expression ring.
@@ -96,10 +97,10 @@ def is_CallableSymbolicExpressionRing(x):
     deprecation(32665, 'is_CallableSymbolicExpressionRing is deprecated; use isinstance(..., sage.rings.abc.CallableSymbolicExpressionRing instead')
     return isinstance(x, CallableSymbolicExpressionRing_class)
 
+
 def is_CallableSymbolicExpression(x):
     r"""
-    Returns ``True`` if ``x`` is a callable symbolic
-    expression.
+    Return ``True`` if ``x`` is a callable symbolic expression.
 
     EXAMPLES::
 
@@ -125,6 +126,7 @@ def is_CallableSymbolicExpression(x):
     from sage.structure.element import Expression
     return isinstance(x, Expression) and isinstance(x.parent(), CallableSymbolicExpressionRing_class)
 
+
 class CallableSymbolicExpressionFunctor(ConstructionFunctor):
     def __init__(self, arguments):
         """
@@ -157,7 +159,7 @@ def __repr__(self):
             sage: CallableSymbolicExpressionFunctor((x,y))
             CallableSymbolicExpressionFunctor(x, y)
         """
-        return "CallableSymbolicExpressionFunctor%s"%repr(self.arguments())
+        return "CallableSymbolicExpressionFunctor%s" % repr(self.arguments())
 
     def merge(self, other):
         """
@@ -373,9 +375,10 @@ def _repr_(self):
 
     def arguments(self):
         """
-        Returns the arguments of ``self``. The order that the
-        variables appear in ``self.arguments()`` is the order that
-        is used in evaluating the elements of ``self``.
+        Return the arguments of ``self``.
+
+        The order that the variables appear in ``self.arguments()`` is
+        the order that is used in evaluating the elements of ``self``.
 
         EXAMPLES::
 
@@ -393,7 +396,7 @@ def arguments(self):
 
     def _repr_element_(self, x):
         """
-        Returns the string representation of the Expression ``x``.
+        Return the string representation of the Expression ``x``.
 
         EXAMPLES::
 
@@ -468,7 +471,7 @@ def _call_element_(self, _the_element, *args, **kwds):
             sage: f(z=100)
             a + 2*x + 3*y + 100
         """
-        if any(type(arg).__module__ == 'numpy' and type(arg).__name__ == "ndarray" for arg in args): # avoid importing
+        if any(type(arg).__module__ == 'numpy' and type(arg).__name__ == "ndarray" for arg in args):  # avoid importing
             raise NotImplementedError("Numpy arrays are not supported as arguments for symbolic expressions")
 
         d = dict(zip([repr(_) for _ in self.arguments()], args))
@@ -479,7 +482,6 @@ def _call_element_(self, _the_element, *args, **kwds):
     __reduce__ = object.__reduce__
 
 
-from sage.structure.factory import UniqueFactory
 class CallableSymbolicExpressionRingFactory(UniqueFactory):
     def create_key(self, args, check=True):
         """
@@ -501,8 +503,7 @@ def create_key(self, args, check=True):
 
     def create_object(self, version, key, **extra_args):
         """
-        Returns a CallableSymbolicExpressionRing given a version and a
-        key.
+        Return a CallableSymbolicExpressionRing given a version and a key.
 
         EXAMPLES::
 
@@ -512,4 +513,5 @@ def create_object(self, version, key, **extra_args):
         """
         return CallableSymbolicExpressionRing_class(key)
 
+
 CallableSymbolicExpressionRing = CallableSymbolicExpressionRingFactory('sage.symbolic.callable.CallableSymbolicExpressionRing')

src/sage/symbolic/constants.py

@@ -220,27 +220,27 @@
 from sage.rings.infinity import (infinity, minus_infinity,
                                  unsigned_infinity)
 from sage.structure.richcmp import richcmp_method, op_EQ, op_GE, op_LE
+from sage.symbolic.expression import register_symbol, init_pynac_I
+from sage.symbolic.expression import E
 
 constants_table = {}
 constants_name_table = {}
 constants_name_table[repr(infinity)] = infinity
 constants_name_table[repr(unsigned_infinity)] = unsigned_infinity
 constants_name_table[repr(minus_infinity)] = minus_infinity
 
-from sage.symbolic.expression import register_symbol, init_pynac_I
-
 I = init_pynac_I()
 
-register_symbol(infinity, {'maxima':'inf'}, 0)
-register_symbol(minus_infinity, {'maxima':'minf'}, 0)
-register_symbol(unsigned_infinity, {'maxima':'infinity'}, 0)
-register_symbol(I, {'mathematica':'I'}, 0)
-register_symbol(True, {'giac':'true',
-                       'mathematica':'True',
-                       'maxima':'true'}, 0)
-register_symbol(False, {'giac':'false',
-                        'mathematica':'False',
-                        'maxima':'false'}, 0)
+register_symbol(infinity, {'maxima': 'inf'}, 0)
+register_symbol(minus_infinity, {'maxima': 'minf'}, 0)
+register_symbol(unsigned_infinity, {'maxima': 'infinity'}, 0)
+register_symbol(I, {'mathematica': 'I'}, 0)
+register_symbol(True, {'giac': 'true',
+                       'mathematica': 'True',
+                       'maxima': 'true'}, 0)
+register_symbol(False, {'giac': 'false',
+                        'mathematica': 'False',
+                        'maxima': 'false'}, 0)
 
 
 def unpickle_Constant(class_name, name, conversions, latex, mathml, domain):
@@ -271,6 +271,7 @@ def unpickle_Constant(class_name, name, conversions, latex, mathml, domain):
         cls = globals()[class_name]
         return cls(name=name)
 
+
 @richcmp_method
 class Constant():
     def __init__(self, name, conversions=None, latex=None, mathml="",
@@ -290,8 +291,8 @@ def __init__(self, name, conversions=None, latex=None, mathml="",
         self._domain = domain
 
         for system, value in self._conversions.items():
-            setattr(self, "_%s_"%system, partial(self._generic_interface, value))
-            setattr(self, "_%s_init_"%system, partial(self._generic_interface_init, value))
+            setattr(self, "_%s_" % system, partial(self._generic_interface, value))
+            setattr(self, "_%s_init_" % system, partial(self._generic_interface_init, value))
 
         from .expression import PynacConstant
         self._pynac = PynacConstant(self._name, self._latex, self._domain)
@@ -510,7 +511,7 @@ def _interface_(self, I):
             pass
 
         try:
-            return getattr(self, "_%s_"%(I.name()))(I)
+            return getattr(self, "_%s_" % (I.name()))(I)
         except AttributeError:
             pass
 
@@ -529,7 +530,7 @@ def _gap_(self, gap):
             sage: gap(p)
             p
         """
-        return gap('"%s"'%self)
+        return gap('"%s"' % self)
 
     def _singular_(self, singular):
         """
@@ -546,7 +547,7 @@ def _singular_(self, singular):
             sage: singular(p)
             p
         """
-        return singular('"%s"'%self)
+        return singular('"%s"' % self)
 
 
 class Pi(Constant):
@@ -598,7 +599,7 @@ def _real_double_(self, R):
 
     def _sympy_(self):
         """
-        Converts pi to sympy pi.
+        Convert pi to sympy pi.
 
         EXAMPLES::
 
@@ -609,6 +610,7 @@ def _sympy_(self):
         import sympy
         return sympy.pi
 
+
 pi = Pi().expression()
 
 """
@@ -687,12 +689,12 @@ def _sympy_(self):
 # The base of the natural logarithm, e, is not a constant in GiNaC/Sage. It is
 # represented by exp(1). A dummy class to make this work with arithmetic and
 # coercion is implemented in the module sage.symbolic.expression for speed.
-from sage.symbolic.expression import E
 e = E()
 
 # Allow for backtranslation to this symbol from Mathematica (#29833).
 register_symbol(e, {'mathematica': 'E'})
 
+
 class NotANumber(Constant):
     """
     Not a Number
@@ -704,7 +706,7 @@ def __init__(self, name="NaN"):
             sage: loads(dumps(NaN))
             NaN
         """
-        conversions=dict(matlab='NaN')
+        conversions = dict(matlab='NaN')
         Constant.__init__(self, name, conversions=conversions)
 
     def __float__(self):
@@ -716,7 +718,7 @@ def __float__(self):
         """
         return float('nan')
 
-    def _mpfr_(self,R):
+    def _mpfr_(self, R):
         """
         EXAMPLES::
 
@@ -725,7 +727,7 @@ def _mpfr_(self,R):
             sage: type(_)
             <class 'sage.rings.real_mpfr.RealNumber'>
         """
-        return R('NaN') #??? nan in mpfr: void mpfr_set_nan (mpfr_t x)
+        return R('NaN')  # ??? nan in mpfr: void mpfr_set_nan (mpfr_t x)
 
     def _real_double_(self, R):
         """
@@ -751,8 +753,10 @@ def _sympy_(self):
         import sympy
         return sympy.nan
 
+
 NaN = NotANumber().expression()
 
+
 class GoldenRatio(Constant):
     """
     The number (1+sqrt(5))/2
@@ -806,7 +810,7 @@ def __float__(self):
             sage: golden_ratio.__float__()
             1.618033988749895
         """
-        return float(0.5)*(float(1.0)+math.sqrt(float(5.0)))
+        return 0.5 + math.sqrt(1.25)
 
     def _real_double_(self, R):
         """
@@ -817,7 +821,7 @@ def _real_double_(self, R):
         """
         return R('1.61803398874989484820458')
 
-    def _mpfr_(self,R):
+    def _mpfr_(self, R):
         """
         EXAMPLES::
 
@@ -826,7 +830,7 @@ def _mpfr_(self,R):
             sage: RealField(100)(golden_ratio)
             1.6180339887498948482045868344
         """
-        return (R(1)+R(5).sqrt())/R(2)
+        return (R(1) + R(5).sqrt()) / R(2)
 
     def _algebraic_(self, field):
         """
@@ -853,8 +857,10 @@ def _sympy_(self):
         import sympy
         return sympy.GoldenRatio
 
+
 golden_ratio = GoldenRatio().expression()
 
+
 class Log2(Constant):
     """
     The natural logarithm of the real number 2.
@@ -918,7 +924,7 @@ def _real_double_(self, R):
         """
         return R.log2()
 
-    def _mpfr_(self,R):
+    def _mpfr_(self, R):
         """
         EXAMPLES::
 
@@ -929,8 +935,10 @@ def _mpfr_(self,R):
         """
         return R.log2()
 
+
 log2 = Log2().expression()
 
+
 class EulerGamma(Constant):
     """
     The limiting difference between the harmonic series and the natural
@@ -964,7 +972,7 @@ def __init__(self, name='euler_gamma'):
         Constant.__init__(self, name, conversions=conversions,
                           latex=r'\gamma', domain='positive')
 
-    def _mpfr_(self,R):
+    def _mpfr_(self, R):
         """
         EXAMPLES::
 
@@ -1006,8 +1014,10 @@ def _sympy_(self):
         import sympy
         return sympy.EulerGamma
 
+
 euler_gamma = EulerGamma().expression()
 
+
 class Catalan(Constant):
     """
     A number appearing in combinatorics defined as the Dirichlet beta
@@ -1025,7 +1035,7 @@ def __init__(self, name='catalan'):
             sage: loads(dumps(catalan))
             catalan
         """
-        #kash: R is default prec
+        # kash: R is default prec
         conversions = dict(mathematica='Catalan', kash='Catalan(R)',
                            maple='Catalan', maxima='catalan',
                            pynac='Catalan')
@@ -1074,8 +1084,10 @@ def _sympy_(self):
         import sympy
         return sympy.Catalan
 
+
 catalan = Catalan().expression()
 
+
 class Khinchin(Constant):
     """
     The geometric mean of the continued fraction expansion of any
@@ -1126,8 +1138,10 @@ def __float__(self):
         """
         return 2.6854520010653064453097148355
 
+
 khinchin = Khinchin().expression()
 
+
 class TwinPrime(Constant):
     r"""
     The Twin Primes constant is defined as
@@ -1173,6 +1187,7 @@ def __float__(self):
         """
         return 0.66016181584686957392781211001
 
+
 twinprime = TwinPrime().expression()
 
 
@@ -1222,6 +1237,7 @@ def __float__(self):
         """
         return 0.26149721284764278375542683861
 
+
 mertens = Mertens().expression()