python
diff --git a/‎Lib/test/test_eof.py‎
Lines changed: 4 additions & 0 deletions b/‎Lib/test/test_eof.py‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎Misc/NEWS.d/next/Core and Builtins/2020-06-15-16-29-55.bpo-40985.IIN_xX.rst‎
Lines changed: 1 addition & 0 deletions b/‎Misc/NEWS.d/next/Core and Builtins/2020-06-15-16-29-55.bpo-40985.IIN_xX.rst‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎Python/errors.c‎
Lines changed: 8 additions & 4 deletions b/‎Python/errors.c‎
Lines changed: 8 additions & 4 deletions
@@ -52,10 +52,14 @@ def test_line_continuation_EOF_from_file_bpo2180(self):
  file_name = script_helper.make_script(temp_dir, 'foo', '\\')
  rc, out, err = script_helper.assert_python_failure(file_name)
  self.assertIn(b'unexpected EOF while parsing', err)
+ self.assertIn(b'line 2', err)
+ self.assertIn(b'\\', err)
 
  file_name = script_helper.make_script(temp_dir, 'foo', 'y = 6\\')
  rc, out, err = script_helper.assert_python_failure(file_name)
  self.assertIn(b'unexpected EOF while parsing', err)
+ self.assertIn(b'line 2', err)
+ self.assertIn(b'y = 6\\', err)
 
 if __name__ == "__main__":
  unittest.main()
@@ -0,0 +1 @@
+Fix a bug that caused the :exc:`SyntaxError` text to be empty when a file ends with a line ending in a line continuation character (i.e. backslash). The error text should contain the text of the last line.
@@ -1648,23 +1648,27 @@ err_programtext(PyThreadState *tstate, FILE *fp, int lineno)
 {
  int i;
  char linebuf[1000];
-
- if (fp == NULL)
+ if (fp == NULL) {
  return NULL;
+ }
+
  for (i = 0; i < lineno; i++) {
  char *pLastChar = &linebuf[sizeof(linebuf) - 2];
  do {
  *pLastChar = '\0';
  if (Py_UniversalNewlineFgets(linebuf, sizeof linebuf,
- fp, NULL) == NULL)
- break;
+ fp, NULL) == NULL) {
+ goto after_loop;
+ }
  /* fgets read *something*; if it didn't get as
  far as pLastChar, it must have found a newline
  or hit the end of the file; if pLastChar is \n,
  it obviously found a newline; else we haven't
  yet seen a newline, so must continue */
  } while (*pLastChar != '\0' && *pLastChar != '\n');
  }
+
+after_loop:
  fclose(fp);
  if (i == lineno) {
  PyObject *res;
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Fix a bug that caused the :exc:`SyntaxError` text to be empty when a file ends with a line ending in a line continuation character (i.e. backslash). The error text should contain the text of the last line.