Commit 1758bf76 authored by Andrew Godwin's avatar Andrew Godwin
Browse files

Merge pull request #287 from uruz/ticket18791

Fixed #18791: [py3] Double import of six in django.forms.widgets
parents bf12c663 abc4038b
Loading
Loading
Loading
Loading
+1 −3
Original line number Diff line number Diff line
@@ -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',