diff options
| author |   Florent Xicluna <florent.xicluna@gmail.com> | 2011-10-28 14:45:05 +0200 |
|---|---|---|
| committer | Florent Xicluna <florent.xicluna@gmail.com> | 2011-10-28 14:45:05 +0200 |
| commit | 5d1155c08edf7f53eca804b2b6538636c2dfe711 (patch) | |
| tree | dcb2cf857c20dce837c82de7aea432ccf9a41355 /Lib/encodings | |
| parent | Improve HTMLParser example in the doc and fix a couple minor things. (diff) | |
| download | cpython-5d1155c08edf7f53eca804b2b6538636c2dfe711.tar.gz cpython-5d1155c08edf7f53eca804b2b6538636c2dfe711.tar.bz2 cpython-5d1155c08edf7f53eca804b2b6538636c2dfe711.zip | |
Closes #13258: Use callable() built-in in the standard library.
Diffstat (limited to 'Lib/encodings')
| -rw-r--r-- | Lib/encodings/__init__.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Lib/encodings/__init__.py b/Lib/encodings/__init__.py index b189bd9793e..8dd713056ef 100644 --- a/Lib/encodings/__init__.py +++ b/Lib/encodings/__init__.py @@ -120,12 +120,11 @@ def search_function(encoding): if not 4 <= len(entry) <= 7: raise CodecRegistryError('module "%s" (%s) failed to register' % (mod.__name__, mod.__file__)) - if not hasattr(entry[0], '__call__') or \ - not hasattr(entry[1], '__call__') or \ - (entry[2] is not None and not hasattr(entry[2], '__call__')) or \ - (entry[3] is not None and not hasattr(entry[3], '__call__')) or \ - (len(entry) > 4 and entry[4] is not None and not hasattr(entry[4], '__call__')) or \ - (len(entry) > 5 and entry[5] is not None and not hasattr(entry[5], '__call__')): + if not callable(entry[0]) or not callable(entry[1]) or \ + (entry[2] is not None and not callable(entry[2])) or \ + (entry[3] is not None and not callable(entry[3])) or \ + (len(entry) > 4 and entry[4] is not None and not callable(entry[4])) or \ + (len(entry) > 5 and entry[5] is not None and not callable(entry[5])): raise CodecRegistryError('incompatible codecs in module "%s" (%s)' % (mod.__name__, mod.__file__)) if len(entry)<7 or entry[6] is None: |