7
7
from django .db .models import QuerySet
8
8
from django .urls import reverse
9
9
from django .utils import translation
10
- from django .utils .encoding import force_text
10
+ from django .utils .encoding import force_str
11
11
from selenium .common .exceptions import NoSuchElementException
12
12
from selenium .webdriver .common .by import By
13
13
from selenium .webdriver .support import expected_conditions
@@ -285,11 +285,11 @@ def test_selected_option(self, db, genres):
285
285
widget_output = not_required_field .widget .render (
286
286
'primary_genre' , genre .pk )
287
287
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 ))
289
289
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 ))
291
291
unselected_option = '<option value="{pk}">{value}</option>' .format (
292
- pk = genre2 .pk , value = force_text (genre2 ))
292
+ pk = genre2 .pk , value = force_str (genre2 ))
293
293
294
294
assert selected_option in widget_output or selected_option_a in widget_output , widget_output
295
295
assert unselected_option not in widget_output
@@ -304,8 +304,8 @@ def test_selected_option_label_from_instance(self, db, genres):
304
304
305
305
def get_selected_options (genre ):
306
306
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 ))
309
309
310
310
assert all (o not in widget_output for o in get_selected_options (genre ))
311
311
genre .title = genre .title .upper ()
0 commit comments