Fix reporting errors in non-ASCII filenames on Python 2.x
Better and simpler fix for non-ASCII filenames on Python 2.x
Fix tests on Python 2
Improve granularity of Unicode error handler
Fix reporting errors in non-ASCII filenames on Python 2.x