diff options
author | Florent Xicluna <florent.xicluna@gmail.com> | 2011-10-28 12:45:05 (GMT) |
---|---|---|
committer | Florent Xicluna <florent.xicluna@gmail.com> | 2011-10-28 12:45:05 (GMT) |
commit | 5d1155c08edf7f53eca804b2b6538636c2dfe711 (patch) | |
tree | dcb2cf857c20dce837c82de7aea432ccf9a41355 /Lib/fileinput.py | |
parent | f99e4b5dbef57e13dd603dcc0edd9b7318f08c28 (diff) | |
download | cpython-5d1155c08edf7f53eca804b2b6538636c2dfe711.zip cpython-5d1155c08edf7f53eca804b2b6538636c2dfe711.tar.gz cpython-5d1155c08edf7f53eca804b2b6538636c2dfe711.tar.bz2 |
Closes #13258: Use callable() built-in in the standard library.
Diffstat (limited to 'Lib/fileinput.py')
-rw-r--r-- | Lib/fileinput.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Lib/fileinput.py b/Lib/fileinput.py index a25a021..554beb2 100644 --- a/Lib/fileinput.py +++ b/Lib/fileinput.py @@ -225,10 +225,11 @@ class FileInput: raise ValueError("FileInput opening mode must be one of " "'r', 'rU', 'U' and 'rb'") self._mode = mode - if inplace and openhook: - raise ValueError("FileInput cannot use an opening hook in inplace mode") - elif openhook and not hasattr(openhook, '__call__'): - raise ValueError("FileInput openhook must be callable") + if openhook: + if inplace: + raise ValueError("FileInput cannot use an opening hook in inplace mode") + if not callable(openhook): + raise ValueError("FileInput openhook must be callable") self._openhook = openhook def __del__(self): |