Refs #23919 -- Removed six.PY2/PY3 usage

Thanks Tim Graham for the review.

1 files changed, 6 insertions, 11 deletions

diff --git a/tests/dbshell/test_postgresql_psycopg2.py b/tests/dbshell/test_postgresql_psycopg2.py
index 4c4a1ae25e..755464b3bb 100644
--- a/tests/dbshell/test_postgresql_psycopg2.py
+++ b/tests/dbshell/test_postgresql_psycopg2.py
@@ -3,7 +3,6 @@ import os
 
 from django.db.backends.postgresql.client import DatabaseClient
 from django.test import SimpleTestCase, mock
-from django.utils import six
 from django.utils.encoding import force_bytes, force_str
 
 
@@ -91,16 +90,12 @@ class PostgreSqlDbshellCommandTestCase(SimpleTestCase):
         encoding = locale.getpreferredencoding()
         username = 'rôle'
         password = 'sésame'
-        try:
-            username_str = force_str(username, encoding)
-            password_str = force_str(password, encoding)
-            pgpass_bytes = force_bytes(
-                'somehost:444:dbname:%s:%s' % (username, password),
-                encoding=encoding,
-            )
-        except UnicodeEncodeError:
-            if six.PY2:
-                self.skipTest("Your locale can't run this test.")
+        username_str = force_str(username, encoding)
+        password_str = force_str(password, encoding)
+        pgpass_bytes = force_bytes(
+            'somehost:444:dbname:%s:%s' % (username, password),
+            encoding=encoding,
+        )
         self.assertEqual(
             self._run_it({
                 'database': 'dbname',