diff -r 8f91b475c2fd Lib/rlcompleter.py --- a/Lib/rlcompleter.py Thu Sep 24 14:36:00 2015 +0300 +++ b/Lib/rlcompleter.py Thu Sep 24 15:15:13 2015 +0300 @@ -106,6 +106,12 @@ class Completer: n = len(text) for word in keyword.kwlist: if word[:n] == text: + if word in {'finally', 'try'}: + word = word + ":" + elif word not in {'False', 'None', 'True', + 'break', 'continue', 'pass', + 'else'}: + word = word + " " matches.append(word) for nspace in [builtins.__dict__, self.namespace]: for word, val in nspace.items(): diff -r 8f91b475c2fd Lib/test/test_rlcompleter.py --- a/Lib/test/test_rlcompleter.py Thu Sep 24 14:36:00 2015 +0300 +++ b/Lib/test/test_rlcompleter.py Thu Sep 24 15:15:13 2015 +0300 @@ -67,10 +67,14 @@ class TestRlcompleter(unittest.TestCase) def test_complete(self): completer = rlcompleter.Completer() self.assertEqual(completer.complete('', 0), '\t') - self.assertEqual(completer.complete('a', 0), 'and') - self.assertEqual(completer.complete('a', 1), 'as') - self.assertEqual(completer.complete('as', 2), 'assert') - self.assertEqual(completer.complete('an', 0), 'and') + self.assertEqual(completer.complete('a', 0), 'and ') + self.assertEqual(completer.complete('a', 1), 'as ') + self.assertEqual(completer.complete('as', 2), 'assert ') + self.assertEqual(completer.complete('an', 0), 'and ') + self.assertEqual(completer.complete('pa', 0), 'pass') + self.assertEqual(completer.complete('Fa', 0), 'False') + self.assertEqual(completer.complete('el', 0), 'elif ') + self.assertEqual(completer.complete('el', 1), 'else') if __name__ == '__main__': unittest.main() diff -r 8f91b475c2fd Misc/NEWS --- a/Misc/NEWS Thu Sep 24 14:36:00 2015 +0300 +++ b/Misc/NEWS Thu Sep 24 15:15:13 2015 +0300 @@ -27,6 +27,8 @@ Core and Builtins Library ------- +- Issue #25209: rlcomplete now can add a space or a colon after completed keyword. + - Issue #22241: timezone.utc name is now plain 'UTC', not 'UTC-00:00'. - Issue #23517: fromtimestamp() and utcfromtimestamp() methods of