summaryrefslogtreecommitdiffstats
path: root/Lib/fileinput.py
diff options
context:
space:
mode:
authorBrian Curtin <brian@python.org>2011-11-07 20:19:46 (GMT)
committerBrian Curtin <brian@python.org>2011-11-07 20:19:46 (GMT)
commitca0fbc02e9971ead5436473e15320652c1fd97c8 (patch)
tree4b54cf71920a50bceed96d6f575ed1cbf0abac17 /Lib/fileinput.py
parentc1b65d1831265534cb1613d7bf0ad7643fddb795 (diff)
parentca6befb77f007ee74137bcbfc26f3fe1345bd886 (diff)
downloadcpython-ca0fbc02e9971ead5436473e15320652c1fd97c8.zip
cpython-ca0fbc02e9971ead5436473e15320652c1fd97c8.tar.gz
cpython-ca0fbc02e9971ead5436473e15320652c1fd97c8.tar.bz2
branch merge
Diffstat (limited to 'Lib/fileinput.py')
-rw-r--r--Lib/fileinput.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/Lib/fileinput.py b/Lib/fileinput.py
index 554beb2..dbbbb21 100644
--- a/Lib/fileinput.py
+++ b/Lib/fileinput.py
@@ -398,9 +398,8 @@ def hook_compressed(filename, mode):
def hook_encoded(encoding):
- import codecs
def openhook(filename, mode):
- return codecs.open(filename, mode, encoding)
+ return open(filename, mode, encoding=encoding)
return openhook