Move attr_{matches,lookup} to AttrCompleter

sebastinas · sebastinas · commit 4d266217264e · 2015-03-15T23:53:13.000+01:00
Signed-off-by: Sebastian Ramacher &lt;sebastian+dev@ramacher.at&gt;
diff --git a/bpython/autocomplete.py b/bpython/autocomplete.py
@@ -199,6 +199,9 @@ def format(self, filename):
             return filename
 
 
+attr_matches_re = LazyReCompile(r"(\w+(\.\w+)*)\.(\w*)")
+
+
 class AttrCompletion(BaseCompletionType):
 
     def matches(self, cursor_offset, line, **kwargs):
@@ -222,7 +225,7 @@ def matches(self, cursor_offset, line, **kwargs):
                 break
         methodtext = text[-i:]
         matches = set(''.join([text[:-i], m])
-                      for m in attr_matches(methodtext, locals_))
+                      for m in self.attr_matches(methodtext, locals_))
 
         # TODO add open paren for methods via _callable_prefix (or decide not
         # to) unless the first character is a _ filter out all attributes
@@ -238,6 +241,51 @@ def locate(self, current_offset, line):
     def format(self, word):
         return after_last_dot(word)
 
+    def attr_matches(self, text, namespace):
+        """Taken from rlcompleter.py and bent to my will.
+        """
+
+        # Gna, Py 2.6's rlcompleter searches for __call__ inside the
+        # instance instead of the type, so we monkeypatch to prevent
+        # side-effects (__getattr__/__getattribute__)
+        m = attr_matches_re.match(text)
+        if not m:
+            return []
+
+        expr, attr = m.group(1, 3)
+        if expr.isdigit():
+            # Special case: float literal, using attrs here will result in
+            # a SyntaxError
+            return []
+        try:
+            obj = safe_eval(expr, namespace)
+        except EvaluationError:
+            return []
+        with inspection.AttrCleaner(obj):
+            matches = self.attr_lookup(obj, expr, attr)
+        return matches
+
+    def attr_lookup(self, obj, expr, attr):
+        """Second half of original attr_matches method factored out so it can
+        be wrapped in a safe try/finally block in case anything bad happens to
+        restore the original __getattribute__ method."""
+        words = dir(obj)
+        if hasattr(obj, '__class__'):
+            words.append('__class__')
+            words = words + rlcompleter.get_class_members(obj.__class__)
+            if not isinstance(obj.__class__, abc.ABCMeta):
+                try:
+                    words.remove('__abstractmethods__')
+                except ValueError:
+                    pass
+
+        matches = []
+        n = len(attr)
+        for word in words:
+            if method_match(word, n, attr) and word != "__builtins__":
+                matches.append("%s.%s" % (expr, word))
+        return matches
+
 
 class DictKeyCompletion(BaseCompletionType):
 
@@ -498,56 +546,6 @@ def safe_eval(expr, namespace):
         raise EvaluationError
 
 
-attr_matches_re = LazyReCompile(r"(\w+(\.\w+)*)\.(\w*)")
-
-
-def attr_matches(text, namespace):
-    """Taken from rlcompleter.py and bent to my will.
-    """
-
-    # Gna, Py 2.6's rlcompleter searches for __call__ inside the
-    # instance instead of the type, so we monkeypatch to prevent
-    # side-effects (__getattr__/__getattribute__)
-    m = attr_matches_re.match(text)
-    if not m:
-        return []
-
-    expr, attr = m.group(1, 3)
-    if expr.isdigit():
-        # Special case: float literal, using attrs here will result in
-        # a SyntaxError
-        return []
-    try:
-        obj = safe_eval(expr, namespace)
-    except EvaluationError:
-        return []
-    with inspection.AttrCleaner(obj):
-        matches = attr_lookup(obj, expr, attr)
-    return matches
-
-
-def attr_lookup(obj, expr, attr):
-    """Second half of original attr_matches method factored out so it can
-    be wrapped in a safe try/finally block in case anything bad happens to
-    restore the original __getattribute__ method."""
-    words = dir(obj)
-    if hasattr(obj, '__class__'):
-        words.append('__class__')
-        words = words + rlcompleter.get_class_members(obj.__class__)
-        if not isinstance(obj.__class__, abc.ABCMeta):
-            try:
-                words.remove('__abstractmethods__')
-            except ValueError:
-                pass
-
-    matches = []
-    n = len(attr)
-    for word in words:
-        if method_match(word, n, attr) and word != "__builtins__":
-            matches.append("%s.%s" % (expr, word))
-    return matches
-
-
 def _callable_postfix(value, word):
     """rlcompleter's _callable_postfix done right."""
     with inspection.AttrCleaner(value):
