merge with stubgen output

django-stubs/middleware/cache.pyi

@@ -1,33 +1,36 @@
+# Stubs for django.middleware.cache (Python 3.6)
+#
+# NOTE: This dynamically typed stub was automatically generated by stubgen.
+
+from django.utils.deprecation import MiddlewareMixin
+from typing import Any, Optional
+
 from django.core.handlers.wsgi import WSGIRequest
 from django.http.request import HttpRequest
-from django.http.response import (
-    HttpResponse,
-    HttpResponseBase,
-)
-from typing import (
-    Callable,
-    Optional,
-)
+from django.http.response import HttpResponse, HttpResponseBase
+from typing import Callable, Optional
+class UpdateCacheMiddleware(MiddlewareMixin):
+    cache_timeout: Any = ...
+    key_prefix: Any = ...
+    cache_alias: Any = ...
+    cache: Any = ...
+    get_response: Any = ...
+    def __init__(self, get_response: None = ...) -> None: ...
+    def _should_update_cache(self, request: WSGIRequest, response: HttpResponse) -> bool: ...
+    def process_response(self, request: WSGIRequest, response: HttpResponseBase) -> HttpResponseBase: ...
 
-
-class CacheMiddleware:
-    def __init__(self, get_response: None = ..., cache_timeout: Optional[int] = ..., **kwargs) -> None: ...
-
-
-class FetchFromCacheMiddleware:
+class FetchFromCacheMiddleware(MiddlewareMixin):
+    key_prefix: Any = ...
+    cache_alias: Any = ...
+    cache: Any = ...
+    get_response: Any = ...
     def __init__(self, get_response: Optional[Callable] = ...) -> None: ...
     def process_request(self, request: HttpRequest) -> Optional[HttpResponse]: ...
 
-
-class UpdateCacheMiddleware:
-    def __init__(self, get_response: None = ...) -> None: ...
-    def _should_update_cache(
-        self,
-        request: WSGIRequest,
-        response: HttpResponse
-    ) -> bool: ...
-    def process_response(
-        self,
-        request: WSGIRequest,
-        response: HttpResponseBase
-    ) -> HttpResponseBase: ...
+class CacheMiddleware(UpdateCacheMiddleware, FetchFromCacheMiddleware):
+    get_response: Any = ...
+    key_prefix: Any = ...
+    cache_alias: Any = ...
+    cache_timeout: Any = ...
+    cache: Any = ...
+    def __init__(self, get_response: None = ..., cache_timeout: Optional[int] = ..., **kwargs: Any) -> None: ...

django-stubs/middleware/clickjacking.pyi

@@ -1,15 +1,12 @@
+# Stubs for django.middleware.clickjacking (Python 3.6)
+#
+# NOTE: This dynamically typed stub was automatically generated by stubgen.
+
+from django.utils.deprecation import MiddlewareMixin
+from typing import Any
+
 from django.http.request import HttpRequest
 from django.http.response import HttpResponse
-
-
-class XFrameOptionsMiddleware:
-    def get_xframe_options_value(
-        self,
-        request: HttpRequest,
-        response: HttpResponse
-    ) -> str: ...
-    def process_response(
-        self,
-        request: HttpRequest,
-        response: HttpResponse
-    ) -> HttpResponse: ...
+class XFrameOptionsMiddleware(MiddlewareMixin):
+    def process_response(self, request: HttpRequest, response: HttpResponse) -> HttpResponse: ...
+    def get_xframe_options_value(self, request: HttpRequest, response: HttpResponse) -> str: ...

django-stubs/middleware/common.pyi

@@ -1,38 +1,22 @@
+# Stubs for django.middleware.common (Python 3.6)
+#
+# NOTE: This dynamically typed stub was automatically generated by stubgen.
+
+from django.utils.deprecation import MiddlewareMixin
+from typing import Any
+
 from django.core.handlers.wsgi import WSGIRequest
 from django.http.request import HttpRequest
-from django.http.response import (
-    HttpResponseBase,
-    HttpResponseNotFound,
-    HttpResponsePermanentRedirect,
-)
+from django.http.response import HttpResponseBase, HttpResponseNotFound, HttpResponsePermanentRedirect
 from typing import Optional
