Merge pull request #1314 from mathics/tidy-has_form-use

Use has_form() more effectively in a couple of places

Author: rocky

mathics/builtin/algebra.py

@@ -205,7 +205,7 @@ def find_vars(e, e_sympy):
             return
         elif e.is_symbol():
             variables.add(e)
-        elif e.has_form("Plus", None) or e.has_form("Times", None):
+        elif e.has_form(("Plus", "Times"), None):
             for l in e.leaves:
                 l_sympy = l.to_sympy()
                 if l_sympy is not None:

mathics/builtin/files.py

@@ -2479,9 +2479,7 @@ class Close(Builtin):
     def apply(self, channel, evaluation):
         "Close[channel_]"
 
-        if channel.has_form("InputStream", 2) or channel.has_form(  # noqa
-            "OutputStream", 2
-        ):
+        if channel.has_form(("InputStream", "OutputStream"), 2):
             [name, n] = channel.get_leaves()
             stream = stream_manager.lookup_stream(n.get_int_value())
         else: