Remove StringLiteralAttrCompletion

thomasballinger · thomasballinger · commit d36c30dceeba · 2015-12-14T17:39:19.000-05:00
diff --git a/bpython/autocomplete.py b/bpython/autocomplete.py
@@ -447,27 +447,6 @@ def locate(self, current_offset, line):
         return lineparts.current_word(current_offset, line)
 
 
-class StringLiteralAttrCompletion(BaseCompletionType):
-
-    def matches(self, cursor_offset, line, **kwargs):
-        r = self.locate(cursor_offset, line)
-        if r is None:
-            return None
-
-        attrs = dir('')
-        if not py3:
-            # decode attributes
-            attrs = (att.decode('ascii') for att in attrs)
-
-        matches = set(att for att in attrs if att.startswith(r.word))
-        if not r.word.startswith('_'):
-            return set(match for match in matches if not match.startswith('_'))
-        return matches
-
-    def locate(self, current_offset, line):
-        return lineparts.current_string_literal_attr(current_offset, line)
-
-
 class ExpressionAttributeCompletion(AttrCompletion):
     # could replace attr completion as a more general case with some work
     def locate(self, current_offset, line):
@@ -608,7 +587,6 @@ def get_completer(completers, cursor_offset, line, **kwargs):
 def get_default_completer(mode=SIMPLE):
     return (
         DictKeyCompletion(mode=mode),
-        StringLiteralAttrCompletion(mode=mode),
         ImportCompletion(mode=mode),
         FilenameCompletion(mode=mode),
         MagicMethodCompletion(mode=mode),
diff --git a/bpython/line.py b/bpython/line.py
@@ -216,21 +216,6 @@ def current_dotted_attribute(cursor_offset, line):
         return LinePart(start, end, word)
 
 
-current_string_literal_attr_re = LazyReCompile(
-    "('''" +
-    r'''|"""|'|")''' +
-    r'''((?:(?=([^"'\\]+|\\.|(?!\1)["']))\3)*)\1[.]([a-zA-Z_]?[\w]*)''')
-
-
-def current_string_literal_attr(cursor_offset, line):
-    """The attribute following a string literal"""
-    matches = current_string_literal_attr_re.finditer(line)
-    for m in matches:
-        if m.start(4) <= cursor_offset and m.end(4) >= cursor_offset:
-            return LinePart(m.start(4), m.end(4), m.group(4))
-    return None
-
-
 current_expression_attribute_re = LazyReCompile(r'[.]\s*((?:[\w_][\w0-9_]*)|(?:))')
 
 
diff --git a/bpython/test/test_line_properties.py b/bpython/test/test_line_properties.py
@@ -5,7 +5,7 @@
     current_string, current_object, current_object_attribute, \
     current_from_import_from, current_from_import_import, current_import, \
     current_method_definition_name, current_single_word, \
-    current_string_literal_attr, current_expression_attribute
+    current_expression_attribute
 
 
 def cursor(s):
@@ -293,19 +293,6 @@ def test_simple(self):
         self.assertAccess(' <foo|>')
 
 
-class TestCurrentStringLiteral(LineTestCase):
-    def setUp(self):
-        self.func = current_string_literal_attr
-
-    def test_simple(self):
-        self.assertAccess('"hey".<a|>')
-        self.assertAccess('"hey"|')
-        self.assertAccess('"hey"|.a')
-        self.assertAccess('"hey".<a|b>')
-        self.assertAccess('"hey".asdf d|')
-        self.assertAccess('"hey".<|>')
-
-
 class TestCurrentExpressionAttribute(LineTestCase):
     def setUp(self):
         self.func = current_expression_attribute
@@ -340,5 +327,14 @@ def test_indexing(self):
         self.assertAccess('abc[def].gh |i')
         self.assertAccess('abc[def]|')
 
+    def test_strings(self):
+        self.assertAccess('"hey".<a|>')
+        self.assertAccess('"hey"|')
+        self.assertAccess('"hey"|.a')
+        self.assertAccess('"hey".<a|b>')
+        self.assertAccess('"hey".asdf d|')
+        self.assertAccess('"hey".<|>')
+
+
 if __name__ == '__main__':
     unittest.main()
