Add config.update support for setters (#2354)

.github/workflows/codeql-analysis.yml

@@ -2,9 +2,13 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ main ]
+    branches:
+      - main
+      - "*LTS"
   pull_request:
-    branches: [ main ]
+    branches:
+      - main
+      - "*LTS"
     types: [opened, synchronize, reopened, ready_for_review]
   schedule:
     - cron: '25 16 * * 0'

.github/workflows/coverage.yml

@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - main
+      - "*LTS"
     tags:
       - "!*" # Do not execute on tags
   pull_request:

.github/workflows/pr-bandit.yml

@@ -3,6 +3,7 @@ on:
   pull_request:
     branches:
       - main
+      - "*LTS"
     types: [opened, synchronize, reopened, ready_for_review]
 
 jobs:

.github/workflows/pr-docs.yml

@@ -3,6 +3,7 @@ on:
   pull_request:
     branches:
       - main
+      - "*LTS"
     types: [opened, synchronize, reopened, ready_for_review]
 
 jobs:

.github/workflows/pr-linter.yml

@@ -3,6 +3,7 @@ on:
   pull_request:
     branches:
       - main
+      - "*LTS"
     types: [opened, synchronize, reopened, ready_for_review]
 
 jobs:

.github/workflows/pr-python310.yml

@@ -3,6 +3,7 @@ on:
   pull_request:
     branches:
       - main
+      - "*LTS"
     types: [opened, synchronize, reopened, ready_for_review]
 
 jobs:

.github/workflows/pr-python37.yml

@@ -3,6 +3,7 @@ on:
   pull_request:
     branches:
       - main
+      - "*LTS"
     types: [opened, synchronize, reopened, ready_for_review]
 
 jobs:

.github/workflows/pr-python38.yml

@@ -3,6 +3,7 @@ on:
   pull_request:
     branches:
       - main
+      - "*LTS"
     types: [opened, synchronize, reopened, ready_for_review]
 
 jobs:

.github/workflows/pr-python39.yml

@@ -3,6 +3,7 @@ on:
   pull_request:
     branches:
       - main
+      - "*LTS"
     types: [opened, synchronize, reopened, ready_for_review]
 
 jobs:

.github/workflows/pr-type-check.yml

@@ -3,6 +3,7 @@ on:
   pull_request:
     branches:
       - main
+      - "*LTS"
     types: [opened, synchronize, reopened, ready_for_review]
 
 jobs:

.github/workflows/pr-windows.yml

@@ -3,6 +3,7 @@ on:
   pull_request:
     branches:
       - main
+      - "*LTS"
     types: [opened, synchronize, reopened, ready_for_review]
 
 jobs:

sanic/config.py

@@ -124,22 +124,27 @@ class Config(dict, metaclass=DescriptorMeta):
             raise AttributeError(f"Config has no '{ke.args[0]}'")
 
     def __setattr__(self, attr, value) -> None:
-        if attr in self.__class__.__setters__:
-            try:
-                super().__setattr__(attr, value)
-            except AttributeError:
-                ...
-            else:
-                return None
         self.update({attr: value})
 
     def __setitem__(self, attr, value) -> None:
         self.update({attr: value})
 
     def update(self, *other, **kwargs) -> None:
-        other_mapping = {k: v for item in other for k, v in dict(item).items()}
+        kwargs.update({k: v for item in other for k, v in dict(item).items()})
-        super().update(*other, **kwargs)
+        setters: Dict[str, Any] = {
-        for attr, value in {**other_mapping, **kwargs}.items():
+            k: kwargs.pop(k)
+            for k in {**kwargs}.keys()
+            if k in self.__class__.__setters__
+        }
+
+        for key, value in setters.items():
+            try:
+                super().__setattr__(key, value)
+            except AttributeError:
+                ...
+
+        super().update(**kwargs)
+        for attr, value in {**setters, **kwargs}.items():
             self._post_set(attr, value)
 
     def _post_set(self, attr, value) -> None:

tests/test_config.py

@@ -5,7 +5,7 @@ from os import environ
 from pathlib import Path
 from tempfile import TemporaryDirectory
 from textwrap import dedent
-from unittest.mock import Mock
+from unittest.mock import Mock, call
 
 import pytest
 
@@ -385,5 +385,24 @@ def test_config_set_methods(app, monkeypatch):
     post_set.assert_called_once_with("FOO", 5)
     post_set.reset_mock()
 
-    app.config.update_config({"FOO": 6})
+    app.config.update({"FOO": 6}, {"BAR": 7})
-    post_set.assert_called_once_with("FOO", 6)
+    post_set.assert_has_calls(
+        calls=[
+            call("FOO", 6),
+            call("BAR", 7),
+        ]
+    )
+    post_set.reset_mock()
+
+    app.config.update({"FOO": 8}, BAR=9)
+    post_set.assert_has_calls(
+        calls=[
+            call("FOO", 8),
+            call("BAR", 9),
+        ],
+        any_order=True,
+    )
+    post_set.reset_mock()
+
+    app.config.update_config({"FOO": 10})
+    post_set.assert_called_once_with("FOO", 10)

tests/test_errorpages.py

@@ -334,6 +334,22 @@ def test_config_fallback_before_and_after_startup(app):
     assert response.content_type == "text/plain; charset=utf-8"
 
 
+def test_config_fallback_using_update_dict(app):
+    app.config.update({"FALLBACK_ERROR_FORMAT": "text"})
+
+    _, response = app.test_client.get("/error")
+    assert response.status == 500
+    assert response.content_type == "text/plain; charset=utf-8"
+
+
+def test_config_fallback_using_update_kwarg(app):
+    app.config.update(FALLBACK_ERROR_FORMAT="text")
+
+    _, response = app.test_client.get("/error")
+    assert response.status == 500
+    assert response.content_type == "text/plain; charset=utf-8"
+
+
 def test_config_fallback_bad_value(app):
     message = "Unknown format: fake"
     with pytest.raises(SanicException, match=message):

tests/test_pipelining.py

@@ -62,19 +62,15 @@ def test_streaming_body_requests(app):
 
     data = ["hello", "world"]
 
-    class Data(AsyncByteStream):
-        def __init__(self, data):
-            self.data = data
-
-        async def __aiter__(self):
-            for value in self.data:
-                yield value.encode("utf-8")
-
     client = ReusableClient(app, port=1234)
 
+    async def stream(data):
+        for value in data:
+            yield value.encode("utf-8")
+
     with client:
-        _, response1 = client.post("/", data=Data(data))
+        _, response1 = client.post("/", data=stream(data))
-        _, response2 = client.post("/", data=Data(data))
+        _, response2 = client.post("/", data=stream(data))
 
     assert response1.status == response2.status == 200
     assert response1.json["data"] == response2.json["data"] == data

tests/test_server_loop.py

@@ -4,8 +4,8 @@ from unittest.mock import Mock, patch
 
 import pytest
 
-from sanic.server import loop
 from sanic.compat import OS_IS_WINDOWS, UVLOOP_INSTALLED
+from sanic.server import loop
 
 
 @pytest.mark.skipif(