-
-
-class BrokenLinkEmailsMiddleware:
-    def is_ignorable_request(
-        self,
-        request: WSGIRequest,
-        uri: str,
-        domain: str,
-        referer: str
-    ) -> bool: ...
-    def is_internal_request(self, domain: str, referer: str) -> bool: ...
-    def process_response(
-        self,
-        request: WSGIRequest,
-        response: HttpResponseNotFound
-    ) -> HttpResponseNotFound: ...
-
-
-class CommonMiddleware:
+class CommonMiddleware(MiddlewareMixin):
+    response_redirect_class: Any = ...
+    def process_request(self, request: WSGIRequest) -> Optional[HttpResponsePermanentRedirect]: ...
+    def should_redirect_with_slash(self, request: WSGIRequest) -> bool: ...
     def get_full_path_with_slash(self, request: WSGIRequest) -> str: ...
-    def process_request(
-        self,
-        request: WSGIRequest
-    ) -> Optional[HttpResponsePermanentRedirect]: ...
-    def process_response(
-        self,
-        request: HttpRequest,
-        response: HttpResponseBase
-    ) -> HttpResponseBase: ...
-    def should_redirect_with_slash(self, request: WSGIRequest) -> bool: ...
+    def process_response(self, request: HttpRequest, response: HttpResponseBase) -> HttpResponseBase: ...
+
+class BrokenLinkEmailsMiddleware(MiddlewareMixin):
+    def process_response(self, request: WSGIRequest, response: HttpResponseNotFound) -> HttpResponseNotFound: ...
+    def is_internal_request(self, domain: str, referer: str) -> bool: ...
+    def is_ignorable_request(self, request: WSGIRequest, uri: str, domain: str, referer: str) -> bool: ...

django-stubs/middleware/csrf.pyi

@@ -1,64 +1,40 @@
+# Stubs for django.middleware.csrf (Python 3.6)
+#
+# NOTE: This dynamically typed stub was automatically generated by stubgen.
+
+from django.utils.deprecation import MiddlewareMixin
+from typing import Any
+
 from django.http.request import HttpRequest
-from django.http.response import (
-    HttpResponse,
-    HttpResponseBase,
-    HttpResponseForbidden,
-)
-from typing import (
-    Any,
-    Callable,
-    Dict,
-    Optional,
-    Tuple,
-)
-
-
-def _compare_salted_tokens(request_csrf_token: str, csrf_token: str) -> bool: ...
-
+from django.http.response import HttpResponse, HttpResponseBase, HttpResponseForbidden
+from typing import Any, Callable, Dict, Optional, Tuple
+logger: Any
+REASON_NO_REFERER: str
+REASON_BAD_REFERER: str
+REASON_NO_CSRF_COOKIE: str
+REASON_BAD_TOKEN: str
+REASON_MALFORMED_REFERER: str
+REASON_INSECURE_REFERER: str
+CSRF_SECRET_LENGTH: int
+CSRF_TOKEN_LENGTH: Any
+CSRF_ALLOWED_CHARS: Any
+CSRF_SESSION_KEY: str
 
 def _get_failure_view() -> Callable: ...
-
-
 def _get_new_csrf_string() -> str: ...
-
-
-def _get_new_csrf_token() -> str: ...
-
-
 def _salt_cipher_secret(secret: str) -> str: ...
-
-
-def _sanitize_token(token: str) -> str: ...
-
-
 def _unsalt_cipher_token(token: str) -> str: ...
-
-
+def _get_new_csrf_token() -> str: ...
 def get_token(request: HttpRequest) -> str: ...
-
-
 def rotate_token(request: HttpRequest) -> None: ...
+def _sanitize_token(token: str) -> str: ...
+def _compare_salted_tokens(request_csrf_token: str, csrf_token: str) -> bool: ...
 
-
-class CsrfViewMiddleware:
+class CsrfViewMiddleware(MiddlewareMixin):
     def _accept(self, request: HttpRequest) -> None: ...
+    def _reject(self, request: HttpRequest, reason: str) -> HttpResponseForbidden: ...
     def _get_token(self, request: HttpRequest) -> Optional[str]: ...
-    def _reject(
-        self,
-        request: HttpRequest,
-        reason: str
-    ) -> HttpResponseForbidden: ...
     def _set_token(self, request: HttpRequest, response: HttpResponse) -> None: ...
     def process_request(self, request: HttpRequest) -> None: ...
