Fix linter

Author: inlined

src/firebase_functions/https_fn.py

@@ -355,7 +355,7 @@ class CallableRequest(_typing.Generic[_core.T]):
 class _IterWithReturn:
     def __init__(self, iterable):
         self.iterable = iterable
-    
+
     def __iter__(self):
         self.value = yield from self.iterable
 
@@ -410,11 +410,11 @@ def _on_call_handler(func: _C2, request: Request,
         result = _core._with_init(func)(context)
         if not _inspect.isgenerator(result):
             return _jsonify(result=result)
-        
+
         if request.headers.get("Accept") != "text/event-stream":
             vals = _IterWithReturn(result)
-            for _ in vals:
-                next
+            # Consume and drop yielded results
+            list(vals)
             return _jsonify(result=vals.value)
 
         else:
@@ -433,16 +433,20 @@ def _on_call_handler(func: _C2, request: Request,
 
 
 def _sse_encode_generator(gen: _typing.Generator):
-    iter = _IterWithReturn(gen)
+    with_return = _IterWithReturn(gen)
     try:
-        for chunk in iter:
-            yield f"data: %s\n\n" % _json.dumps(obj={"message": chunk})
-        yield f"data: %s\n\n" % _json.dumps(obj={"result": iter.value})
+        for chunk in with_return:
+            data = _json.dumps(obj={"message": chunk})
+            yield f"data: {data}\n\n"
+        result = _json.dumps({"result": with_return.value})
+        yield f"data: {result}\n\n"
+    # pylint: disable=broad-except
     except Exception as err:
         if not isinstance(err, HttpsError):
             _logging.error("Unhandled error: %s", err)
             err = HttpsError(FunctionsErrorCode.INTERNAL, "INTERNAL")
-        yield f"error: %s\n\n" % _json.dumps(obj={"error": err._as_dict()})
+        json = _json.dumps(obj={"error": err._as_dict()})
+        yield f"error: {json}\n\n"
     yield "END"
 
 @_util.copy_func_kwargs(HttpsOptions)

tests/test_https_fn.py

@@ -3,7 +3,7 @@
 """
 
 import unittest
-from flask import Flask, Request, jsonify as _jsonify
+from flask import Flask, Request
 from werkzeug.test import EnvironBuilder
 
 from firebase_functions import core, https_fn
@@ -71,13 +71,14 @@ def func(_):
 
         self.assertEqual("world", hello)
 
+
     def test_callable_encoding(self):
         app = Flask(__name__)
 
         @https_fn.on_call()
         def add(req: https_fn.CallableRequest[int]):
             return req.data + 1
-        
+
         with app.test_request_context("/"):
             environ = EnvironBuilder(
                 method="POST",
@@ -90,18 +91,23 @@ def add(req: https_fn.CallableRequest[int]):
             response = add(request)
             self.assertEqual(response.status_code, 200)
             self.assertEqual(response.get_json(), { "result": 2 })
-    
+
+
     def test_callable_errors(self):
         app = Flask(__name__)
 
         @https_fn.on_call()
         def throw_generic_error(req):
+            # pylint: disable=broad-exception-raised
             raise Exception("Invalid type")
 
         @https_fn.on_call()
         def throw_access_denied(req):
-            raise https_fn.HttpsError(https_fn.FunctionsErrorCode.PERMISSION_DENIED, "Permission is denied")
-        
+            raise https_fn.HttpsError(
+                https_fn.FunctionsErrorCode.PERMISSION_DENIED,
+                "Permission is denied"
+            )
+
         with app.test_request_context("/"):
             environ = EnvironBuilder(
                 method="POST",
@@ -113,11 +119,18 @@ def throw_access_denied(req):
 
             response = throw_generic_error(request)
             self.assertEqual(response.status_code, 500)
-            self.assertEqual(response.get_json(), { "error": { "message": "INTERNAL", "status": "INTERNAL" } })
+            self.assertEqual(response.get_json(), {
+                "error": { "message": "INTERNAL", "status": "INTERNAL" }
+            })
 
             response = throw_access_denied(request)
             self.assertEqual(response.status_code, 403)
-            self.assertEqual(response.get_json(), { "error": { "message": "Permission is denied", "status": "PERMISSION_DENIED" }})
+            self.assertEqual(response.get_json(), {
+                "error": {
+                    "message": "Permission is denied",
+                    "status": "PERMISSION_DENIED"
+                }
+            })
 
     def test_yielding_without_streaming(self):
         app = Flask(__name__)
@@ -130,7 +143,10 @@ def yielder(req: https_fn.CallableRequest[int]):
         @https_fn.on_call()
         def yield_thrower(req: https_fn.CallableRequest[int]):
             yield from range(req.data)
-            raise https_fn.HttpsError(https_fn.FunctionsErrorCode.PERMISSION_DENIED, "Can't read anymore")
+            raise https_fn.HttpsError(
+                https_fn.FunctionsErrorCode.PERMISSION_DENIED,
+                "Can't read anymore"
+            )
 
         with app.test_request_context("/"):
             environ = EnvironBuilder(
@@ -158,7 +174,9 @@ def yield_thrower(req: https_fn.CallableRequest[int]):
             response = yield_thrower(request)
 
             self.assertEqual(response.status_code, 403)
-            self.assertEqual(response.get_json(), { "error": { "message": "Can't read anymore", "status": "PERMISSION_DENIED" }})
+            self.assertEqual(response.get_json(), {
+                "error": { "message": "Can't read anymore", "status": "PERMISSION_DENIED" }
+            })
 
 
     def test_yielding_with_streaming(self):
@@ -190,7 +208,12 @@ def yield_thrower(req: https_fn.CallableRequest[int]):
 
             self.assertEqual(response.status_code, 200)
             chunks = list(response.response)
-            self.assertEqual(chunks, ['data: {"message": 0}\n\n', 'data: {"message": 1}\n\n', 'data: {"result": "OK"}\n\n', "END"])
+            self.assertEqual(chunks, [
+                'data: {"message": 0}\n\n',
+                'data: {"message": 1}\n\n',
+                'data: {"result": "OK"}\n\n',
+                "END"
+            ])
 
         with app.test_request_context("/"):
             environ = EnvironBuilder(
@@ -208,4 +231,9 @@ def yield_thrower(req: https_fn.CallableRequest[int]):
 
             self.assertEqual(response.status_code, 200)
             chunks = list(response.response)
-            self.assertEqual(chunks, ['data: {"message": 0}\n\n', 'data: {"message": 1}\n\n', 'error: {"error": {"status": "INTERNAL", "message": "Throwing"}}\n\n', "END"])
+            self.assertEqual(chunks, [
+                'data: {"message": 0}\n\n',
+                'data: {"message": 1}\n\n',
+                'error: {"error": {"status": "INTERNAL", "message": "Throwing"}}\n\n',
+                "END"
+            ])