merge with stubgen output

django-stubs/conf/__init__.pyi

@@ -1,30 +1,40 @@
-from typing import (
-    Any,
-    List,
-)
+# Stubs for django.conf (Python 3.6)
+#
+# NOTE: This dynamically typed stub was automatically generated by stubgen.
 
+from django.utils.functional import LazyObject
+from typing import Any, Optional
 
-class LazySettings:
-    def __delattr__(self, name: str) -> None: ...
+from typing import Any, List
+ENVIRONMENT_VARIABLE: str
+class LazySettings(LazyObject):
+    _wrapped: Any = ...
+    def _setup(self, name: None = ...) -> None: ...
+    def __repr__(self): ...
     def __getattr__(self, name: str) -> Any: ...
     def __setattr__(self, name: str, value: object) -> None: ...
-    def _setup(self, name: None = ...): ...
-    def configure(self, default_settings: Any = ..., **options): ...
+    def __delattr__(self, name: str) -> None: ...
+    def configure(self, default_settings: Any = ..., **options: Any) -> None: ...
     @property
     def configured(self) -> bool: ...
 
-
 class Settings:
-    def __init__(self, settings_module: str): ...
+    SETTINGS_MODULE: Any = ...
+    _explicit_settings: Any = ...
+    def __init__(self, settings_module: str) -> None: ...
     def is_overridden(self, setting: str) -> bool: ...
-
+    def __repr__(self): ...
 
 class UserSettingsHolder:
+    SETTINGS_MODULE: Any = ...
+    default_settings: Any = ...
+    def __init__(self, default_settings: Any) -> None: ...
+    def __getattr__(self, name: str) -> Any: ...
+    def __setattr__(self, name: str, value: Any) -> None: ...
     def __delattr__(self, name: str) -> None: ...
     def __dir__(self) -> List[str]: ...
-    def __getattr__(self, name: str) -> Any: ...
-    def __init__(self, default_settings: Any) -> None: ...
-    def __setattr__(self, name: str, value: Any) -> None: ...
+    def is_overridden(self, setting: Any): ...
+    def __repr__(self): ...
 
-
-settings = LazySettings()
+settings = LazySettings()
+settings: Any

django-stubs/conf/urls/__init__.pyi

@@ -1,17 +1,15 @@
-from django.urls.resolvers import (
-    URLPattern,
-    URLResolver,
-)
-from typing import (
-    Any,
-    Optional,
-    Union,
-)
+# Stubs for django.conf.urls (Python 3.6)
+#
+# NOTE: This dynamically typed stub was automatically generated by stubgen.
 
+from django.urls import include as include
+from typing import Any, Optional
 
-def url(
-    regex: str,
-    view: Any,
-    kwargs: Any = ...,
-    name: Optional[str] = ...
-) -> Union[URLPattern, URLResolver]: ...
+from django.urls.resolvers import URLPattern, URLResolver
+from typing import Any, Optional, Union
+handler400: Any
+handler403: Any
+handler404: Any
+handler500: Any
+
+def url(regex: str, view: Any, kwargs: Any = ..., name: Optional[str] = ...) -> Union[URLPattern, URLResolver]: ...

django-stubs/conf/urls/i18n.pyi

@@ -1,16 +1,12 @@
+# Stubs for django.conf.urls.i18n (Python 3.6)
+#
+# NOTE: This dynamically typed stub was automatically generated by stubgen.
+
+from typing import Any
+
 from django.urls.resolvers import URLResolver
-from typing import (
-    Any,
-    List,
-    Tuple,
-    Union,
-)
+from typing import Any, List, Tuple, Union
+def i18n_patterns(*urls: Any, prefix_default_language: bool = ...) -> Union[List[URLResolver], List[List[Any]]]: ...
+def is_language_prefix_patterns_used(urlconf: str) -> Tuple[bool, bool]: ...
 
-
-def i18n_patterns(
-    *urls,
-    prefix_default_language = ...
-) -> Union[List[URLResolver], List[List[Any]]]: ...
-
-
-def is_language_prefix_patterns_used(urlconf: str) -> Tuple[bool, bool]: ...
+urlpatterns: Any

django-stubs/conf/urls/static.pyi

@@ -1,8 +1,9 @@
+# Stubs for django.conf.urls.static (Python 3.6)
+#
+# NOTE: This dynamically typed stub was automatically generated by stubgen.
+
+from typing import Any
+
 from django.urls.resolvers import URLPattern
-from typing import (
-    Callable,
-    List,
-)
-
-
-def static(prefix: str, view: Callable = ..., **kwargs) -> List[URLPattern]: ...
+from typing import Callable, List
+def static(prefix: str, view: Callable = ..., **kwargs: Any) -> List[URLPattern]: ...