diff -r 48c5c18110ae Lib/fileinput.py --- a/Lib/fileinput.py Wed Feb 05 20:55:13 2014 +0200 +++ b/Lib/fileinput.py Wed Feb 05 21:41:32 2014 +0200 @@ -387,9 +387,16 @@ def hook_encoded(encoding): - import codecs + import io def openhook(filename, mode): - return codecs.open(filename, mode, encoding) + if 'U' in mode: + newline = None + mode = mode.replace('U', '') + else: + newline = '\n' + mode = mode.replace('b', '') + return io.open(filename, mode or 'r', + encoding=encoding, newline=newline) return openhook