Merge branch '12.0' into 13.0

odoo-stubs/http.pyi

@@ -3,7 +3,7 @@ import werkzeug.contrib.sessions
 from datetime import date as date
 
 from odoo import fields as fields
-from typing import Any, Optional
+from typing import Any, Optional, Union
 
 from odoo.api import Environment
 from odoo.sql_db import Cursor
@@ -15,7 +15,7 @@ STATIC_CACHE: Any
 STATIC_CACHE_LONG: Any
 ALLOWED_DEBUG_MODES: Any
 _request_stack: Any
-request: '__Request'
+request: Union[HttpRequest, JsonRequest]
 
 def replace_request_password(args: Any): ...
 
@@ -32,6 +32,7 @@ class WebRequest:
     endpoint: Any = ...
     endpoint_arguments: Any = ...
     auth_method: Any = ...
+    website = Environment()['website']
     _cr: Cursor = ...
     _uid: int = ...
     _context: dict = ...
@@ -64,6 +65,7 @@ class WebRequest:
     def db(self): ...
     def csrf_token(self, time_limit: int = ...): ...
     def validate_csrf(self, csrf: Any): ...
+    def redirect(self, url: str, code=302): ...
 
 def route(route: Optional[Any] = ..., **kw: Any): ...
 
@@ -89,10 +91,6 @@ class HttpRequest(WebRequest):
     def render(self, template: Any, qcontext: Optional[Any] = ..., lazy: bool = ..., **kw: Any): ...
     def not_found(self, description: Optional[Any] = ...): ...
 
-class __Request(HttpRequest, JsonRequest):
-    website = Environment()['website']
-    def redirect(self, url: str, code=302): ...
-
 addons_manifest: Any
 controllers_per_module: Any