From b80e3a4b6b5e0547942c947a8665731bb3995085 Mon Sep 17 00:00:00 2001
From: Maxim Kurnikov <maxim.kurnikov@gmail.com>
Date: Wed, 14 Nov 2018 03:04:24 +0300
Subject: [PATCH] more stubs

---
 django-stubs/db/models/base.pyi |  4 ++--
 django-stubs/http/__init__.pyi  |  3 ++-
 django-stubs/urls/__init__.pyi  | 26 ++++++++------------------
 django-stubs/urls/base.pyi      |  4 ----
 django-stubs/urls/conf.pyi      |  5 +----
 5 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/django-stubs/db/models/base.pyi b/django-stubs/db/models/base.pyi
index d7cc584..2db1d0a 100644
--- a/django-stubs/db/models/base.pyi
+++ b/django-stubs/db/models/base.pyi
@@ -1,4 +1,4 @@
-from typing import Any, List, Optional, Set
+from typing import Any, List, Optional, Set, Tuple, Dict
 
 
 class ModelBase(type):
@@ -15,7 +15,7 @@ class Model(metaclass=ModelBase):
 
     def delete(self,
                using: Any = ...,
-               keep_parents: bool = ...) -> None: ...
+               keep_parents: bool = ...) -> Tuple[int, Dict[str, int]]: ...
 
     def full_clean(
         self, exclude: Optional[List[str]] = ..., validate_unique: bool = ...
diff --git a/django-stubs/http/__init__.pyi b/django-stubs/http/__init__.pyi
index 91b892f..098d199 100644
--- a/django-stubs/http/__init__.pyi
+++ b/django-stubs/http/__init__.pyi
@@ -1,4 +1,5 @@
-from .request import (HttpRequest as HttpRequest)
+from .request import (HttpRequest as HttpRequest,
+                      QueryDict as QueryDict)
 
 from .response import (BadHeaderError as BadHeaderError,
                        FileResponse as FileResponse,
diff --git a/django-stubs/urls/__init__.pyi b/django-stubs/urls/__init__.pyi
index ad3cdb9..51c5a1a 100644
--- a/django-stubs/urls/__init__.pyi
+++ b/django-stubs/urls/__init__.pyi
@@ -1,19 +1,9 @@
-from .conf import (
-    include as include,
-    path as path,
-    re_path as re_path
-)
-from .resolvers import (
-    LocaleRegexProvider, LocaleRegexURLResolver, RegexURLPattern,
-    RegexURLResolver, ResolverMatch, get_ns_resolver, get_resolver,
-)
-from .utils import get_callable, get_mod_func
+from .base import reverse as reverse
 
-__all__ = [
-    'LocaleRegexProvider', 'LocaleRegexURLResolver', 'NoReverseMatch',
-    'RegexURLPattern', 'RegexURLResolver', 'Resolver404', 'ResolverMatch',
-    'clear_script_prefix', 'clear_url_caches', 'get_callable', 'get_mod_func',
-    'get_ns_resolver', 'get_resolver', 'get_script_prefix', 'get_urlconf',
-    'is_valid_path', 'resolve', 'reverse', 'reverse_lazy', 'set_script_prefix',
-    'set_urlconf', 'translate_url',
-]
+from .conf import (include as include,
+                   path as path,
+                   re_path as re_path)
+
+from .resolvers import (ResolverMatch as ResolverMatch,
+                        get_ns_resolver as get_ns_resolver,
+                        get_resolver as get_resolver)
\ No newline at end of file
diff --git a/django-stubs/urls/base.pyi b/django-stubs/urls/base.pyi
index b1dc0b7..3179b9b 100644
--- a/django-stubs/urls/base.pyi
+++ b/django-stubs/urls/base.pyi
@@ -3,10 +3,6 @@ from uuid import UUID
 
 from django.urls.resolvers import ResolverMatch
 
-from .exceptions import NoReverseMatch, Resolver404
-from .resolvers import get_ns_resolver, get_resolver
-from .utils import get_callable
-
 
 def resolve(path: str, urlconf: Optional[str] = ...) -> ResolverMatch: ...
 def reverse(
diff --git a/django-stubs/urls/conf.pyi b/django-stubs/urls/conf.pyi
index d757196..e11177a 100644
--- a/django-stubs/urls/conf.pyi
+++ b/django-stubs/urls/conf.pyi
@@ -1,9 +1,6 @@
 from typing import Any, Callable, List, Optional, Tuple, Union
 
-from django.urls.resolvers import URLPattern, URLResolver
-
-from .resolvers import (LocalePrefixPattern, RegexPattern, RoutePattern,
-                        URLPattern, URLResolver)
+from .resolvers import URLPattern, URLResolver
 
 
 def include(