[MERGE] Before actually using encoding need to check that Python has corresponding codec

[Aaron Bentley]

Aaron Bentley has voted +1 (conditional).
Status is now: Conditionally approved
Comment:
This seems reasonable, but lacks a test case.  It seems to me that it would be easy to write one.  Am I wrong about that?

For details, see: http://bundlebuggy.aaronbentley.com/request/%3C458651B2.6030708%40ukr.net%3E