-    def process_response(
-        self,
-        request: HttpRequest,
-        response: HttpResponseBase
-    ) -> HttpResponseBase: ...
-    def process_view(
-        self,
-        request: HttpRequest,
-        callback: Callable,
-        callback_args: Tuple,
-        callback_kwargs: Dict[str, Any]
-    ) -> Optional[HttpResponseForbidden]: ...
+    def process_view(self, request: HttpRequest, callback: Callable, callback_args: Tuple, callback_kwargs: Dict[str, Any]) -> Optional[HttpResponseForbidden]: ...
+    def process_response(self, request: HttpRequest, response: HttpResponseBase) -> HttpResponseBase: ...

django-stubs/middleware/gzip.pyi

@@ -1,10 +1,13 @@
+# Stubs for django.middleware.gzip (Python 3.6)
+#
+# NOTE: This dynamically typed stub was automatically generated by stubgen.
+
+from django.utils.deprecation import MiddlewareMixin
+from typing import Any
+
 from django.core.handlers.wsgi import WSGIRequest
 from django.http.response import HttpResponseBase
+re_accepts_gzip: Any
 
-
-class GZipMiddleware:
-    def process_response(
-        self,
-        request: WSGIRequest,
-        response: HttpResponseBase
-    ) -> HttpResponseBase: ...
+class GZipMiddleware(MiddlewareMixin):
+    def process_response(self, request: WSGIRequest, response: HttpResponseBase) -> HttpResponseBase: ...

django-stubs/middleware/http.pyi

@@ -1,11 +1,12 @@
+# Stubs for django.middleware.http (Python 3.6)
+#
+# NOTE: This dynamically typed stub was automatically generated by stubgen.
+
+from django.utils.deprecation import MiddlewareMixin
+from typing import Any
+
 from django.core.handlers.wsgi import WSGIRequest
 from django.http.response import HttpResponse
-
-
-class ConditionalGetMiddleware:
+class ConditionalGetMiddleware(MiddlewareMixin):
+    def process_response(self, request: WSGIRequest, response: HttpResponse) -> HttpResponse: ...
     def needs_etag(self, response: HttpResponse) -> bool: ...
-    def process_response(
-        self,
-        request: WSGIRequest,
-        response: HttpResponse
-    ) -> HttpResponse: ...

django-stubs/middleware/locale.pyi

@@ -1,11 +1,13 @@
+# Stubs for django.middleware.locale (Python 3.6)
+#
+# NOTE: This dynamically typed stub was automatically generated by stubgen.
+
+from django.utils.deprecation import MiddlewareMixin
+from typing import Any
+
 from django.core.handlers.wsgi import WSGIRequest
 from django.http.response import HttpResponse
-
-
-class LocaleMiddleware:
+class LocaleMiddleware(MiddlewareMixin):
+    response_redirect_class: Any = ...
     def process_request(self, request: WSGIRequest) -> None: ...
-    def process_response(
-        self,
-        request: WSGIRequest,
-        response: HttpResponse
-    ) -> HttpResponse: ...
+    def process_response(self, request: WSGIRequest, response: HttpResponse) -> HttpResponse: ...

django-stubs/middleware/security.pyi

@@ -1,19 +1,22 @@
+# Stubs for django.middleware.security (Python 3.6)
+#
+# NOTE: This dynamically typed stub was automatically generated by stubgen.
+
+from django.utils.deprecation import MiddlewareMixin
+from typing import Any, Optional
+
 from django.core.handlers.wsgi import WSGIRequest
-from django.http.response import (
-    HttpResponse,
-    HttpResponsePermanentRedirect,
-)
-from typing import Optional
-
-
-class SecurityMiddleware:
+from django.http.response import HttpResponse, HttpResponsePermanentRedirect
+class SecurityMiddleware(MiddlewareMixin):
+    sts_seconds: Any = ...
+    sts_include_subdomains: Any = ...
+    sts_preload: Any = ...
+    content_type_nosniff: Any = ...
+    xss_filter: Any = ...
+    redirect: Any = ...
+    redirect_host: Any = ...
+    redirect_exempt: Any = ...
+    get_response: Any = ...
     def __init__(self, get_response: None = ...) -> None: ...
-    def process_request(
-        self,
-        request: WSGIRequest
-    ) -> Optional[HttpResponsePermanentRedirect]: ...
-    def process_response(
-        self,
-        request: WSGIRequest,
-        response: HttpResponse
-    ) -> HttpResponse: ...
+    def process_request(self, request: WSGIRequest) -> Optional[HttpResponsePermanentRedirect]: ...
+    def process_response(self, request: WSGIRequest, response: HttpResponse) -> HttpResponse: ...