Browse Source

Avoid using Django's six module.

master
Erik Stein 4 years ago
parent
commit
530b9d1704
  1. 1
      setup.py
  2. 2
      shared/utils/models/slugs.py
  3. 3
      shared/utils/templatetags/translation_tags.py
  4. 4
      shared/utils/text.py

1
setup.py

@ -64,6 +64,7 @@ setup(
'beautifulsoup4', 'beautifulsoup4',
'translitcodec', 'translitcodec',
'django-dirtyfields', 'django-dirtyfields',
'six',
], ],
classifiers=[ classifiers=[
# 'Development Status :: 4 - Beta', # 'Development Status :: 4 - Beta',

2
shared/utils/models/slugs.py

@ -1,5 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import unicode_literals from __future__ import unicode_literals
import six
from django.conf import settings from django.conf import settings
from django.core import validators from django.core import validators
@ -7,7 +8,6 @@ from django.db import models
from django.db.models import fields as django_fields from django.db.models import fields as django_fields
from django.db.models.signals import pre_save, post_save from django.db.models.signals import pre_save, post_save
from django.dispatch import receiver from django.dispatch import receiver
from django.utils import six
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from dirtyfields import DirtyFieldsMixin from dirtyfields import DirtyFieldsMixin

3
shared/utils/templatetags/translation_tags.py

@ -1,7 +1,8 @@
from urllib.parse import urlsplit, urlunsplit
from django import template from django import template
from django.urls.exceptions import NoReverseMatch from django.urls.exceptions import NoReverseMatch
from django.urls import reverse from django.urls import reverse
from django.utils.six.moves.urllib.parse import urlsplit, urlunsplit
from django.utils.translation import override from django.utils.translation import override
from ..translation import get_translation, get_translated_field from ..translation import get_translation, get_translated_field

4
shared/utils/text.py

@ -2,14 +2,14 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import codecs import codecs
import translitcodec # provides 'translit/long', used by codecs.encode() import translitcodec # provides 'translit/long', used by codecs.encode()
import re import re
import six
from django.conf import settings from django.conf import settings
from django.utils.encoding import force_text, smart_text from django.utils.encoding import force_text, smart_text
from django.utils.functional import keep_lazy_text from django.utils.functional import keep_lazy_text
from django.utils.html import mark_safe from django.utils.html import mark_safe
from django.utils import six
from django.utils.text import slugify as django_slugify from django.utils.text import slugify as django_slugify
from django.utils.translation import ugettext_lazy from django.utils.translation import ugettext_lazy

Loading…
Cancel
Save