Erlend's latest comments

iritkatriel · iritkatriel · commit a05ac6321cc8 · 2021-12-07T11:33:44.000Z
diff --git a/Python/traceback.c b/Python/traceback.c
@@ -406,24 +406,21 @@ int
 _Py_WriteIndentedMargin(int indent, const char *margin, PyObject *f)
 {
     if (_Py_WriteIndent(indent, f) < 0) {
-        goto error;
+        return -1;
     }
     if (margin) {
         if (PyFile_WriteString(margin, f) < 0) {
-            goto error;
+            return -1;
         }
     }
     return 0;
-error:
-    return -1;
 }
 
 static int
 display_source_line_with_margin(PyObject *f, PyObject *filename, int lineno, int indent,
                                 int margin_indent, const char *margin,
                                 int *truncation, PyObject **line)
 {
-    int err = 0;
     int fd;
     int i;
     char *found_encoding;
@@ -506,7 +503,6 @@ display_source_line_with_margin(PyObject *f, PyObject *filename, int lineno, int
         lineobj = PyFile_GetLine(fob, -1);
         if (!lineobj) {
             PyErr_Clear();
-            err = -1;
             break;
         }
     }
@@ -520,7 +516,7 @@ display_source_line_with_margin(PyObject *f, PyObject *filename, int lineno, int
     Py_DECREF(fob);
     if (!lineobj || !PyUnicode_Check(lineobj)) {
         Py_XDECREF(lineobj);
-        return err;
+        return -1;
     }
 
     if (line) {
@@ -551,8 +547,6 @@ display_source_line_with_margin(PyObject *f, PyObject *filename, int lineno, int
         *truncation = i - indent;
     }
 
-    assert(!err);
-
     if (_Py_WriteIndentedMargin(margin_indent, margin, f) < 0) {
         goto error;
     }

Original file line number	Diff line number	Diff line change
`@@ -406,24 +406,21 @@ int`
`406`	`406`	`_Py_WriteIndentedMargin(int indent, const char margin, PyObject f)`
`407`	`407`	`{`
`408`	`408`	`if (_Py_WriteIndent(indent, f) < 0) {`
`409`		`- goto error;`
	`409`	`+ return -1;`
`410`	`410`	`}`
`411`	`411`	`if (margin) {`
`412`	`412`	`if (PyFile_WriteString(margin, f) < 0) {`
`413`		`- goto error;`
	`413`	`+ return -1;`
`414`	`414`	`}`
`415`	`415`	`}`
`416`	`416`	`return 0;`
`417`		`-error:`
`418`		`- return -1;`
`419`	`417`	`}`
`420`	`418`
`421`	`419`	`static int`
`422`	`420`	`display_source_line_with_margin(PyObject f, PyObject filename, int lineno, int indent,`
`423`	`421`	`int margin_indent, const char *margin,`
`424`	`422`	`int truncation, PyObject *line)`
`425`	`423`	`{`
`426`		`- int err = 0;`
`427`	`424`	`int fd;`
`428`	`425`	`int i;`
`429`	`426`	`char *found_encoding;`
`@@ -506,7 +503,6 @@ display_source_line_with_margin(PyObject f, PyObject filename, int lineno, int`
`506`	`503`	`lineobj = PyFile_GetLine(fob, -1);`
`507`	`504`	`if (!lineobj) {`
`508`	`505`	`PyErr_Clear();`
`509`		`- err = -1;`
`510`	`506`	`break;`
`511`	`507`	`}`
`512`	`508`	`}`
`@@ -520,7 +516,7 @@ display_source_line_with_margin(PyObject f, PyObject filename, int lineno, int`
`520`	`516`	`Py_DECREF(fob);`
`521`	`517`	`if (!lineobj \|\| !PyUnicode_Check(lineobj)) {`
`522`	`518`	`Py_XDECREF(lineobj);`
`523`		`- return err;`
	`519`	`+ return -1;`
`524`	`520`	`}`
`525`	`521`
`526`	`522`	`if (line) {`
`@@ -551,8 +547,6 @@ display_source_line_with_margin(PyObject f, PyObject filename, int lineno, int`
`551`	`547`	`*truncation = i - indent;`
`552`	`548`	`}`
`553`	`549`
`554`		`- assert(!err);`
`555`		`-`
`556`	`550`	`if (_Py_WriteIndentedMargin(margin_indent, margin, f) < 0) {`
`557`	`551`	`goto error;`
`558`	`552`	`}`