From 5d1155c08edf7f53eca804b2b6538636c2dfe711 Mon Sep 17 00:00:00 2001 From: Florent Xicluna Date: Fri, 28 Oct 2011 14:45:05 +0200 Subject: Closes #13258: Use callable() built-in in the standard library. --- Lib/fileinput.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'Lib/fileinput.py') diff --git a/Lib/fileinput.py b/Lib/fileinput.py index a25a021eb3..554beb2448 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): -- cgit v1.2.1