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.

Sign up for GitHub

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

Jump to bottom

fix: Django 3.0 deprecation import fix #266

Merged
merged 3 commits into from
Dec 6, 2019
Merged

fix: Django 3.0 deprecation import fix #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
397ee6c
fix: deprecation func removed
igor-yamshchykov Dec 2, 2019
f3b2673
chore: removed whiteline
igor-yamshchykov Dec 2, 2019
11ea3f7
fix: added all locations; reversed imports
igor-yamshchykov Dec 3, 2019
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
14 changes: 12 additions & 2 deletions leaflet/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,19 @@

from django.conf import settings
from django.core.exceptions import ImproperlyConfigured
from django.contrib.staticfiles.templatetags.staticfiles import static

try:
from django.templatetags.static import static
except ImportError:
from django.contrib.staticfiles.templatetags.staticfiles import static

from django.utils.translation import ugettext_lazy as _
from django.utils import six

try:
import six
except ImportError:
from django.utils import six

import django

from .utils import memoized_lazy_function, ListWithLazyItems, ListWithLazyItemsRawIterator
Expand Down
7 changes: 6 additions & 1 deletion leaflet/forms/backport.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,12 @@
from django.core.exceptions import ImproperlyConfigured
from django.forms.widgets import Widget
from django.template import loader
from django.utils import six

try:
import six
except ImportError:
from django.utils import six

from django.utils import translation
from django import forms
from django.utils.translation import ugettext_lazy as _
Expand Down
7 changes: 6 additions & 1 deletion leaflet/templatetags/leaflet_tags.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,12 @@

from django import template
from django.conf import settings
from django.utils import six

try:
import six
except ImportError:
from django.utils import six

from django.utils.encoding import force_text

from leaflet import (app_settings, SPATIAL_EXTENT, SRID, PLUGINS, PLUGINS_DEFAULT,
Expand Down
14 changes: 12 additions & 2 deletions leaflet/tests/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,24 @@

import django
from django.contrib.staticfiles.storage import StaticFilesStorage, staticfiles_storage
from django.contrib.staticfiles.templatetags.staticfiles import static

try:
from django.templatetags.static import static
except ImportError:
from django.contrib.staticfiles.templatetags.staticfiles import static

from django.test import SimpleTestCase
from django.contrib.admin import ModelAdmin, StackedInline
from django.contrib.admin.options import BaseModelAdmin, InlineModelAdmin
from django.contrib.gis.db import models as gismodels

from .. import PLUGINS, PLUGIN_FORMS, _normalize_plugins_config, JSONLazyTranslationEncoder
from django.utils import six

try:
import six
except ImportError:
from django.utils import six

from django.utils.translation import ugettext_lazy
from ..templatetags import leaflet_tags
from ..admin import LeafletGeoAdmin, LeafletGeoAdminMixin
Expand Down