Fixed #21302 -- Fixed unused imports and import *.

4 files changed, 10 insertions, 8 deletions

diff --git a/django/forms/__init__.py b/django/forms/__init__.py
index 34896d948d..c6573388db 100644
--- a/django/forms/__init__.py
+++ b/django/forms/__init__.py
@@ -2,8 +2,8 @@
 Django validation and HTML form handling.
 """
 
-from django.core.exceptions import ValidationError
-from django.forms.fields import *
-from django.forms.forms import *
-from django.forms.models import *
-from django.forms.widgets import *
+from django.core.exceptions import ValidationError  # NOQA
+from django.forms.fields import *  # NOQA
+from django.forms.forms import *  # NOQA
+from django.forms.models import *  # NOQA
+from django.forms.widgets import *  # NOQA
diff --git a/django/forms/extras/__init__.py b/django/forms/extras/__init__.py
index 28316f472c..1026bce5e5 100644
--- a/django/forms/extras/__init__.py
+++ b/django/forms/extras/__init__.py
@@ -1 +1,3 @@
-from django.forms.extras.widgets import *
+from django.forms.extras.widgets import SelectDateWidget
+
+__all__ = ['SelectDateWidget']
diff --git a/django/forms/fields.py b/django/forms/fields.py
index b5816889f9..bd62a57200 100644
--- a/django/forms/fields.py
+++ b/django/forms/fields.py
@@ -30,7 +30,7 @@ from django.utils.six.moves.urllib.parse import urlsplit, urlunsplit
 from django.utils.translation import ugettext_lazy as _, ungettext_lazy
 
 # Provide this import for backwards compatibility.
-from django.core.validators import EMPTY_VALUES
+from django.core.validators import EMPTY_VALUES  # NOQA
 
 
 __all__ = (
diff --git a/django/forms/widgets.py b/django/forms/widgets.py
index 58bcabef98..a3f69d86ae 100644
--- a/django/forms/widgets.py
+++ b/django/forms/widgets.py
@@ -15,7 +15,7 @@ from django.utils.html import conditional_escape, format_html
 from django.utils.translation import ugettext_lazy
 from django.utils.encoding import force_text, python_2_unicode_compatible
 from django.utils.safestring import mark_safe
-from django.utils import datetime_safe, formats, six
+from django.utils import formats, six
 from django.utils.six.moves.urllib.parse import urljoin
 
 __all__ = (