Show More
@@ -26,18 +26,17 b' from IPython.core.usage import interactive_usage, default_banner' | |||||
26 | from IPython.core.interactiveshell import InteractiveShell, InteractiveShellABC |
|
26 | from IPython.core.interactiveshell import InteractiveShell, InteractiveShellABC | |
27 | from IPython.lib.inputhook import enable_gui |
|
27 | from IPython.lib.inputhook import enable_gui | |
28 | from IPython.lib.pylabtools import pylab_activate |
|
28 | from IPython.lib.pylabtools import pylab_activate | |
|
29 | from IPython.testing import decorators as testdec | |||
29 | from IPython.utils.terminal import toggle_set_term_title, set_term_title |
|
30 | from IPython.utils.terminal import toggle_set_term_title, set_term_title | |
30 | from IPython.utils.process import abbrev_cwd |
|
31 | from IPython.utils.process import abbrev_cwd | |
31 | from IPython.utils.warn import warn |
|
32 | from IPython.utils.warn import warn | |
32 | from IPython.utils.text import num_ini_spaces |
|
33 | from IPython.utils.text import num_ini_spaces | |
33 | from IPython.utils.traitlets import Int, Str, CBool |
|
34 | from IPython.utils.traitlets import Int, Str, CBool | |
34 |
|
35 | |||
35 |
|
||||
36 | #----------------------------------------------------------------------------- |
|
36 | #----------------------------------------------------------------------------- | |
37 | # Utilities |
|
37 | # Utilities | |
38 | #----------------------------------------------------------------------------- |
|
38 | #----------------------------------------------------------------------------- | |
39 |
|
39 | |||
40 |
|
||||
41 | def get_default_editor(): |
|
40 | def get_default_editor(): | |
42 | try: |
|
41 | try: | |
43 | ed = os.environ['EDITOR'] |
|
42 | ed = os.environ['EDITOR'] | |
@@ -53,12 +52,10 b' def get_default_editor():' | |||||
53 | # overwrites it (like wx.py.PyShell does) |
|
52 | # overwrites it (like wx.py.PyShell does) | |
54 | raw_input_original = raw_input |
|
53 | raw_input_original = raw_input | |
55 |
|
54 | |||
56 |
|
||||
57 | #----------------------------------------------------------------------------- |
|
55 | #----------------------------------------------------------------------------- | |
58 | # Main class |
|
56 | # Main class | |
59 | #----------------------------------------------------------------------------- |
|
57 | #----------------------------------------------------------------------------- | |
60 |
|
58 | |||
61 |
|
||||
62 | class TerminalInteractiveShell(InteractiveShell): |
|
59 | class TerminalInteractiveShell(InteractiveShell): | |
63 |
|
60 | |||
64 | autoedit_syntax = CBool(False, config=True) |
|
61 | autoedit_syntax = CBool(False, config=True) | |
@@ -516,6 +513,7 b' class TerminalInteractiveShell(InteractiveShell):' | |||||
516 | self.shell.set_autoindent() |
|
513 | self.shell.set_autoindent() | |
517 | print "Automatic indentation is:",['OFF','ON'][self.shell.autoindent] |
|
514 | print "Automatic indentation is:",['OFF','ON'][self.shell.autoindent] | |
518 |
|
515 | |||
|
516 | @testdec.skip_doctest | |||
519 | def magic_cpaste(self, parameter_s=''): |
|
517 | def magic_cpaste(self, parameter_s=''): | |
520 | """Paste & execute a pre-formatted code block from clipboard. |
|
518 | """Paste & execute a pre-formatted code block from clipboard. | |
521 |
|
519 |
General Comments 0
You need to be logged in to leave comments.
Login now