bpython
diff --git a/‎bpython/autocomplete.py‎
Lines changed: 1 addition & 1 deletion b/‎bpython/autocomplete.py‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎bpython/test/test_autocomplete.py‎
Lines changed: 9 additions & 0 deletions b/‎bpython/test/test_autocomplete.py‎
Lines changed: 9 additions & 0 deletions
@@ -43,7 +43,7 @@
 
 ALL_MODES = (SIMPLE, SUBSTRING, FUZZY)
 
-MAGIC_METHODS = ("__%s__" % s for s in (
+MAGIC_METHODS = tuple("__%s__" % s for s in (
     "init", "repr", "str", "lt", "le", "eq", "ne", "gt", "ge", "cmp", "hash",
     "nonzero", "unicode", "getattr", "setattr", "get", "set", "call", "len",
     "getitem", "setitem", "iter", "reversed", "contains", "add", "sub", "mul",
 
@@ -187,3 +187,12 @@ class TestAttrCompletion(unittest.TestCase):
     def test_att_matches_found_on_instance(self):
         com = autocomplete.AttrCompletion()
         self.assertSetEqual(com.matches(2, 'a.', {'a': Foo()}), set(['a.method', 'a.a', 'a.b']))
+
+class TestMagicMethodCompletion(unittest.TestCase):
+
+    def test_magic_methods_complete_after_double_underscores(self):
+        com = autocomplete.MagicMethodCompletion()
+        block = "class Something(object)\n    def __"
+        self.assertSetEqual(com.matches(10, '    def __', block), set(autocomplete.MAGIC_METHODS))
+
+