flake8: equation

Author: sbillinge

src/diffpy/__init__.py

@@ -4,7 +4,8 @@
 # (c) 2008-2025 The Trustees of Columbia University in the City of New York.
 # All rights reserved.
 #
-# File coded by: Chris Farrow and Billinge Group members and community contributors.
+# File coded by: Chris Farrow and Billinge Group members and community
+# contributors.
 #
 # See GitHub contributions for a more detailed list of contributors.
 # https://github.com/diffpy/diffpy.srfit/graphs/contributors

src/diffpy/srfit/__init__.py

@@ -4,7 +4,8 @@
 # (c) 2008-2025 The Trustees of Columbia University in the City of New York.
 # All rights reserved.
 #
-# File coded by: Christopher Farrow, Pavol Juhas, and members of the Billinge Group.
+# File coded by: Christopher Farrow, Pavol Juhas, and members of the
+# Billinge Group.
 #
 # See GitHub contributions for a more detailed list of contributors.
 # https://github.com/diffpy/diffpy.srfit/graphs/contributors

src/diffpy/srfit/equation/builder.py

@@ -75,6 +75,17 @@
 > beq = c*f(a,b)
 > eq = beq.makeEquation()
 """
+import inspect
+import numbers
+import token
+import tokenize
+
+import numpy
+import six
+
+import diffpy.srfit.equation.literals as literals
+from diffpy.srfit.equation.equationmod import Equation
+from diffpy.srfit.equation.literals.literal import Literal
 
 __all__ = [
     "EquationFactory",
@@ -95,25 +106,15 @@
 _builders = {}
 
 
-import inspect
-import numbers
-
-import numpy
-import six
-
-import diffpy.srfit.equation.literals as literals
-from diffpy.srfit.equation.equationmod import Equation
-from diffpy.srfit.equation.literals.literal import Literal
-
-
 class EquationFactory(object):
     """A Factory for equations.
 
     builders    --  A dictionary of BaseBuilders registered with the
                     factory, indexed by name.
     newargs     --  A set of new arguments created by makeEquation. This is
                     redefined whenever makeEquation is called.
-    equations   --  Set of equations that have been built by the EquationFactory.
+    equations   --  Set of equations that have been built by the
+                    EquationFactory.
     """
 
     symbols = ("+", "-", "*", "/", "**", "%", "|")
@@ -213,10 +214,10 @@ def registerFunction(self, name, func, argnames):
             if n not in self.builders:
                 self.registerConstant(n, 0)
         opbuilder = wrapFunction(name, func, len(argnames))
-        for n in argnames:
-            b = self.builders[n]
-            l = b.literal
-            opbuilder.literal.addLiteral(l)
+        for argname in argnames:
+            builder = self.builders[argname]
+            argliteral = builder.literal
+            opbuilder.literal.addLiteral(argliteral)
 
         return self.registerBuilder(name, opbuilder)
 
@@ -341,9 +342,6 @@ def _getUndefinedArgs(self, eqstr):
 
         Raises SyntaxError if the equation string uses invalid syntax.
         """
-        import token
-        import tokenize
-
         interface = six.StringIO(eqstr).readline
         # output is an iterator. Each entry (token) is a 5-tuple
         # token[0] = token type
@@ -512,7 +510,7 @@ def __neg__(self):
         return self.__evalUnary(literals.NegationOperator)
 
 
-## These are used by the class.
+# These are used by the class.
 
 
 class ArgumentBuilder(BaseBuilder):
@@ -681,15 +679,18 @@ def __wrapSrFitOperators():
     instances in the module namespace."""
     opmod = literals.operators
     excluded_types = set((opmod.CustomOperator, opmod.UFuncOperator))
+
     # check if opmod member should be wrapped as OperatorBuilder
-    is_exported_type = lambda cls: (
-        inspect.isclass(cls)
-        and issubclass(cls, opmod.Operator)
-        and not inspect.isabstract(cls)
-        and not cls in excluded_types
-    )
+    def _is_exported_type(cls):
+        return (
+            inspect.isclass(cls)
+            and issubclass(cls, opmod.Operator)
+            and not inspect.isabstract(cls)
+            and cls not in excluded_types
+        )
+
     # create OperatorBuilder objects
-    for nm, opclass in inspect.getmembers(opmod, is_exported_type):
+    for nm, opclass in inspect.getmembers(opmod, _is_exported_type):
         op = opclass()
         assert op.name, "Unnamed Operator should never appear here."
         _builders[op.name] = OperatorBuilder(op.name, op)

src/diffpy/srfit/equation/equationmod.py

@@ -117,7 +117,7 @@ def __getattr__(self, name):
         """Gives access to the Arguments as attributes."""
         # Avoid infinite loop on argdict lookup.
         argdict = object.__getattribute__(self, "argdict")
-        if not name in argdict:
+        if name not in argdict:
             raise AttributeError("No argument named '%s' here" % name)
         return argdict[name]
 

src/diffpy/srfit/equation/literals/operators.py

@@ -122,7 +122,7 @@ def addLiteral(self, literal):
     def getValue(self):
         """Get or evaluate the value of the operator."""
         if self._value is None:
-            vals = [l.value for l in self.args]
+            vals = [arg.value for arg in self.args]
             self._value = self.operation(*vals)
         return self._value
 
@@ -135,8 +135,8 @@ def _loopCheck(self, literal):
 
         # Check to see if I am a dependency of the literal.
         if hasattr(literal, "args"):
-            for l in literal.args:
-                self._loopCheck(l)
+            for lit_arg in literal.args:
+                self._loopCheck(lit_arg)
         return