Skip to content

Commit

Permalink
hopefully removed the remaining ugettext deprecation warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
mmarcos committed Mar 5, 2020
1 parent a78960a commit 07c1e56
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 10 deletions.
2 changes: 1 addition & 1 deletion arctic/generics.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
from django.utils.http import is_safe_url, quote
from django.utils.text import capfirst
from django.utils.translation import get_language
from django.utils.translation import ugettext as _
from django.utils.translation import gettext as _
from django.views import generic as base

import extra_views
Expand Down
3 changes: 2 additions & 1 deletion example/articles/models.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# -*-*- encoding: utf-8 -*-*-
from __future__ import unicode_literals

from datetime import datetime

from django.db import models
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import gettext_lazy as _


class Article(models.Model):
Expand Down
7 changes: 4 additions & 3 deletions example/articles/views.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
from __future__ import absolute_import, unicode_literals

from collections import OrderedDict

from django.urls import reverse, reverse_lazy
from django.utils.safestring import mark_safe
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import gettext_lazy as _

from arctic.generics import (
CreateView,
Expand All @@ -12,9 +14,8 @@
UpdateView,
)
from arctic.generics import collapsible_gettext as _c
from collections import OrderedDict

from .forms import ArticleForm, AdvancedArticleSearchForm, FiltersAndSearchForm
from .forms import AdvancedArticleSearchForm, ArticleForm, FiltersAndSearchForm
from .inlines import ImagesInline
from .models import Article, Category, Tag

Expand Down
3 changes: 1 addition & 2 deletions example/config/arctic.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
from django.utils.translation import ugettext_lazy as _

from django.utils.translation import gettext_lazy as _

ARCTIC_SITE_NAME = _("Arctic Example")
ARCTIC_FORM_DISPLAY = "float-label"
Expand Down
7 changes: 4 additions & 3 deletions tests/test_utils.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
from collections import OrderedDict
import pytest
from django.urls import ResolverMatch, reverse

from django.http import HttpRequest
from django.utils.translation import ugettext_lazy as _
from django.urls import ResolverMatch, reverse
from django.utils.translation import gettext_lazy as _

import pytest
from arctic import utils


Expand Down

0 comments on commit 07c1e56

Please sign in to comment.