remove unused code

thomasballinger · thomasballinger · commit 9a25c6915182 · 2015-12-14T17:39:19.000-05:00
diff --git a/bpython/line.py b/bpython/line.py
@@ -231,43 +231,6 @@ def current_string_literal_attr(cursor_offset, line):
     return None
 
 
-current_indexed_member_re = LazyReCompile(
-    r'''([a-zA-Z_][\w.]*)\[([a-zA-Z0-9_"']+)\]\.([\w.]*)''')
-
-
-def current_indexed_member_access(cursor_offset, line):
-    """An identifier being indexed and member accessed"""
-    matches = current_indexed_member_re.finditer(line)
-    for m in matches:
-        if m.start(3) <= cursor_offset and m.end(3) >= cursor_offset:
-            return LinePart(m.start(1), m.end(3), m.group())
-
-
-def current_indexed_member_access_identifier(cursor_offset, line):
-    """An identifier being indexed, e.g. foo in foo[1].bar"""
-    matches = current_indexed_member_re.finditer(line)
-    for m in matches:
-        if m.start(3) <= cursor_offset and m.end(3) >= cursor_offset:
-            return LinePart(m.start(1), m.end(1), m.group(1))
-
-
-def current_indexed_member_access_identifier_with_index(cursor_offset, line):
-    """An identifier being indexed with the index, e.g. foo[1] in foo[1].bar"""
-    matches = current_indexed_member_re.finditer(line)
-    for m in matches:
-        if m.start(3) <= cursor_offset and m.end(3) >= cursor_offset:
-            return LinePart(m.start(1), m.end(2)+1,
-                            "%s[%s]" % (m.group(1), m.group(2)))
-
-
-def current_indexed_member_access_member(cursor_offset, line):
-    """The member name of an indexed object, e.g. bar in foo[1].bar"""
-    matches = current_indexed_member_re.finditer(line)
-    for m in matches:
-        if m.start(3) <= cursor_offset and m.end(3) >= cursor_offset:
-            return LinePart(m.start(3), m.end(3), m.group(3))
-
-
 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,10 +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_indexed_member_access_identifier, \
-    current_indexed_member_access_identifier_with_index, \
-    current_indexed_member_access_member, \
-    current_expression_attribute
+    current_string_literal_attr, current_expression_attribute
 
 
 def cursor(s):
@@ -225,7 +222,6 @@ def test_simple(self):
         self.assertAccess('stuff[asdf[asd|fg]')
         self.assertAccess('Object.attr1.<|attr2>')
         self.assertAccess('Object.<attr1|>.attr2')
-        self.assertAccess('Object.<attr1|>.attr2')
 
 
 class TestCurrentFromImportFrom(LineTestCase):
@@ -309,40 +305,6 @@ def test_simple(self):
         self.assertAccess('"hey".asdf d|')
         self.assertAccess('"hey".<|>')
 
-class TestCurrentIndexedMemberAccessIdentifier(LineTestCase):
-    def setUp(self):
-        self.func = current_indexed_member_access_identifier
-
-    def test_simple(self):
-        self.assertAccess('<abc>[def].ghi|')
-        self.assertAccess('<abc>[def].|ghi')
-        self.assertAccess('<abc>[def].gh|i')
-        self.assertAccess('abc[def].gh |i')
-        self.assertAccess('abc[def]|')
-
-
-class TestCurrentIndexedMemberAccessIdentifierWithIndex(LineTestCase):
-    def setUp(self):
-        self.func = current_indexed_member_access_identifier_with_index
-
-    def test_simple(self):
-        self.assertAccess('<abc[def]>.ghi|')
-        self.assertAccess('<abc[def]>.|ghi')
-        self.assertAccess('<abc[def]>.gh|i')
-        self.assertAccess('abc[def].gh |i')
-        self.assertAccess('abc[def]|')
-
-
-class TestCurrentIndexedMemberAccessMember(LineTestCase):
-    def setUp(self):
-        self.func = current_indexed_member_access_member
-
-    def test_simple(self):
-        self.assertAccess('abc[def].<ghi|>')
-        self.assertAccess('abc[def].<|ghi>')
-        self.assertAccess('abc[def].<gh|i>')
-        self.assertAccess('abc[def].gh |i')
-        self.assertAccess('abc[def]|')
 
 class TestCurrentExpressionAttribute(LineTestCase):
     def setUp(self):
@@ -371,6 +333,12 @@ def test_with_whitespace(self):
         self.assertAccess('Object . asdf attr|')
         self.assertAccess('Object . <asdf|> attr')
 
+    def test_indexing(self):
+        self.assertAccess('abc[def].<ghi|>')
+        self.assertAccess('abc[def].<|ghi>')
+        self.assertAccess('abc[def].<gh|i>')
+        self.assertAccess('abc[def].gh |i')
+        self.assertAccess('abc[def]|')
 
 if __name__ == '__main__':
     unittest.main()
