Message 189908 - Python tracker
For a bug fix release, I consider refactoring of test cases inappropriate. If they really ought to be merged, I consider neither file name particularly descriptive, so perhaps a new file name should be used altogether (e.g. test_source_encoding).