Skip to content

Commit a47b531

Browse files
CleitonDeLimacodingjoe
authored andcommitted
Fix warning in tests
1 parent 3a19fa5 commit a47b531

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

tests/test_forms.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from django.db.models import QuerySet
88
from django.urls import reverse
99
from django.utils import translation
10-
from django.utils.encoding import force_text
10+
from django.utils.encoding import force_str
1111
from selenium.common.exceptions import NoSuchElementException
1212
from selenium.webdriver.common.by import By
1313
from selenium.webdriver.support import expected_conditions
@@ -285,11 +285,11 @@ def test_selected_option(self, db, genres):
285285
widget_output = not_required_field.widget.render(
286286
'primary_genre', genre.pk)
287287
selected_option = '<option value="{pk}" selected="selected">{value}</option>'.format(
288-
pk=genre.pk, value=force_text(genre))
288+
pk=genre.pk, value=force_str(genre))
289289
selected_option_a = '<option value="{pk}" selected>{value}</option>'.format(
290-
pk=genre.pk, value=force_text(genre))
290+
pk=genre.pk, value=force_str(genre))
291291
unselected_option = '<option value="{pk}">{value}</option>'.format(
292-
pk=genre2.pk, value=force_text(genre2))
292+
pk=genre2.pk, value=force_str(genre2))
293293

294294
assert selected_option in widget_output or selected_option_a in widget_output, widget_output
295295
assert unselected_option not in widget_output
@@ -304,8 +304,8 @@ def test_selected_option_label_from_instance(self, db, genres):
304304

305305
def get_selected_options(genre):
306306
return '<option value="{pk}" selected="selected">{value}</option>'.format(
307-
pk=genre.pk, value=force_text(genre)), '<option value="{pk}" selected>{value}</option>'.format(
308-
pk=genre.pk, value=force_text(genre))
307+
pk=genre.pk, value=force_str(genre)), '<option value="{pk}" selected>{value}</option>'.format(
308+
pk=genre.pk, value=force_str(genre))
309309

310310
assert all(o not in widget_output for o in get_selected_options(genre))
311311
genre.title = genre.title.upper()

tests/test_views.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import json
22

33
from django.core import signing
4-
from django.utils.encoding import smart_text
4+
from django.utils.encoding import smart_str
55

66
from django_select2.cache import cache
77
from django_select2.forms import ModelSelect2Widget
@@ -27,7 +27,7 @@ def test_get(self, client, artists):
2727
assert response.status_code == 200
2828
data = json.loads(response.content.decode('utf-8'))
2929
assert data['results']
30-
assert {'id': artist.pk, 'text': smart_text(artist)} in data['results']
30+
assert {'id': artist.pk, 'text': smart_str(artist)} in data['results']
3131

3232
def test_no_field_id(self, client, artists):
3333
artist = artists[0]
@@ -85,7 +85,7 @@ def test_label_from_instance(self, artists, client):
8585

8686
data = json.loads(response.content.decode('utf-8'))
8787
assert data['results']
88-
assert {'id': artist.pk, 'text': smart_text(artist.title.upper())} in data['results']
88+
assert {'id': artist.pk, 'text': smart_str(artist.title.upper())} in data['results']
8989

9090
def test_url_check(self, client, artists):
9191
artist = artists[0]

tests/testapp/forms.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from django import forms
2-
from django.utils.encoding import force_text
2+
from django.utils.encoding import force_str
33

44
from django_select2.forms import (
55
HeavySelect2MultipleWidget, HeavySelect2Widget, ModelSelect2MultipleWidget,
@@ -39,7 +39,7 @@ class ArtistCustomTitleWidget(ModelSelect2Widget):
3939
]
4040

4141
def label_from_instance(self, obj):
42-
return force_text(obj.title).upper()
42+
return force_str(obj.title).upper()
4343

4444

4545
class GenreCustomTitleWidget(ModelSelect2Widget):
@@ -49,7 +49,7 @@ class GenreCustomTitleWidget(ModelSelect2Widget):
4949
]
5050

5151
def label_from_instance(self, obj):
52-
return force_text(obj.title).upper()
52+
return force_str(obj.title).upper()
5353

5454

5555
class AlbumSelect2WidgetForm(forms.ModelForm):

0 commit comments

Comments
 (0)