revert cosmetic changes

Author: picnixz

Objects/exceptions.c

@@ -2995,52 +2995,54 @@ static PyObject *
 UnicodeEncodeError_str(PyObject *self)
 {
     PyUnicodeErrorObject *exc = (PyUnicodeErrorObject *)self;
+    PyObject *result = NULL;
+    PyObject *reason_str = NULL;
+    PyObject *encoding_str = NULL;
 
-    if (exc->object == NULL) {
+    if (exc->object == NULL)
         /* Not properly initialized. */
         return PyUnicode_FromString("");
-    }
 
     /* Get reason and encoding as strings, which they might not be if
        they've been modified after we were constructed. */
-    PyObject *reason = PyObject_Str(exc->reason);
-    if (reason == NULL) {
-        return NULL;
-    }
-    PyObject *encoding = PyObject_Str(exc->encoding);
-    if (encoding == NULL) {
-        Py_DECREF(reason);
-        return NULL;
-    }
+    reason_str = PyObject_Str(exc->reason);
+    if (reason_str == NULL)
+        goto done;
+    encoding_str = PyObject_Str(exc->encoding);
+    if (encoding_str == NULL)
+        goto done;
 
-    PyObject *res;
     Py_ssize_t len = PyUnicode_GET_LENGTH(exc->object);
     Py_ssize_t start = exc->start, end = exc->end;
 
     if ((start >= 0 && start < len) && (end >= 0 && end <= len) && end == start + 1) {
         Py_UCS4 badchar = PyUnicode_ReadChar(exc->object, start);
         const char *fmt;
-        if (badchar <= 0xff) {
+        if (badchar <= 0xff)
             fmt = "'%U' codec can't encode character '\\x%02x' in position %zd: %U";
-        }
-        else if (badchar <= 0xffff) {
+        else if (badchar <= 0xffff)
             fmt = "'%U' codec can't encode character '\\u%04x' in position %zd: %U";
-        }
-        else {
+        else
             fmt = "'%U' codec can't encode character '\\U%08x' in position %zd: %U";
-        }
-        res = PyUnicode_FromFormat(fmt, encoding, (int)badchar, start, reason);
+        result = PyUnicode_FromFormat(
+            fmt,
+            encoding_str,
+            (int)badchar,
+            start,
+            reason_str);
     }
     else {
-        res = PyUnicode_FromFormat(
+        result = PyUnicode_FromFormat(
             "'%U' codec can't encode characters in position %zd-%zd: %U",
-            encoding, start, end - 1, reason
-        );
+            encoding_str,
+            start,
+            end - 1,
+            reason_str);
     }
-
-    Py_DECREF(reason);
-    Py_DECREF(encoding);
-    return res;
+done:
+    Py_XDECREF(reason_str);
+    Py_XDECREF(encoding_str);
+    return result;
 }
 
 static PyTypeObject _PyExc_UnicodeEncodeError = {
@@ -3109,45 +3111,47 @@ static PyObject *
 UnicodeDecodeError_str(PyObject *self)
 {
     PyUnicodeErrorObject *exc = (PyUnicodeErrorObject *)self;
+    PyObject *result = NULL;
+    PyObject *reason_str = NULL;
+    PyObject *encoding_str = NULL;
 
-    if (exc->object == NULL) {
+    if (exc->object == NULL)
         /* Not properly initialized. */
         return PyUnicode_FromString("");
-    }
 
     /* Get reason and encoding as strings, which they might not be if
        they've been modified after we were constructed. */
-    PyObject *reason = PyObject_Str(exc->reason);
-    if (reason == NULL) {
-        return NULL;
-    }
-    PyObject *encoding = PyObject_Str(exc->encoding);
-    if (encoding == NULL) {
-        Py_DECREF(reason);
-        return NULL;
-    }
+    reason_str = PyObject_Str(exc->reason);
+    if (reason_str == NULL)
+        goto done;
+    encoding_str = PyObject_Str(exc->encoding);
+    if (encoding_str == NULL)
+        goto done;
 
-    PyObject *res;
     Py_ssize_t len = PyBytes_GET_SIZE(exc->object);
     Py_ssize_t start = exc->start, end = exc->end;
 
     if ((start >= 0 && start < len) && (end >= 0 && end <= len) && end == start + 1) {
         int badbyte = (int)(PyBytes_AS_STRING(exc->object)[start] & 0xff);
-        res = PyUnicode_FromFormat(
+        result = PyUnicode_FromFormat(
             "'%U' codec can't decode byte 0x%02x in position %zd: %U",
-            encoding, badbyte, start, reason
-        );
+            encoding_str,
+            badbyte,
+            start,
+            reason_str);
     }
     else {
-        res = PyUnicode_FromFormat(
+        result = PyUnicode_FromFormat(
             "'%U' codec can't decode bytes in position %zd-%zd: %U",
-            encoding, start, end - 1, reason
-        );
+            encoding_str,
+            start,
+            end - 1,
+            reason_str);
     }
-
-    Py_DECREF(reason);
-    Py_DECREF(encoding);
-    return res;
+done:
+    Py_XDECREF(reason_str);
+    Py_XDECREF(encoding_str);
+    return result;
 }
 
 static PyTypeObject _PyExc_UnicodeDecodeError = {
@@ -3206,46 +3210,46 @@ static PyObject *
 UnicodeTranslateError_str(PyObject *self)
 {
     PyUnicodeErrorObject *exc = (PyUnicodeErrorObject *)self;
+    PyObject *result = NULL;
+    PyObject *reason_str = NULL;
 
-    if (exc->object == NULL) {
+    if (exc->object == NULL)
         /* Not properly initialized. */
         return PyUnicode_FromString("");
-    }
 
     /* Get reason as a string, which it might not be if it's been
        modified after we were constructed. */
-    PyObject *reason = PyObject_Str(exc->reason);
-    if (reason == NULL) {
-        return NULL;
-    }
+    reason_str = PyObject_Str(exc->reason);
+    if (reason_str == NULL)
+        goto done;
 
-    PyObject *res;
     Py_ssize_t len = PyUnicode_GET_LENGTH(exc->object);
     Py_ssize_t start = exc->start, end = exc->end;
 
     if ((start >= 0 && start < len) && (end >= 0 && end <= len) && end == start + 1) {
         Py_UCS4 badchar = PyUnicode_ReadChar(exc->object, start);
         const char *fmt;
-        if (badchar <= 0xff) {
+        if (badchar <= 0xff)
             fmt = "can't translate character '\\x%02x' in position %zd: %U";
-        }
-        else if (badchar <= 0xffff) {
+        else if (badchar <= 0xffff)
             fmt = "can't translate character '\\u%04x' in position %zd: %U";
-        }
-        else {
+        else
             fmt = "can't translate character '\\U%08x' in position %zd: %U";
-        }
-        res = PyUnicode_FromFormat(fmt, (int)badchar, start, reason);
-    }
-    else {
-        res = PyUnicode_FromFormat(
+        result = PyUnicode_FromFormat(
+            fmt,
+            (int)badchar,
+            start,
+            reason_str);
+    } else {
+        result = PyUnicode_FromFormat(
             "can't translate characters in position %zd-%zd: %U",
-            start, end - 1, reason
-        );
+            start,
+            end - 1,
+            reason_str);
     }
-
-    Py_DECREF(reason);
-    return res;
+done:
+    Py_XDECREF(reason_str);
+    return result;
 }
 
 static PyTypeObject _PyExc_UnicodeTranslateError = {