@@ -316,24 +316,22 @@ def test_simple_global_complete(self):
316316 ['def' ,'del' ,'delattr(' ,'dict(' ,'dir(' ,
317317'divmod(' ])
318318
319- @unittest .skip ("disabled while non-simple completion is disabled" )
320319def test_substring_global_complete (self ):
321320self .repl = FakeRepl ({'autocomplete_mode' :autocomplete .SUBSTRING })
322321self .set_input_line ("time" )
323322
324323self .assertTrue (self .repl .complete ())
325- self .assertTrue (hasattr (self .repl .completer ,'matches' ))
326- self .assertEqual (self .repl .completer .matches ,
324+ self .assertTrue (hasattr (self .repl .matches_iter ,'matches' ))
325+ self .assertEqual (self .repl .matches_iter .matches ,
327326 ['RuntimeError(' ,'RuntimeWarning(' ])
328327
329- @unittest .skip ("disabled while non-simple completion is disabled" )
330328def test_fuzzy_global_complete (self ):
331329self .repl = FakeRepl ({'autocomplete_mode' :autocomplete .FUZZY })
332330self .set_input_line ("doc" )
333331
334332self .assertTrue (self .repl .complete ())
335- self .assertTrue (hasattr (self .repl .completer ,'matches' ))
336- self .assertEqual (self .repl .completer .matches ,
333+ self .assertTrue (hasattr (self .repl .matches_iter ,'matches' ))
334+ self .assertEqual (self .repl .matches_iter .matches ,
337335 ['UnboundLocalError(' ,'__doc__' ])
338336
339337# 2. Attribute tests
@@ -349,7 +347,6 @@ def test_simple_attribute_complete(self):
349347self .assertTrue (hasattr (self .repl .matches_iter ,'matches' ))
350348self .assertEqual (self .repl .matches_iter .matches , ['Foo.bar' ])
351349
352- @unittest .skip ("disabled while non-simple completion is disabled" )
353350def test_substring_attribute_complete (self ):
354351self .repl = FakeRepl ({'autocomplete_mode' :autocomplete .SUBSTRING })
355352self .set_input_line ("Foo.az" )
@@ -359,10 +356,9 @@ def test_substring_attribute_complete(self):
359356self .repl .push (line )
360357
361358self .assertTrue (self .repl .complete ())
362- self .assertTrue (hasattr (self .repl .completer ,'matches' ))
363- self .assertEqual (self .repl .completer .matches , ['Foo.baz' ])
359+ self .assertTrue (hasattr (self .repl .matches_iter ,'matches' ))
360+ self .assertEqual (self .repl .matches_iter .matches , ['Foo.baz' ])
364361
365- @unittest .skip ("disabled while non-simple completion is disabled" )
366362def test_fuzzy_attribute_complete (self ):
367363self .repl = FakeRepl ({'autocomplete_mode' :autocomplete .FUZZY })
368364self .set_input_line ("Foo.br" )
@@ -372,8 +368,8 @@ def test_fuzzy_attribute_complete(self):
372368self .repl .push (line )
373369
374370self .assertTrue (self .repl .complete ())
375- self .assertTrue (hasattr (self .repl .completer ,'matches' ))
376- self .assertEqual (self .repl .completer .matches , ['Foo.bar' ])
371+ self .assertTrue (hasattr (self .repl .matches_iter ,'matches' ))
372+ self .assertEqual (self .repl .matches_iter .matches , ['Foo.bar' ])
377373
378374# 3. Edge Cases
379375def test_updating_namespace_complete (self ):