Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

removed django.utils.six intead directly imported six #1

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/dal/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from django.contrib.auth import get_permission_codename
from django.core.exceptions import ImproperlyConfigured
from django.http import HttpResponseBadRequest, HttpResponseNotAllowed
from django.utils import six
import six
from django.views.generic.list import BaseListView


Expand Down
2 changes: 1 addition & 1 deletion src/dal/widgets.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from django.urls import reverse
except ImportError:
from django.core.urlresolvers import reverse
from django.utils import six
import six
from django.utils.safestring import mark_safe


Expand Down
2 changes: 1 addition & 1 deletion src/dal_contenttypes/fields.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"""Model choice fields that take a ContentType too: for generic relations."""

from django.contrib.contenttypes.models import ContentType
from django.utils import six
import six


class ContentTypeModelFieldMixin(object):
Expand Down
2 changes: 1 addition & 1 deletion src/dal_queryset_sequence/widgets.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

from django import forms
from django.contrib.contenttypes.models import ContentType
from django.utils import six
import six


class QuerySetSequenceSelectMixin(WidgetMixin):
Expand Down
2 changes: 1 addition & 1 deletion src/dal_select2/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

from django import http
from django.core.exceptions import ImproperlyConfigured
from django.utils import six
import six
from django.utils.translation import ugettext as _
from django.views.generic.list import View

Expand Down
2 changes: 1 addition & 1 deletion src/dal_select2/widgets.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from django.contrib.admin.widgets import SELECT2_TRANSLATIONS
except ImportError:
SELECT2_TRANSLATIONS = {}
from django.utils import six
import six
from django.utils import translation


Expand Down
2 changes: 1 addition & 1 deletion src/dal_select2_queryset_sequence/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from queryset_sequence import QuerySetSequence

from django.template.defaultfilters import capfirst
from django.utils import six
import six
from django.db.models import Q

from functools import reduce
Expand Down
2 changes: 1 addition & 1 deletion src/dal_select2_taggit/widgets.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from dal_select2.widgets import TagSelect2

from django import VERSION
from django.utils import six
import six


class TaggitSelect2(TagSelect2):
Expand Down
2 changes: 1 addition & 1 deletion test_project/select2_generic_foreign_key/test_forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from django.urls import reverse
except ImportError:
from django.core.urlresolvers import reverse
from django.utils import six
import six

from queryset_sequence import QuerySetSequence

Expand Down
2 changes: 1 addition & 1 deletion test_project/select2_generic_m2m/test_forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from django.urls import reverse
except ImportError:
from django.core.urlresolvers import reverse
from django.utils import six
import six

from queryset_sequence import QuerySetSequence

Expand Down
2 changes: 1 addition & 1 deletion test_project/select2_list/test_functional.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from dal_select2.test import Select2Story

from django.utils import six
import six

from .models import TModel

Expand Down
2 changes: 1 addition & 1 deletion test_project/select2_tagging/test_forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from django.urls import reverse
except ImportError:
from django.core.urlresolvers import reverse
from django.utils import six
import six

from tagging.models import Tag

Expand Down
2 changes: 1 addition & 1 deletion test_project/select2_taggit/test_forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from django.urls import reverse
except ImportError:
from django.core.urlresolvers import reverse
from django.utils import six
import six

from taggit.models import Tag

Expand Down
2 changes: 1 addition & 1 deletion test_project/tests/test_widgets.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
except ImportError:
from django.core.urlresolvers import reverse
from django.test.utils import override_settings
from django.utils import six
import six

import mock

Expand Down