diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2015-11-13 23:48:17 (GMT) |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2015-11-13 23:48:17 (GMT) |
| commit | f4ad5f5dea172d91ed21d2a330a72e77013bb279 (patch) | |
| tree | 2c28246fa5914ba939d7aed732b01a5860a0cb1e /Lib/rlcompleter.py | |
| parent | 8adaec56714c0ca902862d8b6279e1e3c969d664 (diff) | |
| parent | fa9ea046732eff86408aba477d557c8fc92bc864 (diff) | |
| download | cpython-f4ad5f5dea172d91ed21d2a330a72e77013bb279.zip cpython-f4ad5f5dea172d91ed21d2a330a72e77013bb279.tar.gz cpython-f4ad5f5dea172d91ed21d2a330a72e77013bb279.tar.bz2 | |
Issue #25590: Merge rlcompleter getattr change from 3.5
Diffstat (limited to 'Lib/rlcompleter.py')
| -rw-r--r-- | Lib/rlcompleter.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Lib/rlcompleter.py b/Lib/rlcompleter.py index 613848f..d368876 100644 --- a/Lib/rlcompleter.py +++ b/Lib/rlcompleter.py @@ -159,9 +159,11 @@ class Completer: while True: for word in words: if (word[:n] == attr and - not (noprefix and word[:n+1] == noprefix) and - hasattr(thisobject, word)): - val = getattr(thisobject, word) + not (noprefix and word[:n+1] == noprefix)): + try: + val = getattr(thisobject, word) + except Exception: + continue # Exclude properties that are not set word = self._callable_postfix(val, "%s.%s" % (expr, word)) matches.append(word) if matches or not noprefix: |