[Python-checkins] bpo-44752: refactor part of rlcompleter.Completer.attr_matches (GH-27433) (GH-27446)

[ambv]

https://github.com/python/cpython/commit/93d90871d216625b8d9db0fa59693953353d19ae
commit: 93d90871d216625b8d9db0fa59693953353d19ae
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-07-29T17:46:07+02:00
summary:

bpo-44752: refactor part of rlcompleter.Completer.attr_matches (GH-27433) (GH-27446)

(cherry picked from commit 6741794dd420c6b9775a188690dbf265037cd69f)

Co-authored-by: Jack DeVries <58614260+jdevries3133 at users.noreply.github.com>

files:
M Lib/rlcompleter.py

diff --git a/Lib/rlcompleter.py b/Lib/rlcompleter.py
index f620dcf7bf265..923f5c054115f 100644
--- a/Lib/rlcompleter.py
+++ b/Lib/rlcompleter.py
@@ -179,13 +179,10 @@ def attr_matches(self, text):
                         # property method, which is not desirable.
                         matches.append(match)
                         continue
-                    try:
-                        val = getattr(thisobject, word)
-                    except Exception:
-                        pass  # Include even if attribute not set
+                    if (value := getattr(thisobject, word, None)) is not None:
+                        matches.append(self._callable_postfix(value, match))
                     else:
-                        match = self._callable_postfix(val, match)
-                    matches.append(match)
+                        matches.append(match)
             if matches or not noprefix:
                 break
             if noprefix == '_':