fix dict completion problem

thomasballinger · thomasballinger · commit fe530971bd47 · 2014-07-06T14:30:43.000-04:00
diff --git a/bpython/line.py b/bpython/line.py
@@ -23,15 +23,15 @@ def current_word(cursor_offset, line):
 
 def current_dict_key(cursor_offset, line):
     """If in dictionary completion, return the current key"""
-    matches = list(re.finditer(r'[\w_][\w0-9._]*\[([\w0-9._(), ]*)', line))
+    matches = list(re.finditer(r'''[\w_][\w0-9._]*\[([\w0-9._(), '"]*)''', line))
     for m in matches:
         if m.start(1) <= cursor_offset and m.end(1) >= cursor_offset:
             return (m.start(1), m.end(1), m.group(1))
     return None
 
 def current_dict(cursor_offset, line):
     """If in dictionary completion, return the dict that should be used"""
-    matches = list(re.finditer(r'([\w_][\w0-9._]*)\[([\w0-9._(), ]*)', line))
+    matches = list(re.finditer(r'''([\w_][\w0-9._]*)\[([\w0-9._(), '"]*)''', line))
     for m in matches:
         if m.start(2) <= cursor_offset and m.end(2) >= cursor_offset:
             return (m.start(1), m.end(1), m.group(1))
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -336,7 +336,7 @@ def update(self, cursor_offset, current_line, matches, completer):
         assert matches is not None
         self.matches = matches
         self.completer = completer
-        assert self.completer.locate(self.orig_cursor_offset, self.orig_line) is not None, (self.completer.locate, self.orig_cursor_offset, self.orig_line)
+        #assert self.completer.locate(self.orig_cursor_offset, self.orig_line) is not None, (self.completer.locate, self.orig_cursor_offset, self.orig_line)
         self.index = -1
         self.start, self.end, self.current_word = self.completer.locate(self.orig_cursor_offset, self.orig_line)
 
diff --git a/bpython/test/test_line_properties.py b/bpython/test/test_line_properties.py
@@ -133,6 +133,7 @@ def test_simple(self):
         self.assertAccess('asdf[<(1, >|]')
         self.assertAccess('asdf[<(1, 2)>|]')
         #TODO self.assertAccess('d[d[<12|>')
+        self.assertAccess("d[<'a>|")
 
 class TestCurrentDict(LineTestCase):
     def setUp(self):
