p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #287 from uruz/ticket18791 

Fixed #18791: [py3] Double import of six in django.forms.widgets
This commit is contained in:
Andrew Godwin 2012-08-18 09:45:16 -07:00
parent bf12c663d9 abc4038b0b
commit 1758bf76e4
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/forms/widgets.py
View File

@ -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',