fix unicode test

softdevteam · May 1, 2024 · 93a383e · 93a383e
1 parent 507db05
commit 93a383e
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 10 deletions.
diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
@@ -743,13 +743,13 @@ def __str__(self):
             self.assertRaises(
                 TypeError,
                 unicode,
-                u"'decode()' is not supported on Unicode in 3.x: convert the string to bytes.",
+                u'decoding unicode is not supported',
                 'utf-8',
                 'strict'
             )
 
         self.assertEqual(
-            unicode("'decode()' is not supported on Unicode in 3.x: convert the string to bytes.", 'utf-8', 'strict'),
+            unicode('strings are decoded to unicode', 'utf-8', 'strict'),
             u'strings are decoded to unicode'
         )
 

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
@@ -1211,17 +1211,29 @@ PyObject *PyUnicode_FromEncodedObject(register PyObject *obj,
 #else
 #endif
 
+    // if (PyUnicode_Check(obj)) {
+    //     PyErr_SetString(PyExc_TypeError,
+    //                     "'decode()' is not supported on Unicode in 3.x: convert the string to bytes.");
+    //         obj->ob_bstate = BSTATE_BYTE;
+    //         if ((obj->ob_bstate == BSTATE_BYTE) &&
+    //             PyErr_WarnPy3k(
+    //                 "'decode()' is not supported on Unicode in 3.x: convert the string to bytes.", 1) < 0) {
+    //             return NULL;
+    //         }
+    //     return NULL;
+    //     return PyObject_Unicode(obj);
+    // }
+
     if (PyUnicode_Check(obj)) {
-        if (encoding) {
-            obj->ob_bstate = BSTATE_BYTE;
-            if ((obj->ob_bstate == BSTATE_BYTE) &&
-                PyErr_WarnPy3k(
-                    "'decode()' is not supported on Unicode in 3.x: convert the string to bytes.", 1) < 0) {
-                return NULL;
-            }
+        obj->ob_bstate = BSTATE_BYTE;
+        if ((obj->ob_bstate == BSTATE_BYTE) &&
+            PyErr_WarnPy3k(
+                "'decode()' is not supported on Unicode in 3.x: convert the string to bytes.", 1) < 0) {
             return NULL;
         }
-        return PyObject_Unicode(obj);
+        PyErr_SetString(PyExc_TypeError,
+                        "decoding Unicode is not supported");
+        return NULL;
     }
 
     /* Coerce object */