gh-120495: Fix incorrect exception handling in Tab Nanny

[Wulian233]

See issue, need backport to 3.13?

• Issue: Incorrect exception handling in Tab Nanny #120495

[hugovk]

Please check the test failure:

======================================================================
FAIL: test_with_errored_file (test.test_tabnanny.TestCommandLine.test_with_errored_file)
Should displays error when errored python file is given.
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/Users/admin/actions-runner/_work/cpython/cpython/Lib/test/test_tabnanny.py", line 321, in test_with_errored_file
    self.validate_cmd(file_path, stderr=stderr, expect_failure=True)
    ~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/Users/admin/actions-runner/_work/cpython/cpython/Lib/test/test_tabnanny.py", line 313, in validate_cmd
    self.assertListEqual(err.splitlines(), stderr.splitlines())
    ~~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: Lists differ: ["'/v[80 chars]py': Indentation Error: unindent does not matc[45 chars] 3)"] != ["'/v[80 chars]py': Token Error: unindent does not match any [39 chars] 3)"]

First differing element 0:
"'/va[79 chars]py': Indentation Error: unindent does not matc[44 chars]e 3)"
"'/va[79 chars]py': Token Error: unindent does not match any [38 chars]e 3)"

  ["'/var/folders/4_/xyjwmyz[149](https://github.com/python/cpython/actions/runs/9515941863/job/26231269530?pr=120498#step:9:150)7g3qhhndg003800000gn/T/test_python_1c7vs70o/tmpubu1lray.py': "
-  'Indentation Error: unindent does not match any outer indentation level '
?   ^^^  ------

+  'Token Error: unindent does not match any outer indentation level (<string>, '
?   ^^^                                                              +++++++++++

-  '(<string>, line 3)']
+  'line 3)']

[hugovk]

Before, the indentation test test_with_errored_file hit the first block:

    except SyntaxError as msg:
        errprint("%r: Token Error: %s" % (file, msg))
        return

But now, it's hitting the correct one:

    except IndentationError as msg:
        errprint("%r: Indentation Error: %s" % (file, msg))
        return

So we need to fix the test to look for the correct "Indentation Error" text.

Please could you update the test?

[Wulian233]

I need to change the https://github.com/python/cpython/blob/main/Lib/test/test_tabnanny.py#L318-L319 ?

[hugovk]

That's right, change "Token Error" to "Indentation Error" :)

[hugovk]

Thank you!

[miss-islington-app]

Thanks @Wulian233 for the PR, and @hugovk for merging it 🌮🎉.. I'm working now to backport this PR to: 3.12, 3.13.
🐍🍒⛏🤖

[bedevere-app]

GH-120548 is a backport of this pull request to the 3.13 branch.

[bedevere-app]

GH-120549 is a backport of this pull request to the 3.12 branch.