diff options
| author | Andrew Godwin <andrew@aeracode.org> | 2012-08-18 09:45:16 -0700 |
|---|---|---|
| committer | Andrew Godwin <andrew@aeracode.org> | 2012-08-18 09:45:16 -0700 |
| commit | 1758bf76e4a108ef65a6d5d30196b005e4b302e7 (patch) | |
| tree | b73ee16f3fb2e0a4124313e7a30d1df4665f92e5 | |
| parent | bf12c663d9c2e42d62baa9c7212a18ed2fdc1aa3 (diff) | |
| parent | abc4038b0b47e41bb2d75a37944bbb1699806922 (diff) | |
Merge pull request #287 from uruz/ticket18791
Fixed #18791: [py3] Double import of six in django.forms.widgets
| -rw-r--r-- | django/forms/widgets.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/django/forms/widgets.py b/django/forms/widgets.py index fe7c06ff34..fdb9f50688 100644 --- a/django/forms/widgets.py +++ b/django/forms/widgets.py @@ -19,9 +19,7 @@ from django.utils.html import conditional_escape, format_html, format_html_join from django.utils.translation import ugettext, ugettext_lazy from django.utils.encoding import force_text, python_2_unicode_compatible from django.utils.safestring import mark_safe -from django.utils import six -from django.utils import datetime_safe, formats -from django.utils import six +from django.utils import datetime_safe, formats, six __all__ = ( 'Media', 'MediaDefiningClass', 'Widget', 'TextInput', 'PasswordInput', |
