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

miss-islington · jdevries3133 · web-flow · commit 93d90871d216 · 2021-07-29T17:46:07.000+02:00
(cherry picked from commit 6741794) Co-authored-by: Jack DeVries <58614260+jdevries3133@users.noreply.github.com>
diff --git 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 == '_':
