77from django .db .models import QuerySet
88from django .urls import reverse
99from django .utils import translation
10- from django .utils .encoding import force_text
10+ from django .utils .encoding import force_str
1111from selenium .common .exceptions import NoSuchElementException
1212from selenium .webdriver .common .by import By
1313from 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 ()
0 commit comments