##// END OF EJS Templates
Merge pull request #10476 from frenzymadness/5.x...
Thomas Kluyver -
r23570:f0ec9291 merge
parent child Browse files
Show More
@@ -1,6 +1,7 b''
1 from os.path import abspath, dirname, join
1 from os.path import abspath, dirname, join
2
2
3 from IPython.terminal.interactiveshell import KeyBindingManager
3 from IPython.terminal.interactiveshell import KeyBindingManager
4 from IPython.utils.py3compat import string_types
4
5
5
6
6 def name(c):
7 def name(c):
@@ -60,7 +61,7 b' for kb in ipy_bindings:'
60 if not doc or doc in dummy_docs:
61 if not doc or doc in dummy_docs:
61 continue
62 continue
62
63
63 shortcut = ' '.join([k if isinstance(k, str) else k.name for k in kb.keys])
64 shortcut = ' '.join([k if isinstance(k, string_types) else k.name for k in kb.keys])
64 shortcut += shortcut.endswith('\\') and '\\' or ''
65 shortcut += shortcut.endswith('\\') and '\\' or ''
65 if hasattr(kb.filter, 'filters'):
66 if hasattr(kb.filter, 'filters'):
66 flt = ' '.join(multi_filter_str(kb.filter))
67 flt = ' '.join(multi_filter_str(kb.filter))
General Comments 0
You need to be logged in to leave comments. Login now