Fix #1129 -- non-ASCII files/* are not copied when not needed

This is a fix for #1129.

This effectively undoes #1053.  @tibonihoo, could you please test if you can import your dump?

If not, would you mind providing:

 * the full and exact dump used,
 * your `locale` settings,
 * anything else that might be useful for debugging and finding a proper solution?

Note that the tests all pass, **but** your dump is seemingly not included in those.  However, I managed to successfully import the dump with Python 2.7 and 3.3; with a proper UTF-8 locale.