Show More
The requested changes are too big and content was truncated. Show full diff
@@ -1,2089 +1,2089 b'' | |||||
1 | """Completion for IPython. |
|
1 | """Completion for IPython. | |
2 |
|
2 | |||
3 | This module started as fork of the rlcompleter module in the Python standard |
|
3 | This module started as fork of the rlcompleter module in the Python standard | |
4 | library. The original enhancements made to rlcompleter have been sent |
|
4 | library. The original enhancements made to rlcompleter have been sent | |
5 | upstream and were accepted as of Python 2.3, |
|
5 | upstream and were accepted as of Python 2.3, | |
6 |
|
6 | |||
7 | This module now support a wide variety of completion mechanism both available |
|
7 | This module now support a wide variety of completion mechanism both available | |
8 | for normal classic Python code, as well as completer for IPython specific |
|
8 | for normal classic Python code, as well as completer for IPython specific | |
9 | Syntax like magics. |
|
9 | Syntax like magics. | |
10 |
|
10 | |||
11 | Latex and Unicode completion |
|
11 | Latex and Unicode completion | |
12 | ============================ |
|
12 | ============================ | |
13 |
|
13 | |||
14 | IPython and compatible frontends not only can complete your code, but can help |
|
14 | IPython and compatible frontends not only can complete your code, but can help | |
15 | you to input a wide range of characters. In particular we allow you to insert |
|
15 | you to input a wide range of characters. In particular we allow you to insert | |
16 | a unicode character using the tab completion mechanism. |
|
16 | a unicode character using the tab completion mechanism. | |
17 |
|
17 | |||
18 | Forward latex/unicode completion |
|
18 | Forward latex/unicode completion | |
19 | -------------------------------- |
|
19 | -------------------------------- | |
20 |
|
20 | |||
21 | Forward completion allows you to easily type a unicode character using its latex |
|
21 | Forward completion allows you to easily type a unicode character using its latex | |
22 | name, or unicode long description. To do so type a backslash follow by the |
|
22 | name, or unicode long description. To do so type a backslash follow by the | |
23 | relevant name and press tab: |
|
23 | relevant name and press tab: | |
24 |
|
24 | |||
25 |
|
25 | |||
26 | Using latex completion: |
|
26 | Using latex completion: | |
27 |
|
27 | |||
28 | .. code:: |
|
28 | .. code:: | |
29 |
|
29 | |||
30 | \\alpha<tab> |
|
30 | \\alpha<tab> | |
31 | Ξ± |
|
31 | Ξ± | |
32 |
|
32 | |||
33 | or using unicode completion: |
|
33 | or using unicode completion: | |
34 |
|
34 | |||
35 |
|
35 | |||
36 | .. code:: |
|
36 | .. code:: | |
37 |
|
37 | |||
38 | \\greek small letter alpha<tab> |
|
38 | \\greek small letter alpha<tab> | |
39 | Ξ± |
|
39 | Ξ± | |
40 |
|
40 | |||
41 |
|
41 | |||
42 | Only valid Python identifiers will complete. Combining characters (like arrow or |
|
42 | Only valid Python identifiers will complete. Combining characters (like arrow or | |
43 | dots) are also available, unlike latex they need to be put after the their |
|
43 | dots) are also available, unlike latex they need to be put after the their | |
44 | counterpart that is to say, `F\\\\vec<tab>` is correct, not `\\\\vec<tab>F`. |
|
44 | counterpart that is to say, `F\\\\vec<tab>` is correct, not `\\\\vec<tab>F`. | |
45 |
|
45 | |||
46 | Some browsers are known to display combining characters incorrectly. |
|
46 | Some browsers are known to display combining characters incorrectly. | |
47 |
|
47 | |||
48 | Backward latex completion |
|
48 | Backward latex completion | |
49 | ------------------------- |
|
49 | ------------------------- | |
50 |
|
50 | |||
51 | It is sometime challenging to know how to type a character, if you are using |
|
51 | It is sometime challenging to know how to type a character, if you are using | |
52 | IPython, or any compatible frontend you can prepend backslash to the character |
|
52 | IPython, or any compatible frontend you can prepend backslash to the character | |
53 | and press `<tab>` to expand it to its latex form. |
|
53 | and press `<tab>` to expand it to its latex form. | |
54 |
|
54 | |||
55 | .. code:: |
|
55 | .. code:: | |
56 |
|
56 | |||
57 | \\Ξ±<tab> |
|
57 | \\Ξ±<tab> | |
58 | \\alpha |
|
58 | \\alpha | |
59 |
|
59 | |||
60 |
|
60 | |||
61 | Both forward and backward completions can be deactivated by setting the |
|
61 | Both forward and backward completions can be deactivated by setting the | |
62 | ``Completer.backslash_combining_completions`` option to ``False``. |
|
62 | ``Completer.backslash_combining_completions`` option to ``False``. | |
63 |
|
63 | |||
64 |
|
64 | |||
65 | Experimental |
|
65 | Experimental | |
66 | ============ |
|
66 | ============ | |
67 |
|
67 | |||
68 | Starting with IPython 6.0, this module can make use of the Jedi library to |
|
68 | Starting with IPython 6.0, this module can make use of the Jedi library to | |
69 | generate completions both using static analysis of the code, and dynamically |
|
69 | generate completions both using static analysis of the code, and dynamically | |
70 | inspecting multiple namespaces. Jedi is an autocompletion and static analysis |
|
70 | inspecting multiple namespaces. Jedi is an autocompletion and static analysis | |
71 | for Python. The APIs attached to this new mechanism is unstable and will |
|
71 | for Python. The APIs attached to this new mechanism is unstable and will | |
72 | raise unless use in an :any:`provisionalcompleter` context manager. |
|
72 | raise unless use in an :any:`provisionalcompleter` context manager. | |
73 |
|
73 | |||
74 | You will find that the following are experimental: |
|
74 | You will find that the following are experimental: | |
75 |
|
75 | |||
76 | - :any:`provisionalcompleter` |
|
76 | - :any:`provisionalcompleter` | |
77 | - :any:`IPCompleter.completions` |
|
77 | - :any:`IPCompleter.completions` | |
78 | - :any:`Completion` |
|
78 | - :any:`Completion` | |
79 | - :any:`rectify_completions` |
|
79 | - :any:`rectify_completions` | |
80 |
|
80 | |||
81 | .. note:: |
|
81 | .. note:: | |
82 |
|
82 | |||
83 | better name for :any:`rectify_completions` ? |
|
83 | better name for :any:`rectify_completions` ? | |
84 |
|
84 | |||
85 | We welcome any feedback on these new API, and we also encourage you to try this |
|
85 | We welcome any feedback on these new API, and we also encourage you to try this | |
86 | module in debug mode (start IPython with ``--Completer.debug=True``) in order |
|
86 | module in debug mode (start IPython with ``--Completer.debug=True``) in order | |
87 | to have extra logging information if :any:`jedi` is crashing, or if current |
|
87 | to have extra logging information if :any:`jedi` is crashing, or if current | |
88 | IPython completer pending deprecations are returning results not yet handled |
|
88 | IPython completer pending deprecations are returning results not yet handled | |
89 | by :any:`jedi` |
|
89 | by :any:`jedi` | |
90 |
|
90 | |||
91 | Using Jedi for tab completion allow snippets like the following to work without |
|
91 | Using Jedi for tab completion allow snippets like the following to work without | |
92 | having to execute any code: |
|
92 | having to execute any code: | |
93 |
|
93 | |||
94 | >>> myvar = ['hello', 42] |
|
94 | >>> myvar = ['hello', 42] | |
95 | ... myvar[1].bi<tab> |
|
95 | ... myvar[1].bi<tab> | |
96 |
|
96 | |||
97 | Tab completion will be able to infer that ``myvar[1]`` is a real number without |
|
97 | Tab completion will be able to infer that ``myvar[1]`` is a real number without | |
98 | executing any code unlike the previously available ``IPCompleter.greedy`` |
|
98 | executing any code unlike the previously available ``IPCompleter.greedy`` | |
99 | option. |
|
99 | option. | |
100 |
|
100 | |||
101 | Be sure to update :any:`jedi` to the latest stable version or to try the |
|
101 | Be sure to update :any:`jedi` to the latest stable version or to try the | |
102 | current development version to get better completions. |
|
102 | current development version to get better completions. | |
103 | """ |
|
103 | """ | |
104 |
|
104 | |||
105 |
|
105 | |||
106 | # Copyright (c) IPython Development Team. |
|
106 | # Copyright (c) IPython Development Team. | |
107 | # Distributed under the terms of the Modified BSD License. |
|
107 | # Distributed under the terms of the Modified BSD License. | |
108 | # |
|
108 | # | |
109 | # Some of this code originated from rlcompleter in the Python standard library |
|
109 | # Some of this code originated from rlcompleter in the Python standard library | |
110 | # Copyright (C) 2001 Python Software Foundation, www.python.org |
|
110 | # Copyright (C) 2001 Python Software Foundation, www.python.org | |
111 |
|
111 | |||
112 |
|
112 | |||
113 | import __main__ |
|
113 | import __main__ | |
114 | import builtins as builtin_mod |
|
114 | import builtins as builtin_mod | |
115 | import glob |
|
115 | import glob | |
116 | import time |
|
116 | import time | |
117 | import inspect |
|
117 | import inspect | |
118 | import itertools |
|
118 | import itertools | |
119 | import keyword |
|
119 | import keyword | |
120 | import os |
|
120 | import os | |
121 | import re |
|
121 | import re | |
122 | import sys |
|
122 | import sys | |
123 | import unicodedata |
|
123 | import unicodedata | |
124 | import string |
|
124 | import string | |
125 | import warnings |
|
125 | import warnings | |
126 |
|
126 | |||
127 | from contextlib import contextmanager |
|
127 | from contextlib import contextmanager | |
128 | from importlib import import_module |
|
128 | from importlib import import_module | |
129 |
from typing import Iterator, List, Tuple, Iterable |
|
129 | from typing import Iterator, List, Tuple, Iterable | |
130 | from types import SimpleNamespace |
|
130 | from types import SimpleNamespace | |
131 |
|
131 | |||
132 | from traitlets.config.configurable import Configurable |
|
132 | from traitlets.config.configurable import Configurable | |
133 | from IPython.core.error import TryNext |
|
133 | from IPython.core.error import TryNext | |
134 | from IPython.core.inputtransformer2 import ESC_MAGIC |
|
134 | from IPython.core.inputtransformer2 import ESC_MAGIC | |
135 | from IPython.core.latex_symbols import latex_symbols, reverse_latex_symbol |
|
135 | from IPython.core.latex_symbols import latex_symbols, reverse_latex_symbol | |
136 | from IPython.core.oinspect import InspectColors |
|
136 | from IPython.core.oinspect import InspectColors | |
137 | from IPython.utils import generics |
|
137 | from IPython.utils import generics | |
138 | from IPython.utils.dir2 import dir2, get_real_method |
|
138 | from IPython.utils.dir2 import dir2, get_real_method | |
139 | from IPython.utils.process import arg_split |
|
139 | from IPython.utils.process import arg_split | |
140 | from traitlets import Bool, Enum, observe, Int |
|
140 | from traitlets import Bool, Enum, observe, Int | |
141 |
|
141 | |||
142 | # skip module docstests |
|
142 | # skip module docstests | |
143 | skip_doctest = True |
|
143 | skip_doctest = True | |
144 |
|
144 | |||
145 | try: |
|
145 | try: | |
146 | import jedi |
|
146 | import jedi | |
147 | jedi.settings.case_insensitive_completion = False |
|
147 | jedi.settings.case_insensitive_completion = False | |
148 | import jedi.api.helpers |
|
148 | import jedi.api.helpers | |
149 | import jedi.api.classes |
|
149 | import jedi.api.classes | |
150 | JEDI_INSTALLED = True |
|
150 | JEDI_INSTALLED = True | |
151 | except ImportError: |
|
151 | except ImportError: | |
152 | JEDI_INSTALLED = False |
|
152 | JEDI_INSTALLED = False | |
153 | #----------------------------------------------------------------------------- |
|
153 | #----------------------------------------------------------------------------- | |
154 | # Globals |
|
154 | # Globals | |
155 | #----------------------------------------------------------------------------- |
|
155 | #----------------------------------------------------------------------------- | |
156 |
|
156 | |||
157 | # Public API |
|
157 | # Public API | |
158 | __all__ = ['Completer','IPCompleter'] |
|
158 | __all__ = ['Completer','IPCompleter'] | |
159 |
|
159 | |||
160 | if sys.platform == 'win32': |
|
160 | if sys.platform == 'win32': | |
161 | PROTECTABLES = ' ' |
|
161 | PROTECTABLES = ' ' | |
162 | else: |
|
162 | else: | |
163 | PROTECTABLES = ' ()[]{}?=\\|;:\'#*"^&' |
|
163 | PROTECTABLES = ' ()[]{}?=\\|;:\'#*"^&' | |
164 |
|
164 | |||
165 | # Protect against returning an enormous number of completions which the frontend |
|
165 | # Protect against returning an enormous number of completions which the frontend | |
166 | # may have trouble processing. |
|
166 | # may have trouble processing. | |
167 | MATCHES_LIMIT = 500 |
|
167 | MATCHES_LIMIT = 500 | |
168 |
|
168 | |||
169 | _deprecation_readline_sentinel = object() |
|
169 | _deprecation_readline_sentinel = object() | |
170 |
|
170 | |||
171 |
|
171 | |||
172 | class ProvisionalCompleterWarning(FutureWarning): |
|
172 | class ProvisionalCompleterWarning(FutureWarning): | |
173 | """ |
|
173 | """ | |
174 | Exception raise by an experimental feature in this module. |
|
174 | Exception raise by an experimental feature in this module. | |
175 |
|
175 | |||
176 | Wrap code in :any:`provisionalcompleter` context manager if you |
|
176 | Wrap code in :any:`provisionalcompleter` context manager if you | |
177 | are certain you want to use an unstable feature. |
|
177 | are certain you want to use an unstable feature. | |
178 | """ |
|
178 | """ | |
179 | pass |
|
179 | pass | |
180 |
|
180 | |||
181 | warnings.filterwarnings('error', category=ProvisionalCompleterWarning) |
|
181 | warnings.filterwarnings('error', category=ProvisionalCompleterWarning) | |
182 |
|
182 | |||
183 | @contextmanager |
|
183 | @contextmanager | |
184 | def provisionalcompleter(action='ignore'): |
|
184 | def provisionalcompleter(action='ignore'): | |
185 | """ |
|
185 | """ | |
186 |
|
186 | |||
187 |
|
187 | |||
188 | This context manager has to be used in any place where unstable completer |
|
188 | This context manager has to be used in any place where unstable completer | |
189 | behavior and API may be called. |
|
189 | behavior and API may be called. | |
190 |
|
190 | |||
191 | >>> with provisionalcompleter(): |
|
191 | >>> with provisionalcompleter(): | |
192 | ... completer.do_experimental_things() # works |
|
192 | ... completer.do_experimental_things() # works | |
193 |
|
193 | |||
194 | >>> completer.do_experimental_things() # raises. |
|
194 | >>> completer.do_experimental_things() # raises. | |
195 |
|
195 | |||
196 | .. note:: Unstable |
|
196 | .. note:: Unstable | |
197 |
|
197 | |||
198 | By using this context manager you agree that the API in use may change |
|
198 | By using this context manager you agree that the API in use may change | |
199 | without warning, and that you won't complain if they do so. |
|
199 | without warning, and that you won't complain if they do so. | |
200 |
|
200 | |||
201 | You also understand that, if the API is not to your liking, you should report |
|
201 | You also understand that, if the API is not to your liking, you should report | |
202 | a bug to explain your use case upstream. |
|
202 | a bug to explain your use case upstream. | |
203 |
|
203 | |||
204 | We'll be happy to get your feedback, feature requests, and improvements on |
|
204 | We'll be happy to get your feedback, feature requests, and improvements on | |
205 | any of the unstable APIs! |
|
205 | any of the unstable APIs! | |
206 | """ |
|
206 | """ | |
207 | with warnings.catch_warnings(): |
|
207 | with warnings.catch_warnings(): | |
208 | warnings.filterwarnings(action, category=ProvisionalCompleterWarning) |
|
208 | warnings.filterwarnings(action, category=ProvisionalCompleterWarning) | |
209 | yield |
|
209 | yield | |
210 |
|
210 | |||
211 |
|
211 | |||
212 | def has_open_quotes(s): |
|
212 | def has_open_quotes(s): | |
213 | """Return whether a string has open quotes. |
|
213 | """Return whether a string has open quotes. | |
214 |
|
214 | |||
215 | This simply counts whether the number of quote characters of either type in |
|
215 | This simply counts whether the number of quote characters of either type in | |
216 | the string is odd. |
|
216 | the string is odd. | |
217 |
|
217 | |||
218 | Returns |
|
218 | Returns | |
219 | ------- |
|
219 | ------- | |
220 | If there is an open quote, the quote character is returned. Else, return |
|
220 | If there is an open quote, the quote character is returned. Else, return | |
221 | False. |
|
221 | False. | |
222 | """ |
|
222 | """ | |
223 | # We check " first, then ', so complex cases with nested quotes will get |
|
223 | # We check " first, then ', so complex cases with nested quotes will get | |
224 | # the " to take precedence. |
|
224 | # the " to take precedence. | |
225 | if s.count('"') % 2: |
|
225 | if s.count('"') % 2: | |
226 | return '"' |
|
226 | return '"' | |
227 | elif s.count("'") % 2: |
|
227 | elif s.count("'") % 2: | |
228 | return "'" |
|
228 | return "'" | |
229 | else: |
|
229 | else: | |
230 | return False |
|
230 | return False | |
231 |
|
231 | |||
232 |
|
232 | |||
233 | def protect_filename(s, protectables=PROTECTABLES): |
|
233 | def protect_filename(s, protectables=PROTECTABLES): | |
234 | """Escape a string to protect certain characters.""" |
|
234 | """Escape a string to protect certain characters.""" | |
235 | if set(s) & set(protectables): |
|
235 | if set(s) & set(protectables): | |
236 | if sys.platform == "win32": |
|
236 | if sys.platform == "win32": | |
237 | return '"' + s + '"' |
|
237 | return '"' + s + '"' | |
238 | else: |
|
238 | else: | |
239 | return "".join(("\\" + c if c in protectables else c) for c in s) |
|
239 | return "".join(("\\" + c if c in protectables else c) for c in s) | |
240 | else: |
|
240 | else: | |
241 | return s |
|
241 | return s | |
242 |
|
242 | |||
243 |
|
243 | |||
244 | def expand_user(path:str) -> Tuple[str, bool, str]: |
|
244 | def expand_user(path:str) -> Tuple[str, bool, str]: | |
245 | """Expand ``~``-style usernames in strings. |
|
245 | """Expand ``~``-style usernames in strings. | |
246 |
|
246 | |||
247 | This is similar to :func:`os.path.expanduser`, but it computes and returns |
|
247 | This is similar to :func:`os.path.expanduser`, but it computes and returns | |
248 | extra information that will be useful if the input was being used in |
|
248 | extra information that will be useful if the input was being used in | |
249 | computing completions, and you wish to return the completions with the |
|
249 | computing completions, and you wish to return the completions with the | |
250 | original '~' instead of its expanded value. |
|
250 | original '~' instead of its expanded value. | |
251 |
|
251 | |||
252 | Parameters |
|
252 | Parameters | |
253 | ---------- |
|
253 | ---------- | |
254 | path : str |
|
254 | path : str | |
255 | String to be expanded. If no ~ is present, the output is the same as the |
|
255 | String to be expanded. If no ~ is present, the output is the same as the | |
256 | input. |
|
256 | input. | |
257 |
|
257 | |||
258 | Returns |
|
258 | Returns | |
259 | ------- |
|
259 | ------- | |
260 | newpath : str |
|
260 | newpath : str | |
261 | Result of ~ expansion in the input path. |
|
261 | Result of ~ expansion in the input path. | |
262 | tilde_expand : bool |
|
262 | tilde_expand : bool | |
263 | Whether any expansion was performed or not. |
|
263 | Whether any expansion was performed or not. | |
264 | tilde_val : str |
|
264 | tilde_val : str | |
265 | The value that ~ was replaced with. |
|
265 | The value that ~ was replaced with. | |
266 | """ |
|
266 | """ | |
267 | # Default values |
|
267 | # Default values | |
268 | tilde_expand = False |
|
268 | tilde_expand = False | |
269 | tilde_val = '' |
|
269 | tilde_val = '' | |
270 | newpath = path |
|
270 | newpath = path | |
271 |
|
271 | |||
272 | if path.startswith('~'): |
|
272 | if path.startswith('~'): | |
273 | tilde_expand = True |
|
273 | tilde_expand = True | |
274 | rest = len(path)-1 |
|
274 | rest = len(path)-1 | |
275 | newpath = os.path.expanduser(path) |
|
275 | newpath = os.path.expanduser(path) | |
276 | if rest: |
|
276 | if rest: | |
277 | tilde_val = newpath[:-rest] |
|
277 | tilde_val = newpath[:-rest] | |
278 | else: |
|
278 | else: | |
279 | tilde_val = newpath |
|
279 | tilde_val = newpath | |
280 |
|
280 | |||
281 | return newpath, tilde_expand, tilde_val |
|
281 | return newpath, tilde_expand, tilde_val | |
282 |
|
282 | |||
283 |
|
283 | |||
284 | def compress_user(path:str, tilde_expand:bool, tilde_val:str) -> str: |
|
284 | def compress_user(path:str, tilde_expand:bool, tilde_val:str) -> str: | |
285 | """Does the opposite of expand_user, with its outputs. |
|
285 | """Does the opposite of expand_user, with its outputs. | |
286 | """ |
|
286 | """ | |
287 | if tilde_expand: |
|
287 | if tilde_expand: | |
288 | return path.replace(tilde_val, '~') |
|
288 | return path.replace(tilde_val, '~') | |
289 | else: |
|
289 | else: | |
290 | return path |
|
290 | return path | |
291 |
|
291 | |||
292 |
|
292 | |||
293 | def completions_sorting_key(word): |
|
293 | def completions_sorting_key(word): | |
294 | """key for sorting completions |
|
294 | """key for sorting completions | |
295 |
|
295 | |||
296 | This does several things: |
|
296 | This does several things: | |
297 |
|
297 | |||
298 | - Demote any completions starting with underscores to the end |
|
298 | - Demote any completions starting with underscores to the end | |
299 | - Insert any %magic and %%cellmagic completions in the alphabetical order |
|
299 | - Insert any %magic and %%cellmagic completions in the alphabetical order | |
300 | by their name |
|
300 | by their name | |
301 | """ |
|
301 | """ | |
302 | prio1, prio2 = 0, 0 |
|
302 | prio1, prio2 = 0, 0 | |
303 |
|
303 | |||
304 | if word.startswith('__'): |
|
304 | if word.startswith('__'): | |
305 | prio1 = 2 |
|
305 | prio1 = 2 | |
306 | elif word.startswith('_'): |
|
306 | elif word.startswith('_'): | |
307 | prio1 = 1 |
|
307 | prio1 = 1 | |
308 |
|
308 | |||
309 | if word.endswith('='): |
|
309 | if word.endswith('='): | |
310 | prio1 = -1 |
|
310 | prio1 = -1 | |
311 |
|
311 | |||
312 | if word.startswith('%%'): |
|
312 | if word.startswith('%%'): | |
313 | # If there's another % in there, this is something else, so leave it alone |
|
313 | # If there's another % in there, this is something else, so leave it alone | |
314 | if not "%" in word[2:]: |
|
314 | if not "%" in word[2:]: | |
315 | word = word[2:] |
|
315 | word = word[2:] | |
316 | prio2 = 2 |
|
316 | prio2 = 2 | |
317 | elif word.startswith('%'): |
|
317 | elif word.startswith('%'): | |
318 | if not "%" in word[1:]: |
|
318 | if not "%" in word[1:]: | |
319 | word = word[1:] |
|
319 | word = word[1:] | |
320 | prio2 = 1 |
|
320 | prio2 = 1 | |
321 |
|
321 | |||
322 | return prio1, word, prio2 |
|
322 | return prio1, word, prio2 | |
323 |
|
323 | |||
324 |
|
324 | |||
325 | class _FakeJediCompletion: |
|
325 | class _FakeJediCompletion: | |
326 | """ |
|
326 | """ | |
327 | This is a workaround to communicate to the UI that Jedi has crashed and to |
|
327 | This is a workaround to communicate to the UI that Jedi has crashed and to | |
328 | report a bug. Will be used only id :any:`IPCompleter.debug` is set to true. |
|
328 | report a bug. Will be used only id :any:`IPCompleter.debug` is set to true. | |
329 |
|
329 | |||
330 | Added in IPython 6.0 so should likely be removed for 7.0 |
|
330 | Added in IPython 6.0 so should likely be removed for 7.0 | |
331 |
|
331 | |||
332 | """ |
|
332 | """ | |
333 |
|
333 | |||
334 | def __init__(self, name): |
|
334 | def __init__(self, name): | |
335 |
|
335 | |||
336 | self.name = name |
|
336 | self.name = name | |
337 | self.complete = name |
|
337 | self.complete = name | |
338 | self.type = 'crashed' |
|
338 | self.type = 'crashed' | |
339 | self.name_with_symbols = name |
|
339 | self.name_with_symbols = name | |
340 | self.signature = '' |
|
340 | self.signature = '' | |
341 | self._origin = 'fake' |
|
341 | self._origin = 'fake' | |
342 |
|
342 | |||
343 | def __repr__(self): |
|
343 | def __repr__(self): | |
344 | return '<Fake completion object jedi has crashed>' |
|
344 | return '<Fake completion object jedi has crashed>' | |
345 |
|
345 | |||
346 |
|
346 | |||
347 | class Completion: |
|
347 | class Completion: | |
348 | """ |
|
348 | """ | |
349 | Completion object used and return by IPython completers. |
|
349 | Completion object used and return by IPython completers. | |
350 |
|
350 | |||
351 | .. warning:: Unstable |
|
351 | .. warning:: Unstable | |
352 |
|
352 | |||
353 | This function is unstable, API may change without warning. |
|
353 | This function is unstable, API may change without warning. | |
354 | It will also raise unless use in proper context manager. |
|
354 | It will also raise unless use in proper context manager. | |
355 |
|
355 | |||
356 | This act as a middle ground :any:`Completion` object between the |
|
356 | This act as a middle ground :any:`Completion` object between the | |
357 | :any:`jedi.api.classes.Completion` object and the Prompt Toolkit completion |
|
357 | :any:`jedi.api.classes.Completion` object and the Prompt Toolkit completion | |
358 | object. While Jedi need a lot of information about evaluator and how the |
|
358 | object. While Jedi need a lot of information about evaluator and how the | |
359 | code should be ran/inspected, PromptToolkit (and other frontend) mostly |
|
359 | code should be ran/inspected, PromptToolkit (and other frontend) mostly | |
360 | need user facing information. |
|
360 | need user facing information. | |
361 |
|
361 | |||
362 | - Which range should be replaced replaced by what. |
|
362 | - Which range should be replaced replaced by what. | |
363 | - Some metadata (like completion type), or meta information to displayed to |
|
363 | - Some metadata (like completion type), or meta information to displayed to | |
364 | the use user. |
|
364 | the use user. | |
365 |
|
365 | |||
366 | For debugging purpose we can also store the origin of the completion (``jedi``, |
|
366 | For debugging purpose we can also store the origin of the completion (``jedi``, | |
367 | ``IPython.python_matches``, ``IPython.magics_matches``...). |
|
367 | ``IPython.python_matches``, ``IPython.magics_matches``...). | |
368 | """ |
|
368 | """ | |
369 |
|
369 | |||
370 | __slots__ = ['start', 'end', 'text', 'type', 'signature', '_origin'] |
|
370 | __slots__ = ['start', 'end', 'text', 'type', 'signature', '_origin'] | |
371 |
|
371 | |||
372 | def __init__(self, start: int, end: int, text: str, *, type: str=None, _origin='', signature='') -> None: |
|
372 | def __init__(self, start: int, end: int, text: str, *, type: str=None, _origin='', signature='') -> None: | |
373 | warnings.warn("``Completion`` is a provisional API (as of IPython 6.0). " |
|
373 | warnings.warn("``Completion`` is a provisional API (as of IPython 6.0). " | |
374 | "It may change without warnings. " |
|
374 | "It may change without warnings. " | |
375 | "Use in corresponding context manager.", |
|
375 | "Use in corresponding context manager.", | |
376 | category=ProvisionalCompleterWarning, stacklevel=2) |
|
376 | category=ProvisionalCompleterWarning, stacklevel=2) | |
377 |
|
377 | |||
378 | self.start = start |
|
378 | self.start = start | |
379 | self.end = end |
|
379 | self.end = end | |
380 | self.text = text |
|
380 | self.text = text | |
381 | self.type = type |
|
381 | self.type = type | |
382 | self.signature = signature |
|
382 | self.signature = signature | |
383 | self._origin = _origin |
|
383 | self._origin = _origin | |
384 |
|
384 | |||
385 | def __repr__(self): |
|
385 | def __repr__(self): | |
386 | return '<Completion start=%s end=%s text=%r type=%r, signature=%r,>' % \ |
|
386 | return '<Completion start=%s end=%s text=%r type=%r, signature=%r,>' % \ | |
387 | (self.start, self.end, self.text, self.type or '?', self.signature or '?') |
|
387 | (self.start, self.end, self.text, self.type or '?', self.signature or '?') | |
388 |
|
388 | |||
389 | def __eq__(self, other)->Bool: |
|
389 | def __eq__(self, other)->Bool: | |
390 | """ |
|
390 | """ | |
391 | Equality and hash do not hash the type (as some completer may not be |
|
391 | Equality and hash do not hash the type (as some completer may not be | |
392 | able to infer the type), but are use to (partially) de-duplicate |
|
392 | able to infer the type), but are use to (partially) de-duplicate | |
393 | completion. |
|
393 | completion. | |
394 |
|
394 | |||
395 | Completely de-duplicating completion is a bit tricker that just |
|
395 | Completely de-duplicating completion is a bit tricker that just | |
396 | comparing as it depends on surrounding text, which Completions are not |
|
396 | comparing as it depends on surrounding text, which Completions are not | |
397 | aware of. |
|
397 | aware of. | |
398 | """ |
|
398 | """ | |
399 | return self.start == other.start and \ |
|
399 | return self.start == other.start and \ | |
400 | self.end == other.end and \ |
|
400 | self.end == other.end and \ | |
401 | self.text == other.text |
|
401 | self.text == other.text | |
402 |
|
402 | |||
403 | def __hash__(self): |
|
403 | def __hash__(self): | |
404 | return hash((self.start, self.end, self.text)) |
|
404 | return hash((self.start, self.end, self.text)) | |
405 |
|
405 | |||
406 |
|
406 | |||
407 | _IC = Iterable[Completion] |
|
407 | _IC = Iterable[Completion] | |
408 |
|
408 | |||
409 |
|
409 | |||
410 | def _deduplicate_completions(text: str, completions: _IC)-> _IC: |
|
410 | def _deduplicate_completions(text: str, completions: _IC)-> _IC: | |
411 | """ |
|
411 | """ | |
412 | Deduplicate a set of completions. |
|
412 | Deduplicate a set of completions. | |
413 |
|
413 | |||
414 | .. warning:: Unstable |
|
414 | .. warning:: Unstable | |
415 |
|
415 | |||
416 | This function is unstable, API may change without warning. |
|
416 | This function is unstable, API may change without warning. | |
417 |
|
417 | |||
418 | Parameters |
|
418 | Parameters | |
419 | ---------- |
|
419 | ---------- | |
420 | text: str |
|
420 | text: str | |
421 | text that should be completed. |
|
421 | text that should be completed. | |
422 | completions: Iterator[Completion] |
|
422 | completions: Iterator[Completion] | |
423 | iterator over the completions to deduplicate |
|
423 | iterator over the completions to deduplicate | |
424 |
|
424 | |||
425 | Yields |
|
425 | Yields | |
426 | ------ |
|
426 | ------ | |
427 | `Completions` objects |
|
427 | `Completions` objects | |
428 |
|
428 | |||
429 |
|
429 | |||
430 | Completions coming from multiple sources, may be different but end up having |
|
430 | Completions coming from multiple sources, may be different but end up having | |
431 | the same effect when applied to ``text``. If this is the case, this will |
|
431 | the same effect when applied to ``text``. If this is the case, this will | |
432 | consider completions as equal and only emit the first encountered. |
|
432 | consider completions as equal and only emit the first encountered. | |
433 |
|
433 | |||
434 | Not folded in `completions()` yet for debugging purpose, and to detect when |
|
434 | Not folded in `completions()` yet for debugging purpose, and to detect when | |
435 | the IPython completer does return things that Jedi does not, but should be |
|
435 | the IPython completer does return things that Jedi does not, but should be | |
436 | at some point. |
|
436 | at some point. | |
437 | """ |
|
437 | """ | |
438 | completions = list(completions) |
|
438 | completions = list(completions) | |
439 | if not completions: |
|
439 | if not completions: | |
440 | return |
|
440 | return | |
441 |
|
441 | |||
442 | new_start = min(c.start for c in completions) |
|
442 | new_start = min(c.start for c in completions) | |
443 | new_end = max(c.end for c in completions) |
|
443 | new_end = max(c.end for c in completions) | |
444 |
|
444 | |||
445 | seen = set() |
|
445 | seen = set() | |
446 | for c in completions: |
|
446 | for c in completions: | |
447 | new_text = text[new_start:c.start] + c.text + text[c.end:new_end] |
|
447 | new_text = text[new_start:c.start] + c.text + text[c.end:new_end] | |
448 | if new_text not in seen: |
|
448 | if new_text not in seen: | |
449 | yield c |
|
449 | yield c | |
450 | seen.add(new_text) |
|
450 | seen.add(new_text) | |
451 |
|
451 | |||
452 |
|
452 | |||
453 | def rectify_completions(text: str, completions: _IC, *, _debug=False)->_IC: |
|
453 | def rectify_completions(text: str, completions: _IC, *, _debug=False)->_IC: | |
454 | """ |
|
454 | """ | |
455 | Rectify a set of completions to all have the same ``start`` and ``end`` |
|
455 | Rectify a set of completions to all have the same ``start`` and ``end`` | |
456 |
|
456 | |||
457 | .. warning:: Unstable |
|
457 | .. warning:: Unstable | |
458 |
|
458 | |||
459 | This function is unstable, API may change without warning. |
|
459 | This function is unstable, API may change without warning. | |
460 | It will also raise unless use in proper context manager. |
|
460 | It will also raise unless use in proper context manager. | |
461 |
|
461 | |||
462 | Parameters |
|
462 | Parameters | |
463 | ---------- |
|
463 | ---------- | |
464 | text: str |
|
464 | text: str | |
465 | text that should be completed. |
|
465 | text that should be completed. | |
466 | completions: Iterator[Completion] |
|
466 | completions: Iterator[Completion] | |
467 | iterator over the completions to rectify |
|
467 | iterator over the completions to rectify | |
468 |
|
468 | |||
469 |
|
469 | |||
470 | :any:`jedi.api.classes.Completion` s returned by Jedi may not have the same start and end, though |
|
470 | :any:`jedi.api.classes.Completion` s returned by Jedi may not have the same start and end, though | |
471 | the Jupyter Protocol requires them to behave like so. This will readjust |
|
471 | the Jupyter Protocol requires them to behave like so. This will readjust | |
472 | the completion to have the same ``start`` and ``end`` by padding both |
|
472 | the completion to have the same ``start`` and ``end`` by padding both | |
473 | extremities with surrounding text. |
|
473 | extremities with surrounding text. | |
474 |
|
474 | |||
475 | During stabilisation should support a ``_debug`` option to log which |
|
475 | During stabilisation should support a ``_debug`` option to log which | |
476 | completion are return by the IPython completer and not found in Jedi in |
|
476 | completion are return by the IPython completer and not found in Jedi in | |
477 | order to make upstream bug report. |
|
477 | order to make upstream bug report. | |
478 | """ |
|
478 | """ | |
479 | warnings.warn("`rectify_completions` is a provisional API (as of IPython 6.0). " |
|
479 | warnings.warn("`rectify_completions` is a provisional API (as of IPython 6.0). " | |
480 | "It may change without warnings. " |
|
480 | "It may change without warnings. " | |
481 | "Use in corresponding context manager.", |
|
481 | "Use in corresponding context manager.", | |
482 | category=ProvisionalCompleterWarning, stacklevel=2) |
|
482 | category=ProvisionalCompleterWarning, stacklevel=2) | |
483 |
|
483 | |||
484 | completions = list(completions) |
|
484 | completions = list(completions) | |
485 | if not completions: |
|
485 | if not completions: | |
486 | return |
|
486 | return | |
487 | starts = (c.start for c in completions) |
|
487 | starts = (c.start for c in completions) | |
488 | ends = (c.end for c in completions) |
|
488 | ends = (c.end for c in completions) | |
489 |
|
489 | |||
490 | new_start = min(starts) |
|
490 | new_start = min(starts) | |
491 | new_end = max(ends) |
|
491 | new_end = max(ends) | |
492 |
|
492 | |||
493 | seen_jedi = set() |
|
493 | seen_jedi = set() | |
494 | seen_python_matches = set() |
|
494 | seen_python_matches = set() | |
495 | for c in completions: |
|
495 | for c in completions: | |
496 | new_text = text[new_start:c.start] + c.text + text[c.end:new_end] |
|
496 | new_text = text[new_start:c.start] + c.text + text[c.end:new_end] | |
497 | if c._origin == 'jedi': |
|
497 | if c._origin == 'jedi': | |
498 | seen_jedi.add(new_text) |
|
498 | seen_jedi.add(new_text) | |
499 | elif c._origin == 'IPCompleter.python_matches': |
|
499 | elif c._origin == 'IPCompleter.python_matches': | |
500 | seen_python_matches.add(new_text) |
|
500 | seen_python_matches.add(new_text) | |
501 | yield Completion(new_start, new_end, new_text, type=c.type, _origin=c._origin, signature=c.signature) |
|
501 | yield Completion(new_start, new_end, new_text, type=c.type, _origin=c._origin, signature=c.signature) | |
502 | diff = seen_python_matches.difference(seen_jedi) |
|
502 | diff = seen_python_matches.difference(seen_jedi) | |
503 | if diff and _debug: |
|
503 | if diff and _debug: | |
504 | print('IPython.python matches have extras:', diff) |
|
504 | print('IPython.python matches have extras:', diff) | |
505 |
|
505 | |||
506 |
|
506 | |||
507 | if sys.platform == 'win32': |
|
507 | if sys.platform == 'win32': | |
508 | DELIMS = ' \t\n`!@#$^&*()=+[{]}|;\'",<>?' |
|
508 | DELIMS = ' \t\n`!@#$^&*()=+[{]}|;\'",<>?' | |
509 | else: |
|
509 | else: | |
510 | DELIMS = ' \t\n`!@#$^&*()=+[{]}\\|;:\'",<>?' |
|
510 | DELIMS = ' \t\n`!@#$^&*()=+[{]}\\|;:\'",<>?' | |
511 |
|
511 | |||
512 | GREEDY_DELIMS = ' =\r\n' |
|
512 | GREEDY_DELIMS = ' =\r\n' | |
513 |
|
513 | |||
514 |
|
514 | |||
515 | class CompletionSplitter(object): |
|
515 | class CompletionSplitter(object): | |
516 | """An object to split an input line in a manner similar to readline. |
|
516 | """An object to split an input line in a manner similar to readline. | |
517 |
|
517 | |||
518 | By having our own implementation, we can expose readline-like completion in |
|
518 | By having our own implementation, we can expose readline-like completion in | |
519 | a uniform manner to all frontends. This object only needs to be given the |
|
519 | a uniform manner to all frontends. This object only needs to be given the | |
520 | line of text to be split and the cursor position on said line, and it |
|
520 | line of text to be split and the cursor position on said line, and it | |
521 | returns the 'word' to be completed on at the cursor after splitting the |
|
521 | returns the 'word' to be completed on at the cursor after splitting the | |
522 | entire line. |
|
522 | entire line. | |
523 |
|
523 | |||
524 | What characters are used as splitting delimiters can be controlled by |
|
524 | What characters are used as splitting delimiters can be controlled by | |
525 | setting the ``delims`` attribute (this is a property that internally |
|
525 | setting the ``delims`` attribute (this is a property that internally | |
526 | automatically builds the necessary regular expression)""" |
|
526 | automatically builds the necessary regular expression)""" | |
527 |
|
527 | |||
528 | # Private interface |
|
528 | # Private interface | |
529 |
|
529 | |||
530 | # A string of delimiter characters. The default value makes sense for |
|
530 | # A string of delimiter characters. The default value makes sense for | |
531 | # IPython's most typical usage patterns. |
|
531 | # IPython's most typical usage patterns. | |
532 | _delims = DELIMS |
|
532 | _delims = DELIMS | |
533 |
|
533 | |||
534 | # The expression (a normal string) to be compiled into a regular expression |
|
534 | # The expression (a normal string) to be compiled into a regular expression | |
535 | # for actual splitting. We store it as an attribute mostly for ease of |
|
535 | # for actual splitting. We store it as an attribute mostly for ease of | |
536 | # debugging, since this type of code can be so tricky to debug. |
|
536 | # debugging, since this type of code can be so tricky to debug. | |
537 | _delim_expr = None |
|
537 | _delim_expr = None | |
538 |
|
538 | |||
539 | # The regular expression that does the actual splitting |
|
539 | # The regular expression that does the actual splitting | |
540 | _delim_re = None |
|
540 | _delim_re = None | |
541 |
|
541 | |||
542 | def __init__(self, delims=None): |
|
542 | def __init__(self, delims=None): | |
543 | delims = CompletionSplitter._delims if delims is None else delims |
|
543 | delims = CompletionSplitter._delims if delims is None else delims | |
544 | self.delims = delims |
|
544 | self.delims = delims | |
545 |
|
545 | |||
546 | @property |
|
546 | @property | |
547 | def delims(self): |
|
547 | def delims(self): | |
548 | """Return the string of delimiter characters.""" |
|
548 | """Return the string of delimiter characters.""" | |
549 | return self._delims |
|
549 | return self._delims | |
550 |
|
550 | |||
551 | @delims.setter |
|
551 | @delims.setter | |
552 | def delims(self, delims): |
|
552 | def delims(self, delims): | |
553 | """Set the delimiters for line splitting.""" |
|
553 | """Set the delimiters for line splitting.""" | |
554 | expr = '[' + ''.join('\\'+ c for c in delims) + ']' |
|
554 | expr = '[' + ''.join('\\'+ c for c in delims) + ']' | |
555 | self._delim_re = re.compile(expr) |
|
555 | self._delim_re = re.compile(expr) | |
556 | self._delims = delims |
|
556 | self._delims = delims | |
557 | self._delim_expr = expr |
|
557 | self._delim_expr = expr | |
558 |
|
558 | |||
559 | def split_line(self, line, cursor_pos=None): |
|
559 | def split_line(self, line, cursor_pos=None): | |
560 | """Split a line of text with a cursor at the given position. |
|
560 | """Split a line of text with a cursor at the given position. | |
561 | """ |
|
561 | """ | |
562 | l = line if cursor_pos is None else line[:cursor_pos] |
|
562 | l = line if cursor_pos is None else line[:cursor_pos] | |
563 | return self._delim_re.split(l)[-1] |
|
563 | return self._delim_re.split(l)[-1] | |
564 |
|
564 | |||
565 |
|
565 | |||
566 |
|
566 | |||
567 | class Completer(Configurable): |
|
567 | class Completer(Configurable): | |
568 |
|
568 | |||
569 | greedy = Bool(False, |
|
569 | greedy = Bool(False, | |
570 | help="""Activate greedy completion |
|
570 | help="""Activate greedy completion | |
571 | PENDING DEPRECTION. this is now mostly taken care of with Jedi. |
|
571 | PENDING DEPRECTION. this is now mostly taken care of with Jedi. | |
572 |
|
572 | |||
573 | This will enable completion on elements of lists, results of function calls, etc., |
|
573 | This will enable completion on elements of lists, results of function calls, etc., | |
574 | but can be unsafe because the code is actually evaluated on TAB. |
|
574 | but can be unsafe because the code is actually evaluated on TAB. | |
575 | """ |
|
575 | """ | |
576 | ).tag(config=True) |
|
576 | ).tag(config=True) | |
577 |
|
577 | |||
578 | use_jedi = Bool(default_value=JEDI_INSTALLED, |
|
578 | use_jedi = Bool(default_value=JEDI_INSTALLED, | |
579 | help="Experimental: Use Jedi to generate autocompletions. " |
|
579 | help="Experimental: Use Jedi to generate autocompletions. " | |
580 | "Default to True if jedi is installed.").tag(config=True) |
|
580 | "Default to True if jedi is installed.").tag(config=True) | |
581 |
|
581 | |||
582 | jedi_compute_type_timeout = Int(default_value=400, |
|
582 | jedi_compute_type_timeout = Int(default_value=400, | |
583 | help="""Experimental: restrict time (in milliseconds) during which Jedi can compute types. |
|
583 | help="""Experimental: restrict time (in milliseconds) during which Jedi can compute types. | |
584 | Set to 0 to stop computing types. Non-zero value lower than 100ms may hurt |
|
584 | Set to 0 to stop computing types. Non-zero value lower than 100ms may hurt | |
585 | performance by preventing jedi to build its cache. |
|
585 | performance by preventing jedi to build its cache. | |
586 | """).tag(config=True) |
|
586 | """).tag(config=True) | |
587 |
|
587 | |||
588 | debug = Bool(default_value=False, |
|
588 | debug = Bool(default_value=False, | |
589 | help='Enable debug for the Completer. Mostly print extra ' |
|
589 | help='Enable debug for the Completer. Mostly print extra ' | |
590 | 'information for experimental jedi integration.')\ |
|
590 | 'information for experimental jedi integration.')\ | |
591 | .tag(config=True) |
|
591 | .tag(config=True) | |
592 |
|
592 | |||
593 | backslash_combining_completions = Bool(True, |
|
593 | backslash_combining_completions = Bool(True, | |
594 | help="Enable unicode completions, e.g. \\alpha<tab> . " |
|
594 | help="Enable unicode completions, e.g. \\alpha<tab> . " | |
595 | "Includes completion of latex commands, unicode names, and expanding " |
|
595 | "Includes completion of latex commands, unicode names, and expanding " | |
596 | "unicode characters back to latex commands.").tag(config=True) |
|
596 | "unicode characters back to latex commands.").tag(config=True) | |
597 |
|
597 | |||
598 |
|
598 | |||
599 |
|
599 | |||
600 | def __init__(self, namespace=None, global_namespace=None, **kwargs): |
|
600 | def __init__(self, namespace=None, global_namespace=None, **kwargs): | |
601 | """Create a new completer for the command line. |
|
601 | """Create a new completer for the command line. | |
602 |
|
602 | |||
603 | Completer(namespace=ns, global_namespace=ns2) -> completer instance. |
|
603 | Completer(namespace=ns, global_namespace=ns2) -> completer instance. | |
604 |
|
604 | |||
605 | If unspecified, the default namespace where completions are performed |
|
605 | If unspecified, the default namespace where completions are performed | |
606 | is __main__ (technically, __main__.__dict__). Namespaces should be |
|
606 | is __main__ (technically, __main__.__dict__). Namespaces should be | |
607 | given as dictionaries. |
|
607 | given as dictionaries. | |
608 |
|
608 | |||
609 | An optional second namespace can be given. This allows the completer |
|
609 | An optional second namespace can be given. This allows the completer | |
610 | to handle cases where both the local and global scopes need to be |
|
610 | to handle cases where both the local and global scopes need to be | |
611 | distinguished. |
|
611 | distinguished. | |
612 | """ |
|
612 | """ | |
613 |
|
613 | |||
614 | # Don't bind to namespace quite yet, but flag whether the user wants a |
|
614 | # Don't bind to namespace quite yet, but flag whether the user wants a | |
615 | # specific namespace or to use __main__.__dict__. This will allow us |
|
615 | # specific namespace or to use __main__.__dict__. This will allow us | |
616 | # to bind to __main__.__dict__ at completion time, not now. |
|
616 | # to bind to __main__.__dict__ at completion time, not now. | |
617 | if namespace is None: |
|
617 | if namespace is None: | |
618 | self.use_main_ns = True |
|
618 | self.use_main_ns = True | |
619 | else: |
|
619 | else: | |
620 | self.use_main_ns = False |
|
620 | self.use_main_ns = False | |
621 | self.namespace = namespace |
|
621 | self.namespace = namespace | |
622 |
|
622 | |||
623 | # The global namespace, if given, can be bound directly |
|
623 | # The global namespace, if given, can be bound directly | |
624 | if global_namespace is None: |
|
624 | if global_namespace is None: | |
625 | self.global_namespace = {} |
|
625 | self.global_namespace = {} | |
626 | else: |
|
626 | else: | |
627 | self.global_namespace = global_namespace |
|
627 | self.global_namespace = global_namespace | |
628 |
|
628 | |||
629 | super(Completer, self).__init__(**kwargs) |
|
629 | super(Completer, self).__init__(**kwargs) | |
630 |
|
630 | |||
631 | def complete(self, text, state): |
|
631 | def complete(self, text, state): | |
632 | """Return the next possible completion for 'text'. |
|
632 | """Return the next possible completion for 'text'. | |
633 |
|
633 | |||
634 | This is called successively with state == 0, 1, 2, ... until it |
|
634 | This is called successively with state == 0, 1, 2, ... until it | |
635 | returns None. The completion should begin with 'text'. |
|
635 | returns None. The completion should begin with 'text'. | |
636 |
|
636 | |||
637 | """ |
|
637 | """ | |
638 | if self.use_main_ns: |
|
638 | if self.use_main_ns: | |
639 | self.namespace = __main__.__dict__ |
|
639 | self.namespace = __main__.__dict__ | |
640 |
|
640 | |||
641 | if state == 0: |
|
641 | if state == 0: | |
642 | if "." in text: |
|
642 | if "." in text: | |
643 | self.matches = self.attr_matches(text) |
|
643 | self.matches = self.attr_matches(text) | |
644 | else: |
|
644 | else: | |
645 | self.matches = self.global_matches(text) |
|
645 | self.matches = self.global_matches(text) | |
646 | try: |
|
646 | try: | |
647 | return self.matches[state] |
|
647 | return self.matches[state] | |
648 | except IndexError: |
|
648 | except IndexError: | |
649 | return None |
|
649 | return None | |
650 |
|
650 | |||
651 | def global_matches(self, text): |
|
651 | def global_matches(self, text): | |
652 | """Compute matches when text is a simple name. |
|
652 | """Compute matches when text is a simple name. | |
653 |
|
653 | |||
654 | Return a list of all keywords, built-in functions and names currently |
|
654 | Return a list of all keywords, built-in functions and names currently | |
655 | defined in self.namespace or self.global_namespace that match. |
|
655 | defined in self.namespace or self.global_namespace that match. | |
656 |
|
656 | |||
657 | """ |
|
657 | """ | |
658 | matches = [] |
|
658 | matches = [] | |
659 | match_append = matches.append |
|
659 | match_append = matches.append | |
660 | n = len(text) |
|
660 | n = len(text) | |
661 | for lst in [keyword.kwlist, |
|
661 | for lst in [keyword.kwlist, | |
662 | builtin_mod.__dict__.keys(), |
|
662 | builtin_mod.__dict__.keys(), | |
663 | self.namespace.keys(), |
|
663 | self.namespace.keys(), | |
664 | self.global_namespace.keys()]: |
|
664 | self.global_namespace.keys()]: | |
665 | for word in lst: |
|
665 | for word in lst: | |
666 | if word[:n] == text and word != "__builtins__": |
|
666 | if word[:n] == text and word != "__builtins__": | |
667 | match_append(word) |
|
667 | match_append(word) | |
668 |
|
668 | |||
669 | snake_case_re = re.compile(r"[^_]+(_[^_]+)+?\Z") |
|
669 | snake_case_re = re.compile(r"[^_]+(_[^_]+)+?\Z") | |
670 | for lst in [self.namespace.keys(), |
|
670 | for lst in [self.namespace.keys(), | |
671 | self.global_namespace.keys()]: |
|
671 | self.global_namespace.keys()]: | |
672 | shortened = {"_".join([sub[0] for sub in word.split('_')]) : word |
|
672 | shortened = {"_".join([sub[0] for sub in word.split('_')]) : word | |
673 | for word in lst if snake_case_re.match(word)} |
|
673 | for word in lst if snake_case_re.match(word)} | |
674 | for word in shortened.keys(): |
|
674 | for word in shortened.keys(): | |
675 | if word[:n] == text and word != "__builtins__": |
|
675 | if word[:n] == text and word != "__builtins__": | |
676 | match_append(shortened[word]) |
|
676 | match_append(shortened[word]) | |
677 | return matches |
|
677 | return matches | |
678 |
|
678 | |||
679 | def attr_matches(self, text): |
|
679 | def attr_matches(self, text): | |
680 | """Compute matches when text contains a dot. |
|
680 | """Compute matches when text contains a dot. | |
681 |
|
681 | |||
682 | Assuming the text is of the form NAME.NAME....[NAME], and is |
|
682 | Assuming the text is of the form NAME.NAME....[NAME], and is | |
683 | evaluatable in self.namespace or self.global_namespace, it will be |
|
683 | evaluatable in self.namespace or self.global_namespace, it will be | |
684 | evaluated and its attributes (as revealed by dir()) are used as |
|
684 | evaluated and its attributes (as revealed by dir()) are used as | |
685 | possible completions. (For class instances, class members are |
|
685 | possible completions. (For class instances, class members are | |
686 | also considered.) |
|
686 | also considered.) | |
687 |
|
687 | |||
688 | WARNING: this can still invoke arbitrary C code, if an object |
|
688 | WARNING: this can still invoke arbitrary C code, if an object | |
689 | with a __getattr__ hook is evaluated. |
|
689 | with a __getattr__ hook is evaluated. | |
690 |
|
690 | |||
691 | """ |
|
691 | """ | |
692 |
|
692 | |||
693 | # Another option, seems to work great. Catches things like ''.<tab> |
|
693 | # Another option, seems to work great. Catches things like ''.<tab> | |
694 | m = re.match(r"(\S+(\.\w+)*)\.(\w*)$", text) |
|
694 | m = re.match(r"(\S+(\.\w+)*)\.(\w*)$", text) | |
695 |
|
695 | |||
696 | if m: |
|
696 | if m: | |
697 | expr, attr = m.group(1, 3) |
|
697 | expr, attr = m.group(1, 3) | |
698 | elif self.greedy: |
|
698 | elif self.greedy: | |
699 | m2 = re.match(r"(.+)\.(\w*)$", self.line_buffer) |
|
699 | m2 = re.match(r"(.+)\.(\w*)$", self.line_buffer) | |
700 | if not m2: |
|
700 | if not m2: | |
701 | return [] |
|
701 | return [] | |
702 | expr, attr = m2.group(1,2) |
|
702 | expr, attr = m2.group(1,2) | |
703 | else: |
|
703 | else: | |
704 | return [] |
|
704 | return [] | |
705 |
|
705 | |||
706 | try: |
|
706 | try: | |
707 | obj = eval(expr, self.namespace) |
|
707 | obj = eval(expr, self.namespace) | |
708 | except: |
|
708 | except: | |
709 | try: |
|
709 | try: | |
710 | obj = eval(expr, self.global_namespace) |
|
710 | obj = eval(expr, self.global_namespace) | |
711 | except: |
|
711 | except: | |
712 | return [] |
|
712 | return [] | |
713 |
|
713 | |||
714 | if self.limit_to__all__ and hasattr(obj, '__all__'): |
|
714 | if self.limit_to__all__ and hasattr(obj, '__all__'): | |
715 | words = get__all__entries(obj) |
|
715 | words = get__all__entries(obj) | |
716 | else: |
|
716 | else: | |
717 | words = dir2(obj) |
|
717 | words = dir2(obj) | |
718 |
|
718 | |||
719 | try: |
|
719 | try: | |
720 | words = generics.complete_object(obj, words) |
|
720 | words = generics.complete_object(obj, words) | |
721 | except TryNext: |
|
721 | except TryNext: | |
722 | pass |
|
722 | pass | |
723 | except AssertionError: |
|
723 | except AssertionError: | |
724 | raise |
|
724 | raise | |
725 | except Exception: |
|
725 | except Exception: | |
726 | # Silence errors from completion function |
|
726 | # Silence errors from completion function | |
727 | #raise # dbg |
|
727 | #raise # dbg | |
728 | pass |
|
728 | pass | |
729 | # Build match list to return |
|
729 | # Build match list to return | |
730 | n = len(attr) |
|
730 | n = len(attr) | |
731 | return [u"%s.%s" % (expr, w) for w in words if w[:n] == attr ] |
|
731 | return [u"%s.%s" % (expr, w) for w in words if w[:n] == attr ] | |
732 |
|
732 | |||
733 |
|
733 | |||
734 | def get__all__entries(obj): |
|
734 | def get__all__entries(obj): | |
735 | """returns the strings in the __all__ attribute""" |
|
735 | """returns the strings in the __all__ attribute""" | |
736 | try: |
|
736 | try: | |
737 | words = getattr(obj, '__all__') |
|
737 | words = getattr(obj, '__all__') | |
738 | except: |
|
738 | except: | |
739 | return [] |
|
739 | return [] | |
740 |
|
740 | |||
741 | return [w for w in words if isinstance(w, str)] |
|
741 | return [w for w in words if isinstance(w, str)] | |
742 |
|
742 | |||
743 |
|
743 | |||
744 | def match_dict_keys(keys: List[str], prefix: str, delims: str): |
|
744 | def match_dict_keys(keys: List[str], prefix: str, delims: str): | |
745 | """Used by dict_key_matches, matching the prefix to a list of keys |
|
745 | """Used by dict_key_matches, matching the prefix to a list of keys | |
746 |
|
746 | |||
747 | Parameters |
|
747 | Parameters | |
748 | ========== |
|
748 | ========== | |
749 | keys: |
|
749 | keys: | |
750 | list of keys in dictionary currently being completed. |
|
750 | list of keys in dictionary currently being completed. | |
751 | prefix: |
|
751 | prefix: | |
752 | Part of the text already typed by the user. e.g. `mydict[b'fo` |
|
752 | Part of the text already typed by the user. e.g. `mydict[b'fo` | |
753 | delims: |
|
753 | delims: | |
754 | String of delimiters to consider when finding the current key. |
|
754 | String of delimiters to consider when finding the current key. | |
755 |
|
755 | |||
756 | Returns |
|
756 | Returns | |
757 | ======= |
|
757 | ======= | |
758 |
|
758 | |||
759 | A tuple of three elements: ``quote``, ``token_start``, ``matched``, with |
|
759 | A tuple of three elements: ``quote``, ``token_start``, ``matched``, with | |
760 | ``quote`` being the quote that need to be used to close current string. |
|
760 | ``quote`` being the quote that need to be used to close current string. | |
761 | ``token_start`` the position where the replacement should start occurring, |
|
761 | ``token_start`` the position where the replacement should start occurring, | |
762 | ``matches`` a list of replacement/completion |
|
762 | ``matches`` a list of replacement/completion | |
763 |
|
763 | |||
764 | """ |
|
764 | """ | |
765 | if not prefix: |
|
765 | if not prefix: | |
766 | return None, 0, [repr(k) for k in keys |
|
766 | return None, 0, [repr(k) for k in keys | |
767 | if isinstance(k, (str, bytes))] |
|
767 | if isinstance(k, (str, bytes))] | |
768 | quote_match = re.search('["\']', prefix) |
|
768 | quote_match = re.search('["\']', prefix) | |
769 | quote = quote_match.group() |
|
769 | quote = quote_match.group() | |
770 | try: |
|
770 | try: | |
771 | prefix_str = eval(prefix + quote, {}) |
|
771 | prefix_str = eval(prefix + quote, {}) | |
772 | except Exception: |
|
772 | except Exception: | |
773 | return None, 0, [] |
|
773 | return None, 0, [] | |
774 |
|
774 | |||
775 | pattern = '[^' + ''.join('\\' + c for c in delims) + ']*$' |
|
775 | pattern = '[^' + ''.join('\\' + c for c in delims) + ']*$' | |
776 | token_match = re.search(pattern, prefix, re.UNICODE) |
|
776 | token_match = re.search(pattern, prefix, re.UNICODE) | |
777 | token_start = token_match.start() |
|
777 | token_start = token_match.start() | |
778 | token_prefix = token_match.group() |
|
778 | token_prefix = token_match.group() | |
779 |
|
779 | |||
780 | matched = [] |
|
780 | matched = [] | |
781 | for key in keys: |
|
781 | for key in keys: | |
782 | try: |
|
782 | try: | |
783 | if not key.startswith(prefix_str): |
|
783 | if not key.startswith(prefix_str): | |
784 | continue |
|
784 | continue | |
785 | except (AttributeError, TypeError, UnicodeError): |
|
785 | except (AttributeError, TypeError, UnicodeError): | |
786 | # Python 3+ TypeError on b'a'.startswith('a') or vice-versa |
|
786 | # Python 3+ TypeError on b'a'.startswith('a') or vice-versa | |
787 | continue |
|
787 | continue | |
788 |
|
788 | |||
789 | # reformat remainder of key to begin with prefix |
|
789 | # reformat remainder of key to begin with prefix | |
790 | rem = key[len(prefix_str):] |
|
790 | rem = key[len(prefix_str):] | |
791 | # force repr wrapped in ' |
|
791 | # force repr wrapped in ' | |
792 | rem_repr = repr(rem + '"') if isinstance(rem, str) else repr(rem + b'"') |
|
792 | rem_repr = repr(rem + '"') if isinstance(rem, str) else repr(rem + b'"') | |
793 | if rem_repr.startswith('u') and prefix[0] not in 'uU': |
|
793 | if rem_repr.startswith('u') and prefix[0] not in 'uU': | |
794 | # Found key is unicode, but prefix is Py2 string. |
|
794 | # Found key is unicode, but prefix is Py2 string. | |
795 | # Therefore attempt to interpret key as string. |
|
795 | # Therefore attempt to interpret key as string. | |
796 | try: |
|
796 | try: | |
797 | rem_repr = repr(rem.encode('ascii') + '"') |
|
797 | rem_repr = repr(rem.encode('ascii') + '"') | |
798 | except UnicodeEncodeError: |
|
798 | except UnicodeEncodeError: | |
799 | continue |
|
799 | continue | |
800 |
|
800 | |||
801 | rem_repr = rem_repr[1 + rem_repr.index("'"):-2] |
|
801 | rem_repr = rem_repr[1 + rem_repr.index("'"):-2] | |
802 | if quote == '"': |
|
802 | if quote == '"': | |
803 | # The entered prefix is quoted with ", |
|
803 | # The entered prefix is quoted with ", | |
804 | # but the match is quoted with '. |
|
804 | # but the match is quoted with '. | |
805 | # A contained " hence needs escaping for comparison: |
|
805 | # A contained " hence needs escaping for comparison: | |
806 | rem_repr = rem_repr.replace('"', '\\"') |
|
806 | rem_repr = rem_repr.replace('"', '\\"') | |
807 |
|
807 | |||
808 | # then reinsert prefix from start of token |
|
808 | # then reinsert prefix from start of token | |
809 | matched.append('%s%s' % (token_prefix, rem_repr)) |
|
809 | matched.append('%s%s' % (token_prefix, rem_repr)) | |
810 | return quote, token_start, matched |
|
810 | return quote, token_start, matched | |
811 |
|
811 | |||
812 |
|
812 | |||
813 | def cursor_to_position(text:str, line:int, column:int)->int: |
|
813 | def cursor_to_position(text:str, line:int, column:int)->int: | |
814 | """ |
|
814 | """ | |
815 |
|
815 | |||
816 | Convert the (line,column) position of the cursor in text to an offset in a |
|
816 | Convert the (line,column) position of the cursor in text to an offset in a | |
817 | string. |
|
817 | string. | |
818 |
|
818 | |||
819 | Parameters |
|
819 | Parameters | |
820 | ---------- |
|
820 | ---------- | |
821 |
|
821 | |||
822 | text : str |
|
822 | text : str | |
823 | The text in which to calculate the cursor offset |
|
823 | The text in which to calculate the cursor offset | |
824 | line : int |
|
824 | line : int | |
825 | Line of the cursor; 0-indexed |
|
825 | Line of the cursor; 0-indexed | |
826 | column : int |
|
826 | column : int | |
827 | Column of the cursor 0-indexed |
|
827 | Column of the cursor 0-indexed | |
828 |
|
828 | |||
829 | Return |
|
829 | Return | |
830 | ------ |
|
830 | ------ | |
831 | Position of the cursor in ``text``, 0-indexed. |
|
831 | Position of the cursor in ``text``, 0-indexed. | |
832 |
|
832 | |||
833 | See Also |
|
833 | See Also | |
834 | -------- |
|
834 | -------- | |
835 | position_to_cursor: reciprocal of this function |
|
835 | position_to_cursor: reciprocal of this function | |
836 |
|
836 | |||
837 | """ |
|
837 | """ | |
838 | lines = text.split('\n') |
|
838 | lines = text.split('\n') | |
839 | assert line <= len(lines), '{} <= {}'.format(str(line), str(len(lines))) |
|
839 | assert line <= len(lines), '{} <= {}'.format(str(line), str(len(lines))) | |
840 |
|
840 | |||
841 | return sum(len(l) + 1 for l in lines[:line]) + column |
|
841 | return sum(len(l) + 1 for l in lines[:line]) + column | |
842 |
|
842 | |||
843 | def position_to_cursor(text:str, offset:int)->Tuple[int, int]: |
|
843 | def position_to_cursor(text:str, offset:int)->Tuple[int, int]: | |
844 | """ |
|
844 | """ | |
845 | Convert the position of the cursor in text (0 indexed) to a line |
|
845 | Convert the position of the cursor in text (0 indexed) to a line | |
846 | number(0-indexed) and a column number (0-indexed) pair |
|
846 | number(0-indexed) and a column number (0-indexed) pair | |
847 |
|
847 | |||
848 | Position should be a valid position in ``text``. |
|
848 | Position should be a valid position in ``text``. | |
849 |
|
849 | |||
850 | Parameters |
|
850 | Parameters | |
851 | ---------- |
|
851 | ---------- | |
852 |
|
852 | |||
853 | text : str |
|
853 | text : str | |
854 | The text in which to calculate the cursor offset |
|
854 | The text in which to calculate the cursor offset | |
855 | offset : int |
|
855 | offset : int | |
856 | Position of the cursor in ``text``, 0-indexed. |
|
856 | Position of the cursor in ``text``, 0-indexed. | |
857 |
|
857 | |||
858 | Return |
|
858 | Return | |
859 | ------ |
|
859 | ------ | |
860 | (line, column) : (int, int) |
|
860 | (line, column) : (int, int) | |
861 | Line of the cursor; 0-indexed, column of the cursor 0-indexed |
|
861 | Line of the cursor; 0-indexed, column of the cursor 0-indexed | |
862 |
|
862 | |||
863 |
|
863 | |||
864 | See Also |
|
864 | See Also | |
865 | -------- |
|
865 | -------- | |
866 | cursor_to_position : reciprocal of this function |
|
866 | cursor_to_position : reciprocal of this function | |
867 |
|
867 | |||
868 |
|
868 | |||
869 | """ |
|
869 | """ | |
870 |
|
870 | |||
871 | assert 0 <= offset <= len(text) , "0 <= %s <= %s" % (offset , len(text)) |
|
871 | assert 0 <= offset <= len(text) , "0 <= %s <= %s" % (offset , len(text)) | |
872 |
|
872 | |||
873 | before = text[:offset] |
|
873 | before = text[:offset] | |
874 | blines = before.split('\n') # ! splitnes trim trailing \n |
|
874 | blines = before.split('\n') # ! splitnes trim trailing \n | |
875 | line = before.count('\n') |
|
875 | line = before.count('\n') | |
876 | col = len(blines[-1]) |
|
876 | col = len(blines[-1]) | |
877 | return line, col |
|
877 | return line, col | |
878 |
|
878 | |||
879 |
|
879 | |||
880 | def _safe_isinstance(obj, module, class_name): |
|
880 | def _safe_isinstance(obj, module, class_name): | |
881 | """Checks if obj is an instance of module.class_name if loaded |
|
881 | """Checks if obj is an instance of module.class_name if loaded | |
882 | """ |
|
882 | """ | |
883 | return (module in sys.modules and |
|
883 | return (module in sys.modules and | |
884 | isinstance(obj, getattr(import_module(module), class_name))) |
|
884 | isinstance(obj, getattr(import_module(module), class_name))) | |
885 |
|
885 | |||
886 |
|
886 | |||
887 | def back_unicode_name_matches(text): |
|
887 | def back_unicode_name_matches(text): | |
888 | u"""Match unicode characters back to unicode name |
|
888 | u"""Match unicode characters back to unicode name | |
889 |
|
889 | |||
890 | This does ``β`` -> ``\\snowman`` |
|
890 | This does ``β`` -> ``\\snowman`` | |
891 |
|
891 | |||
892 | Note that snowman is not a valid python3 combining character but will be expanded. |
|
892 | Note that snowman is not a valid python3 combining character but will be expanded. | |
893 | Though it will not recombine back to the snowman character by the completion machinery. |
|
893 | Though it will not recombine back to the snowman character by the completion machinery. | |
894 |
|
894 | |||
895 | This will not either back-complete standard sequences like \\n, \\b ... |
|
895 | This will not either back-complete standard sequences like \\n, \\b ... | |
896 |
|
896 | |||
897 | Used on Python 3 only. |
|
897 | Used on Python 3 only. | |
898 | """ |
|
898 | """ | |
899 | if len(text)<2: |
|
899 | if len(text)<2: | |
900 | return u'', () |
|
900 | return u'', () | |
901 | maybe_slash = text[-2] |
|
901 | maybe_slash = text[-2] | |
902 | if maybe_slash != '\\': |
|
902 | if maybe_slash != '\\': | |
903 | return u'', () |
|
903 | return u'', () | |
904 |
|
904 | |||
905 | char = text[-1] |
|
905 | char = text[-1] | |
906 | # no expand on quote for completion in strings. |
|
906 | # no expand on quote for completion in strings. | |
907 | # nor backcomplete standard ascii keys |
|
907 | # nor backcomplete standard ascii keys | |
908 | if char in string.ascii_letters or char in ['"',"'"]: |
|
908 | if char in string.ascii_letters or char in ['"',"'"]: | |
909 | return u'', () |
|
909 | return u'', () | |
910 | try : |
|
910 | try : | |
911 | unic = unicodedata.name(char) |
|
911 | unic = unicodedata.name(char) | |
912 | return '\\'+char,['\\'+unic] |
|
912 | return '\\'+char,['\\'+unic] | |
913 | except KeyError: |
|
913 | except KeyError: | |
914 | pass |
|
914 | pass | |
915 | return u'', () |
|
915 | return u'', () | |
916 |
|
916 | |||
917 | def back_latex_name_matches(text:str): |
|
917 | def back_latex_name_matches(text:str): | |
918 | """Match latex characters back to unicode name |
|
918 | """Match latex characters back to unicode name | |
919 |
|
919 | |||
920 | This does ``\\β΅`` -> ``\\aleph`` |
|
920 | This does ``\\β΅`` -> ``\\aleph`` | |
921 |
|
921 | |||
922 | Used on Python 3 only. |
|
922 | Used on Python 3 only. | |
923 | """ |
|
923 | """ | |
924 | if len(text)<2: |
|
924 | if len(text)<2: | |
925 | return u'', () |
|
925 | return u'', () | |
926 | maybe_slash = text[-2] |
|
926 | maybe_slash = text[-2] | |
927 | if maybe_slash != '\\': |
|
927 | if maybe_slash != '\\': | |
928 | return u'', () |
|
928 | return u'', () | |
929 |
|
929 | |||
930 |
|
930 | |||
931 | char = text[-1] |
|
931 | char = text[-1] | |
932 | # no expand on quote for completion in strings. |
|
932 | # no expand on quote for completion in strings. | |
933 | # nor backcomplete standard ascii keys |
|
933 | # nor backcomplete standard ascii keys | |
934 | if char in string.ascii_letters or char in ['"',"'"]: |
|
934 | if char in string.ascii_letters or char in ['"',"'"]: | |
935 | return u'', () |
|
935 | return u'', () | |
936 | try : |
|
936 | try : | |
937 | latex = reverse_latex_symbol[char] |
|
937 | latex = reverse_latex_symbol[char] | |
938 | # '\\' replace the \ as well |
|
938 | # '\\' replace the \ as well | |
939 | return '\\'+char,[latex] |
|
939 | return '\\'+char,[latex] | |
940 | except KeyError: |
|
940 | except KeyError: | |
941 | pass |
|
941 | pass | |
942 | return u'', () |
|
942 | return u'', () | |
943 |
|
943 | |||
944 |
|
944 | |||
945 | def _formatparamchildren(parameter) -> str: |
|
945 | def _formatparamchildren(parameter) -> str: | |
946 | """ |
|
946 | """ | |
947 | Get parameter name and value from Jedi Private API |
|
947 | Get parameter name and value from Jedi Private API | |
948 |
|
948 | |||
949 | Jedi does not expose a simple way to get `param=value` from its API. |
|
949 | Jedi does not expose a simple way to get `param=value` from its API. | |
950 |
|
950 | |||
951 | Parameter |
|
951 | Parameter | |
952 | ========= |
|
952 | ========= | |
953 |
|
953 | |||
954 | parameter: |
|
954 | parameter: | |
955 | Jedi's function `Param` |
|
955 | Jedi's function `Param` | |
956 |
|
956 | |||
957 | Returns |
|
957 | Returns | |
958 | ======= |
|
958 | ======= | |
959 |
|
959 | |||
960 | A string like 'a', 'b=1', '*args', '**kwargs' |
|
960 | A string like 'a', 'b=1', '*args', '**kwargs' | |
961 |
|
961 | |||
962 |
|
962 | |||
963 | """ |
|
963 | """ | |
964 | description = parameter.description |
|
964 | description = parameter.description | |
965 | if not description.startswith('param '): |
|
965 | if not description.startswith('param '): | |
966 | raise ValueError('Jedi function parameter description have change format.' |
|
966 | raise ValueError('Jedi function parameter description have change format.' | |
967 | 'Expected "param ...", found %r".' % description) |
|
967 | 'Expected "param ...", found %r".' % description) | |
968 | return description[6:] |
|
968 | return description[6:] | |
969 |
|
969 | |||
970 | def _make_signature(completion)-> str: |
|
970 | def _make_signature(completion)-> str: | |
971 | """ |
|
971 | """ | |
972 | Make the signature from a jedi completion |
|
972 | Make the signature from a jedi completion | |
973 |
|
973 | |||
974 | Parameter |
|
974 | Parameter | |
975 | ========= |
|
975 | ========= | |
976 |
|
976 | |||
977 | completion: jedi.Completion |
|
977 | completion: jedi.Completion | |
978 | object does not complete a function type |
|
978 | object does not complete a function type | |
979 |
|
979 | |||
980 | Returns |
|
980 | Returns | |
981 | ======= |
|
981 | ======= | |
982 |
|
982 | |||
983 | a string consisting of the function signature, with the parenthesis but |
|
983 | a string consisting of the function signature, with the parenthesis but | |
984 | without the function name. example: |
|
984 | without the function name. example: | |
985 | `(a, *args, b=1, **kwargs)` |
|
985 | `(a, *args, b=1, **kwargs)` | |
986 |
|
986 | |||
987 | """ |
|
987 | """ | |
988 |
|
988 | |||
989 | return '(%s)'% ', '.join([f for f in (_formatparamchildren(p) for p in completion.params) if f]) |
|
989 | return '(%s)'% ', '.join([f for f in (_formatparamchildren(p) for p in completion.params) if f]) | |
990 |
|
990 | |||
991 | class IPCompleter(Completer): |
|
991 | class IPCompleter(Completer): | |
992 | """Extension of the completer class with IPython-specific features""" |
|
992 | """Extension of the completer class with IPython-specific features""" | |
993 |
|
993 | |||
994 | _names = None |
|
994 | _names = None | |
995 |
|
995 | |||
996 | @observe('greedy') |
|
996 | @observe('greedy') | |
997 | def _greedy_changed(self, change): |
|
997 | def _greedy_changed(self, change): | |
998 | """update the splitter and readline delims when greedy is changed""" |
|
998 | """update the splitter and readline delims when greedy is changed""" | |
999 | if change['new']: |
|
999 | if change['new']: | |
1000 | self.splitter.delims = GREEDY_DELIMS |
|
1000 | self.splitter.delims = GREEDY_DELIMS | |
1001 | else: |
|
1001 | else: | |
1002 | self.splitter.delims = DELIMS |
|
1002 | self.splitter.delims = DELIMS | |
1003 |
|
1003 | |||
1004 | dict_keys_only = Bool(False, |
|
1004 | dict_keys_only = Bool(False, | |
1005 | help="""Whether to show dict key matches only""") |
|
1005 | help="""Whether to show dict key matches only""") | |
1006 |
|
1006 | |||
1007 | merge_completions = Bool(True, |
|
1007 | merge_completions = Bool(True, | |
1008 | help="""Whether to merge completion results into a single list |
|
1008 | help="""Whether to merge completion results into a single list | |
1009 |
|
1009 | |||
1010 | If False, only the completion results from the first non-empty |
|
1010 | If False, only the completion results from the first non-empty | |
1011 | completer will be returned. |
|
1011 | completer will be returned. | |
1012 | """ |
|
1012 | """ | |
1013 | ).tag(config=True) |
|
1013 | ).tag(config=True) | |
1014 | omit__names = Enum((0,1,2), default_value=2, |
|
1014 | omit__names = Enum((0,1,2), default_value=2, | |
1015 | help="""Instruct the completer to omit private method names |
|
1015 | help="""Instruct the completer to omit private method names | |
1016 |
|
1016 | |||
1017 | Specifically, when completing on ``object.<tab>``. |
|
1017 | Specifically, when completing on ``object.<tab>``. | |
1018 |
|
1018 | |||
1019 | When 2 [default]: all names that start with '_' will be excluded. |
|
1019 | When 2 [default]: all names that start with '_' will be excluded. | |
1020 |
|
1020 | |||
1021 | When 1: all 'magic' names (``__foo__``) will be excluded. |
|
1021 | When 1: all 'magic' names (``__foo__``) will be excluded. | |
1022 |
|
1022 | |||
1023 | When 0: nothing will be excluded. |
|
1023 | When 0: nothing will be excluded. | |
1024 | """ |
|
1024 | """ | |
1025 | ).tag(config=True) |
|
1025 | ).tag(config=True) | |
1026 | limit_to__all__ = Bool(False, |
|
1026 | limit_to__all__ = Bool(False, | |
1027 | help=""" |
|
1027 | help=""" | |
1028 | DEPRECATED as of version 5.0. |
|
1028 | DEPRECATED as of version 5.0. | |
1029 |
|
1029 | |||
1030 | Instruct the completer to use __all__ for the completion |
|
1030 | Instruct the completer to use __all__ for the completion | |
1031 |
|
1031 | |||
1032 | Specifically, when completing on ``object.<tab>``. |
|
1032 | Specifically, when completing on ``object.<tab>``. | |
1033 |
|
1033 | |||
1034 | When True: only those names in obj.__all__ will be included. |
|
1034 | When True: only those names in obj.__all__ will be included. | |
1035 |
|
1035 | |||
1036 | When False [default]: the __all__ attribute is ignored |
|
1036 | When False [default]: the __all__ attribute is ignored | |
1037 | """, |
|
1037 | """, | |
1038 | ).tag(config=True) |
|
1038 | ).tag(config=True) | |
1039 |
|
1039 | |||
1040 | @observe('limit_to__all__') |
|
1040 | @observe('limit_to__all__') | |
1041 | def _limit_to_all_changed(self, change): |
|
1041 | def _limit_to_all_changed(self, change): | |
1042 | warnings.warn('`IPython.core.IPCompleter.limit_to__all__` configuration ' |
|
1042 | warnings.warn('`IPython.core.IPCompleter.limit_to__all__` configuration ' | |
1043 | 'value has been deprecated since IPython 5.0, will be made to have ' |
|
1043 | 'value has been deprecated since IPython 5.0, will be made to have ' | |
1044 | 'no effects and then removed in future version of IPython.', |
|
1044 | 'no effects and then removed in future version of IPython.', | |
1045 | UserWarning) |
|
1045 | UserWarning) | |
1046 |
|
1046 | |||
1047 | def __init__(self, shell=None, namespace=None, global_namespace=None, |
|
1047 | def __init__(self, shell=None, namespace=None, global_namespace=None, | |
1048 | use_readline=_deprecation_readline_sentinel, config=None, **kwargs): |
|
1048 | use_readline=_deprecation_readline_sentinel, config=None, **kwargs): | |
1049 | """IPCompleter() -> completer |
|
1049 | """IPCompleter() -> completer | |
1050 |
|
1050 | |||
1051 | Return a completer object. |
|
1051 | Return a completer object. | |
1052 |
|
1052 | |||
1053 | Parameters |
|
1053 | Parameters | |
1054 | ---------- |
|
1054 | ---------- | |
1055 |
|
1055 | |||
1056 | shell |
|
1056 | shell | |
1057 | a pointer to the ipython shell itself. This is needed |
|
1057 | a pointer to the ipython shell itself. This is needed | |
1058 | because this completer knows about magic functions, and those can |
|
1058 | because this completer knows about magic functions, and those can | |
1059 | only be accessed via the ipython instance. |
|
1059 | only be accessed via the ipython instance. | |
1060 |
|
1060 | |||
1061 | namespace : dict, optional |
|
1061 | namespace : dict, optional | |
1062 | an optional dict where completions are performed. |
|
1062 | an optional dict where completions are performed. | |
1063 |
|
1063 | |||
1064 | global_namespace : dict, optional |
|
1064 | global_namespace : dict, optional | |
1065 | secondary optional dict for completions, to |
|
1065 | secondary optional dict for completions, to | |
1066 | handle cases (such as IPython embedded inside functions) where |
|
1066 | handle cases (such as IPython embedded inside functions) where | |
1067 | both Python scopes are visible. |
|
1067 | both Python scopes are visible. | |
1068 |
|
1068 | |||
1069 | use_readline : bool, optional |
|
1069 | use_readline : bool, optional | |
1070 | DEPRECATED, ignored since IPython 6.0, will have no effects |
|
1070 | DEPRECATED, ignored since IPython 6.0, will have no effects | |
1071 | """ |
|
1071 | """ | |
1072 |
|
1072 | |||
1073 | self.magic_escape = ESC_MAGIC |
|
1073 | self.magic_escape = ESC_MAGIC | |
1074 | self.splitter = CompletionSplitter() |
|
1074 | self.splitter = CompletionSplitter() | |
1075 |
|
1075 | |||
1076 | if use_readline is not _deprecation_readline_sentinel: |
|
1076 | if use_readline is not _deprecation_readline_sentinel: | |
1077 | warnings.warn('The `use_readline` parameter is deprecated and ignored since IPython 6.0.', |
|
1077 | warnings.warn('The `use_readline` parameter is deprecated and ignored since IPython 6.0.', | |
1078 | DeprecationWarning, stacklevel=2) |
|
1078 | DeprecationWarning, stacklevel=2) | |
1079 |
|
1079 | |||
1080 | # _greedy_changed() depends on splitter and readline being defined: |
|
1080 | # _greedy_changed() depends on splitter and readline being defined: | |
1081 | Completer.__init__(self, namespace=namespace, global_namespace=global_namespace, |
|
1081 | Completer.__init__(self, namespace=namespace, global_namespace=global_namespace, | |
1082 | config=config, **kwargs) |
|
1082 | config=config, **kwargs) | |
1083 |
|
1083 | |||
1084 | # List where completion matches will be stored |
|
1084 | # List where completion matches will be stored | |
1085 | self.matches = [] |
|
1085 | self.matches = [] | |
1086 | self.shell = shell |
|
1086 | self.shell = shell | |
1087 | # Regexp to split filenames with spaces in them |
|
1087 | # Regexp to split filenames with spaces in them | |
1088 | self.space_name_re = re.compile(r'([^\\] )') |
|
1088 | self.space_name_re = re.compile(r'([^\\] )') | |
1089 | # Hold a local ref. to glob.glob for speed |
|
1089 | # Hold a local ref. to glob.glob for speed | |
1090 | self.glob = glob.glob |
|
1090 | self.glob = glob.glob | |
1091 |
|
1091 | |||
1092 | # Determine if we are running on 'dumb' terminals, like (X)Emacs |
|
1092 | # Determine if we are running on 'dumb' terminals, like (X)Emacs | |
1093 | # buffers, to avoid completion problems. |
|
1093 | # buffers, to avoid completion problems. | |
1094 | term = os.environ.get('TERM','xterm') |
|
1094 | term = os.environ.get('TERM','xterm') | |
1095 | self.dumb_terminal = term in ['dumb','emacs'] |
|
1095 | self.dumb_terminal = term in ['dumb','emacs'] | |
1096 |
|
1096 | |||
1097 | # Special handling of backslashes needed in win32 platforms |
|
1097 | # Special handling of backslashes needed in win32 platforms | |
1098 | if sys.platform == "win32": |
|
1098 | if sys.platform == "win32": | |
1099 | self.clean_glob = self._clean_glob_win32 |
|
1099 | self.clean_glob = self._clean_glob_win32 | |
1100 | else: |
|
1100 | else: | |
1101 | self.clean_glob = self._clean_glob |
|
1101 | self.clean_glob = self._clean_glob | |
1102 |
|
1102 | |||
1103 | #regexp to parse docstring for function signature |
|
1103 | #regexp to parse docstring for function signature | |
1104 | self.docstring_sig_re = re.compile(r'^[\w|\s.]+\(([^)]*)\).*') |
|
1104 | self.docstring_sig_re = re.compile(r'^[\w|\s.]+\(([^)]*)\).*') | |
1105 | self.docstring_kwd_re = re.compile(r'[\s|\[]*(\w+)(?:\s*=\s*.*)') |
|
1105 | self.docstring_kwd_re = re.compile(r'[\s|\[]*(\w+)(?:\s*=\s*.*)') | |
1106 | #use this if positional argument name is also needed |
|
1106 | #use this if positional argument name is also needed | |
1107 | #= re.compile(r'[\s|\[]*(\w+)(?:\s*=?\s*.*)') |
|
1107 | #= re.compile(r'[\s|\[]*(\w+)(?:\s*=?\s*.*)') | |
1108 |
|
1108 | |||
1109 | self.magic_arg_matchers = [ |
|
1109 | self.magic_arg_matchers = [ | |
1110 | self.magic_config_matches, |
|
1110 | self.magic_config_matches, | |
1111 | self.magic_color_matches, |
|
1111 | self.magic_color_matches, | |
1112 | ] |
|
1112 | ] | |
1113 |
|
1113 | |||
1114 | # This is set externally by InteractiveShell |
|
1114 | # This is set externally by InteractiveShell | |
1115 | self.custom_completers = None |
|
1115 | self.custom_completers = None | |
1116 |
|
1116 | |||
1117 | @property |
|
1117 | @property | |
1118 | def matchers(self): |
|
1118 | def matchers(self): | |
1119 | """All active matcher routines for completion""" |
|
1119 | """All active matcher routines for completion""" | |
1120 | if self.dict_keys_only: |
|
1120 | if self.dict_keys_only: | |
1121 | return [self.dict_key_matches] |
|
1121 | return [self.dict_key_matches] | |
1122 |
|
1122 | |||
1123 | if self.use_jedi: |
|
1123 | if self.use_jedi: | |
1124 | return [ |
|
1124 | return [ | |
1125 | self.file_matches, |
|
1125 | self.file_matches, | |
1126 | self.magic_matches, |
|
1126 | self.magic_matches, | |
1127 | self.dict_key_matches, |
|
1127 | self.dict_key_matches, | |
1128 | ] |
|
1128 | ] | |
1129 | else: |
|
1129 | else: | |
1130 | return [ |
|
1130 | return [ | |
1131 | self.python_matches, |
|
1131 | self.python_matches, | |
1132 | self.file_matches, |
|
1132 | self.file_matches, | |
1133 | self.magic_matches, |
|
1133 | self.magic_matches, | |
1134 | self.python_func_kw_matches, |
|
1134 | self.python_func_kw_matches, | |
1135 | self.dict_key_matches, |
|
1135 | self.dict_key_matches, | |
1136 | ] |
|
1136 | ] | |
1137 |
|
1137 | |||
1138 | def all_completions(self, text) -> List[str]: |
|
1138 | def all_completions(self, text) -> List[str]: | |
1139 | """ |
|
1139 | """ | |
1140 | Wrapper around the completion methods for the benefit of emacs. |
|
1140 | Wrapper around the completion methods for the benefit of emacs. | |
1141 | """ |
|
1141 | """ | |
1142 | prefix = text.rpartition('.')[0] |
|
1142 | prefix = text.rpartition('.')[0] | |
1143 | with provisionalcompleter(): |
|
1143 | with provisionalcompleter(): | |
1144 | return ['.'.join([prefix, c.text]) if prefix and self.use_jedi else c.text |
|
1144 | return ['.'.join([prefix, c.text]) if prefix and self.use_jedi else c.text | |
1145 | for c in self.completions(text, len(text))] |
|
1145 | for c in self.completions(text, len(text))] | |
1146 |
|
1146 | |||
1147 | return self.complete(text)[1] |
|
1147 | return self.complete(text)[1] | |
1148 |
|
1148 | |||
1149 | def _clean_glob(self, text): |
|
1149 | def _clean_glob(self, text): | |
1150 | return self.glob("%s*" % text) |
|
1150 | return self.glob("%s*" % text) | |
1151 |
|
1151 | |||
1152 | def _clean_glob_win32(self,text): |
|
1152 | def _clean_glob_win32(self,text): | |
1153 | return [f.replace("\\","/") |
|
1153 | return [f.replace("\\","/") | |
1154 | for f in self.glob("%s*" % text)] |
|
1154 | for f in self.glob("%s*" % text)] | |
1155 |
|
1155 | |||
1156 | def file_matches(self, text): |
|
1156 | def file_matches(self, text): | |
1157 | """Match filenames, expanding ~USER type strings. |
|
1157 | """Match filenames, expanding ~USER type strings. | |
1158 |
|
1158 | |||
1159 | Most of the seemingly convoluted logic in this completer is an |
|
1159 | Most of the seemingly convoluted logic in this completer is an | |
1160 | attempt to handle filenames with spaces in them. And yet it's not |
|
1160 | attempt to handle filenames with spaces in them. And yet it's not | |
1161 | quite perfect, because Python's readline doesn't expose all of the |
|
1161 | quite perfect, because Python's readline doesn't expose all of the | |
1162 | GNU readline details needed for this to be done correctly. |
|
1162 | GNU readline details needed for this to be done correctly. | |
1163 |
|
1163 | |||
1164 | For a filename with a space in it, the printed completions will be |
|
1164 | For a filename with a space in it, the printed completions will be | |
1165 | only the parts after what's already been typed (instead of the |
|
1165 | only the parts after what's already been typed (instead of the | |
1166 | full completions, as is normally done). I don't think with the |
|
1166 | full completions, as is normally done). I don't think with the | |
1167 | current (as of Python 2.3) Python readline it's possible to do |
|
1167 | current (as of Python 2.3) Python readline it's possible to do | |
1168 | better.""" |
|
1168 | better.""" | |
1169 |
|
1169 | |||
1170 | # chars that require escaping with backslash - i.e. chars |
|
1170 | # chars that require escaping with backslash - i.e. chars | |
1171 | # that readline treats incorrectly as delimiters, but we |
|
1171 | # that readline treats incorrectly as delimiters, but we | |
1172 | # don't want to treat as delimiters in filename matching |
|
1172 | # don't want to treat as delimiters in filename matching | |
1173 | # when escaped with backslash |
|
1173 | # when escaped with backslash | |
1174 | if text.startswith('!'): |
|
1174 | if text.startswith('!'): | |
1175 | text = text[1:] |
|
1175 | text = text[1:] | |
1176 | text_prefix = u'!' |
|
1176 | text_prefix = u'!' | |
1177 | else: |
|
1177 | else: | |
1178 | text_prefix = u'' |
|
1178 | text_prefix = u'' | |
1179 |
|
1179 | |||
1180 | text_until_cursor = self.text_until_cursor |
|
1180 | text_until_cursor = self.text_until_cursor | |
1181 | # track strings with open quotes |
|
1181 | # track strings with open quotes | |
1182 | open_quotes = has_open_quotes(text_until_cursor) |
|
1182 | open_quotes = has_open_quotes(text_until_cursor) | |
1183 |
|
1183 | |||
1184 | if '(' in text_until_cursor or '[' in text_until_cursor: |
|
1184 | if '(' in text_until_cursor or '[' in text_until_cursor: | |
1185 | lsplit = text |
|
1185 | lsplit = text | |
1186 | else: |
|
1186 | else: | |
1187 | try: |
|
1187 | try: | |
1188 | # arg_split ~ shlex.split, but with unicode bugs fixed by us |
|
1188 | # arg_split ~ shlex.split, but with unicode bugs fixed by us | |
1189 | lsplit = arg_split(text_until_cursor)[-1] |
|
1189 | lsplit = arg_split(text_until_cursor)[-1] | |
1190 | except ValueError: |
|
1190 | except ValueError: | |
1191 | # typically an unmatched ", or backslash without escaped char. |
|
1191 | # typically an unmatched ", or backslash without escaped char. | |
1192 | if open_quotes: |
|
1192 | if open_quotes: | |
1193 | lsplit = text_until_cursor.split(open_quotes)[-1] |
|
1193 | lsplit = text_until_cursor.split(open_quotes)[-1] | |
1194 | else: |
|
1194 | else: | |
1195 | return [] |
|
1195 | return [] | |
1196 | except IndexError: |
|
1196 | except IndexError: | |
1197 | # tab pressed on empty line |
|
1197 | # tab pressed on empty line | |
1198 | lsplit = "" |
|
1198 | lsplit = "" | |
1199 |
|
1199 | |||
1200 | if not open_quotes and lsplit != protect_filename(lsplit): |
|
1200 | if not open_quotes and lsplit != protect_filename(lsplit): | |
1201 | # if protectables are found, do matching on the whole escaped name |
|
1201 | # if protectables are found, do matching on the whole escaped name | |
1202 | has_protectables = True |
|
1202 | has_protectables = True | |
1203 | text0,text = text,lsplit |
|
1203 | text0,text = text,lsplit | |
1204 | else: |
|
1204 | else: | |
1205 | has_protectables = False |
|
1205 | has_protectables = False | |
1206 | text = os.path.expanduser(text) |
|
1206 | text = os.path.expanduser(text) | |
1207 |
|
1207 | |||
1208 | if text == "": |
|
1208 | if text == "": | |
1209 | return [text_prefix + protect_filename(f) for f in self.glob("*")] |
|
1209 | return [text_prefix + protect_filename(f) for f in self.glob("*")] | |
1210 |
|
1210 | |||
1211 | # Compute the matches from the filesystem |
|
1211 | # Compute the matches from the filesystem | |
1212 | if sys.platform == 'win32': |
|
1212 | if sys.platform == 'win32': | |
1213 | m0 = self.clean_glob(text) |
|
1213 | m0 = self.clean_glob(text) | |
1214 | else: |
|
1214 | else: | |
1215 | m0 = self.clean_glob(text.replace('\\', '')) |
|
1215 | m0 = self.clean_glob(text.replace('\\', '')) | |
1216 |
|
1216 | |||
1217 | if has_protectables: |
|
1217 | if has_protectables: | |
1218 | # If we had protectables, we need to revert our changes to the |
|
1218 | # If we had protectables, we need to revert our changes to the | |
1219 | # beginning of filename so that we don't double-write the part |
|
1219 | # beginning of filename so that we don't double-write the part | |
1220 | # of the filename we have so far |
|
1220 | # of the filename we have so far | |
1221 | len_lsplit = len(lsplit) |
|
1221 | len_lsplit = len(lsplit) | |
1222 | matches = [text_prefix + text0 + |
|
1222 | matches = [text_prefix + text0 + | |
1223 | protect_filename(f[len_lsplit:]) for f in m0] |
|
1223 | protect_filename(f[len_lsplit:]) for f in m0] | |
1224 | else: |
|
1224 | else: | |
1225 | if open_quotes: |
|
1225 | if open_quotes: | |
1226 | # if we have a string with an open quote, we don't need to |
|
1226 | # if we have a string with an open quote, we don't need to | |
1227 | # protect the names beyond the quote (and we _shouldn't_, as |
|
1227 | # protect the names beyond the quote (and we _shouldn't_, as | |
1228 | # it would cause bugs when the filesystem call is made). |
|
1228 | # it would cause bugs when the filesystem call is made). | |
1229 | matches = m0 if sys.platform == "win32" else\ |
|
1229 | matches = m0 if sys.platform == "win32" else\ | |
1230 | [protect_filename(f, open_quotes) for f in m0] |
|
1230 | [protect_filename(f, open_quotes) for f in m0] | |
1231 | else: |
|
1231 | else: | |
1232 | matches = [text_prefix + |
|
1232 | matches = [text_prefix + | |
1233 | protect_filename(f) for f in m0] |
|
1233 | protect_filename(f) for f in m0] | |
1234 |
|
1234 | |||
1235 | # Mark directories in input list by appending '/' to their names. |
|
1235 | # Mark directories in input list by appending '/' to their names. | |
1236 | return [x+'/' if os.path.isdir(x) else x for x in matches] |
|
1236 | return [x+'/' if os.path.isdir(x) else x for x in matches] | |
1237 |
|
1237 | |||
1238 | def magic_matches(self, text): |
|
1238 | def magic_matches(self, text): | |
1239 | """Match magics""" |
|
1239 | """Match magics""" | |
1240 | # Get all shell magics now rather than statically, so magics loaded at |
|
1240 | # Get all shell magics now rather than statically, so magics loaded at | |
1241 | # runtime show up too. |
|
1241 | # runtime show up too. | |
1242 | lsm = self.shell.magics_manager.lsmagic() |
|
1242 | lsm = self.shell.magics_manager.lsmagic() | |
1243 | line_magics = lsm['line'] |
|
1243 | line_magics = lsm['line'] | |
1244 | cell_magics = lsm['cell'] |
|
1244 | cell_magics = lsm['cell'] | |
1245 | pre = self.magic_escape |
|
1245 | pre = self.magic_escape | |
1246 | pre2 = pre+pre |
|
1246 | pre2 = pre+pre | |
1247 |
|
1247 | |||
1248 | explicit_magic = text.startswith(pre) |
|
1248 | explicit_magic = text.startswith(pre) | |
1249 |
|
1249 | |||
1250 | # Completion logic: |
|
1250 | # Completion logic: | |
1251 | # - user gives %%: only do cell magics |
|
1251 | # - user gives %%: only do cell magics | |
1252 | # - user gives %: do both line and cell magics |
|
1252 | # - user gives %: do both line and cell magics | |
1253 | # - no prefix: do both |
|
1253 | # - no prefix: do both | |
1254 | # In other words, line magics are skipped if the user gives %% explicitly |
|
1254 | # In other words, line magics are skipped if the user gives %% explicitly | |
1255 | # |
|
1255 | # | |
1256 | # We also exclude magics that match any currently visible names: |
|
1256 | # We also exclude magics that match any currently visible names: | |
1257 | # https://github.com/ipython/ipython/issues/4877, unless the user has |
|
1257 | # https://github.com/ipython/ipython/issues/4877, unless the user has | |
1258 | # typed a %: |
|
1258 | # typed a %: | |
1259 | # https://github.com/ipython/ipython/issues/10754 |
|
1259 | # https://github.com/ipython/ipython/issues/10754 | |
1260 | bare_text = text.lstrip(pre) |
|
1260 | bare_text = text.lstrip(pre) | |
1261 | global_matches = self.global_matches(bare_text) |
|
1261 | global_matches = self.global_matches(bare_text) | |
1262 | if not explicit_magic: |
|
1262 | if not explicit_magic: | |
1263 | def matches(magic): |
|
1263 | def matches(magic): | |
1264 | """ |
|
1264 | """ | |
1265 | Filter magics, in particular remove magics that match |
|
1265 | Filter magics, in particular remove magics that match | |
1266 | a name present in global namespace. |
|
1266 | a name present in global namespace. | |
1267 | """ |
|
1267 | """ | |
1268 | return ( magic.startswith(bare_text) and |
|
1268 | return ( magic.startswith(bare_text) and | |
1269 | magic not in global_matches ) |
|
1269 | magic not in global_matches ) | |
1270 | else: |
|
1270 | else: | |
1271 | def matches(magic): |
|
1271 | def matches(magic): | |
1272 | return magic.startswith(bare_text) |
|
1272 | return magic.startswith(bare_text) | |
1273 |
|
1273 | |||
1274 | comp = [ pre2+m for m in cell_magics if matches(m)] |
|
1274 | comp = [ pre2+m for m in cell_magics if matches(m)] | |
1275 | if not text.startswith(pre2): |
|
1275 | if not text.startswith(pre2): | |
1276 | comp += [ pre+m for m in line_magics if matches(m)] |
|
1276 | comp += [ pre+m for m in line_magics if matches(m)] | |
1277 |
|
1277 | |||
1278 | return comp |
|
1278 | return comp | |
1279 |
|
1279 | |||
1280 | def magic_config_matches(self, text:str) -> List[str]: |
|
1280 | def magic_config_matches(self, text:str) -> List[str]: | |
1281 | """ Match class names and attributes for %config magic """ |
|
1281 | """ Match class names and attributes for %config magic """ | |
1282 | texts = text.strip().split() |
|
1282 | texts = text.strip().split() | |
1283 |
|
1283 | |||
1284 | if len(texts) > 0 and (texts[0] == 'config' or texts[0] == '%config'): |
|
1284 | if len(texts) > 0 and (texts[0] == 'config' or texts[0] == '%config'): | |
1285 | # get all configuration classes |
|
1285 | # get all configuration classes | |
1286 | classes = sorted(set([ c for c in self.shell.configurables |
|
1286 | classes = sorted(set([ c for c in self.shell.configurables | |
1287 | if c.__class__.class_traits(config=True) |
|
1287 | if c.__class__.class_traits(config=True) | |
1288 | ]), key=lambda x: x.__class__.__name__) |
|
1288 | ]), key=lambda x: x.__class__.__name__) | |
1289 | classnames = [ c.__class__.__name__ for c in classes ] |
|
1289 | classnames = [ c.__class__.__name__ for c in classes ] | |
1290 |
|
1290 | |||
1291 | # return all classnames if config or %config is given |
|
1291 | # return all classnames if config or %config is given | |
1292 | if len(texts) == 1: |
|
1292 | if len(texts) == 1: | |
1293 | return classnames |
|
1293 | return classnames | |
1294 |
|
1294 | |||
1295 | # match classname |
|
1295 | # match classname | |
1296 | classname_texts = texts[1].split('.') |
|
1296 | classname_texts = texts[1].split('.') | |
1297 | classname = classname_texts[0] |
|
1297 | classname = classname_texts[0] | |
1298 | classname_matches = [ c for c in classnames |
|
1298 | classname_matches = [ c for c in classnames | |
1299 | if c.startswith(classname) ] |
|
1299 | if c.startswith(classname) ] | |
1300 |
|
1300 | |||
1301 | # return matched classes or the matched class with attributes |
|
1301 | # return matched classes or the matched class with attributes | |
1302 | if texts[1].find('.') < 0: |
|
1302 | if texts[1].find('.') < 0: | |
1303 | return classname_matches |
|
1303 | return classname_matches | |
1304 | elif len(classname_matches) == 1 and \ |
|
1304 | elif len(classname_matches) == 1 and \ | |
1305 | classname_matches[0] == classname: |
|
1305 | classname_matches[0] == classname: | |
1306 | cls = classes[classnames.index(classname)].__class__ |
|
1306 | cls = classes[classnames.index(classname)].__class__ | |
1307 | help = cls.class_get_help() |
|
1307 | help = cls.class_get_help() | |
1308 | # strip leading '--' from cl-args: |
|
1308 | # strip leading '--' from cl-args: | |
1309 | help = re.sub(re.compile(r'^--', re.MULTILINE), '', help) |
|
1309 | help = re.sub(re.compile(r'^--', re.MULTILINE), '', help) | |
1310 | return [ attr.split('=')[0] |
|
1310 | return [ attr.split('=')[0] | |
1311 | for attr in help.strip().splitlines() |
|
1311 | for attr in help.strip().splitlines() | |
1312 | if attr.startswith(texts[1]) ] |
|
1312 | if attr.startswith(texts[1]) ] | |
1313 | return [] |
|
1313 | return [] | |
1314 |
|
1314 | |||
1315 | def magic_color_matches(self, text:str) -> List[str] : |
|
1315 | def magic_color_matches(self, text:str) -> List[str] : | |
1316 | """ Match color schemes for %colors magic""" |
|
1316 | """ Match color schemes for %colors magic""" | |
1317 | texts = text.split() |
|
1317 | texts = text.split() | |
1318 | if text.endswith(' '): |
|
1318 | if text.endswith(' '): | |
1319 | # .split() strips off the trailing whitespace. Add '' back |
|
1319 | # .split() strips off the trailing whitespace. Add '' back | |
1320 | # so that: '%colors ' -> ['%colors', ''] |
|
1320 | # so that: '%colors ' -> ['%colors', ''] | |
1321 | texts.append('') |
|
1321 | texts.append('') | |
1322 |
|
1322 | |||
1323 | if len(texts) == 2 and (texts[0] == 'colors' or texts[0] == '%colors'): |
|
1323 | if len(texts) == 2 and (texts[0] == 'colors' or texts[0] == '%colors'): | |
1324 | prefix = texts[1] |
|
1324 | prefix = texts[1] | |
1325 | return [ color for color in InspectColors.keys() |
|
1325 | return [ color for color in InspectColors.keys() | |
1326 | if color.startswith(prefix) ] |
|
1326 | if color.startswith(prefix) ] | |
1327 | return [] |
|
1327 | return [] | |
1328 |
|
1328 | |||
1329 | def _jedi_matches(self, cursor_column:int, cursor_line:int, text:str): |
|
1329 | def _jedi_matches(self, cursor_column:int, cursor_line:int, text:str): | |
1330 | """ |
|
1330 | """ | |
1331 |
|
1331 | |||
1332 | Return a list of :any:`jedi.api.Completions` object from a ``text`` and |
|
1332 | Return a list of :any:`jedi.api.Completions` object from a ``text`` and | |
1333 | cursor position. |
|
1333 | cursor position. | |
1334 |
|
1334 | |||
1335 | Parameters |
|
1335 | Parameters | |
1336 | ---------- |
|
1336 | ---------- | |
1337 | cursor_column : int |
|
1337 | cursor_column : int | |
1338 | column position of the cursor in ``text``, 0-indexed. |
|
1338 | column position of the cursor in ``text``, 0-indexed. | |
1339 | cursor_line : int |
|
1339 | cursor_line : int | |
1340 | line position of the cursor in ``text``, 0-indexed |
|
1340 | line position of the cursor in ``text``, 0-indexed | |
1341 | text : str |
|
1341 | text : str | |
1342 | text to complete |
|
1342 | text to complete | |
1343 |
|
1343 | |||
1344 | Debugging |
|
1344 | Debugging | |
1345 | --------- |
|
1345 | --------- | |
1346 |
|
1346 | |||
1347 | If ``IPCompleter.debug`` is ``True`` may return a :any:`_FakeJediCompletion` |
|
1347 | If ``IPCompleter.debug`` is ``True`` may return a :any:`_FakeJediCompletion` | |
1348 | object containing a string with the Jedi debug information attached. |
|
1348 | object containing a string with the Jedi debug information attached. | |
1349 | """ |
|
1349 | """ | |
1350 | namespaces = [self.namespace] |
|
1350 | namespaces = [self.namespace] | |
1351 | if self.global_namespace is not None: |
|
1351 | if self.global_namespace is not None: | |
1352 | namespaces.append(self.global_namespace) |
|
1352 | namespaces.append(self.global_namespace) | |
1353 |
|
1353 | |||
1354 | completion_filter = lambda x:x |
|
1354 | completion_filter = lambda x:x | |
1355 | offset = cursor_to_position(text, cursor_line, cursor_column) |
|
1355 | offset = cursor_to_position(text, cursor_line, cursor_column) | |
1356 | # filter output if we are completing for object members |
|
1356 | # filter output if we are completing for object members | |
1357 | if offset: |
|
1357 | if offset: | |
1358 | pre = text[offset-1] |
|
1358 | pre = text[offset-1] | |
1359 | if pre == '.': |
|
1359 | if pre == '.': | |
1360 | if self.omit__names == 2: |
|
1360 | if self.omit__names == 2: | |
1361 | completion_filter = lambda c:not c.name.startswith('_') |
|
1361 | completion_filter = lambda c:not c.name.startswith('_') | |
1362 | elif self.omit__names == 1: |
|
1362 | elif self.omit__names == 1: | |
1363 | completion_filter = lambda c:not (c.name.startswith('__') and c.name.endswith('__')) |
|
1363 | completion_filter = lambda c:not (c.name.startswith('__') and c.name.endswith('__')) | |
1364 | elif self.omit__names == 0: |
|
1364 | elif self.omit__names == 0: | |
1365 | completion_filter = lambda x:x |
|
1365 | completion_filter = lambda x:x | |
1366 | else: |
|
1366 | else: | |
1367 | raise ValueError("Don't understand self.omit__names == {}".format(self.omit__names)) |
|
1367 | raise ValueError("Don't understand self.omit__names == {}".format(self.omit__names)) | |
1368 |
|
1368 | |||
1369 | interpreter = jedi.Interpreter( |
|
1369 | interpreter = jedi.Interpreter( | |
1370 | text[:offset], namespaces, column=cursor_column, line=cursor_line + 1) |
|
1370 | text[:offset], namespaces, column=cursor_column, line=cursor_line + 1) | |
1371 | try_jedi = True |
|
1371 | try_jedi = True | |
1372 |
|
1372 | |||
1373 | try: |
|
1373 | try: | |
1374 | # should we check the type of the node is Error ? |
|
1374 | # should we check the type of the node is Error ? | |
1375 | try: |
|
1375 | try: | |
1376 | # jedi < 0.11 |
|
1376 | # jedi < 0.11 | |
1377 | from jedi.parser.tree import ErrorLeaf |
|
1377 | from jedi.parser.tree import ErrorLeaf | |
1378 | except ImportError: |
|
1378 | except ImportError: | |
1379 | # jedi >= 0.11 |
|
1379 | # jedi >= 0.11 | |
1380 | from parso.tree import ErrorLeaf |
|
1380 | from parso.tree import ErrorLeaf | |
1381 |
|
1381 | |||
1382 | next_to_last_tree = interpreter._get_module().tree_node.children[-2] |
|
1382 | next_to_last_tree = interpreter._get_module().tree_node.children[-2] | |
1383 | completing_string = False |
|
1383 | completing_string = False | |
1384 | if isinstance(next_to_last_tree, ErrorLeaf): |
|
1384 | if isinstance(next_to_last_tree, ErrorLeaf): | |
1385 | completing_string = next_to_last_tree.value.lstrip()[0] in {'"', "'"} |
|
1385 | completing_string = next_to_last_tree.value.lstrip()[0] in {'"', "'"} | |
1386 | # if we are in a string jedi is likely not the right candidate for |
|
1386 | # if we are in a string jedi is likely not the right candidate for | |
1387 | # now. Skip it. |
|
1387 | # now. Skip it. | |
1388 | try_jedi = not completing_string |
|
1388 | try_jedi = not completing_string | |
1389 | except Exception as e: |
|
1389 | except Exception as e: | |
1390 | # many of things can go wrong, we are using private API just don't crash. |
|
1390 | # many of things can go wrong, we are using private API just don't crash. | |
1391 | if self.debug: |
|
1391 | if self.debug: | |
1392 | print("Error detecting if completing a non-finished string :", e, '|') |
|
1392 | print("Error detecting if completing a non-finished string :", e, '|') | |
1393 |
|
1393 | |||
1394 | if not try_jedi: |
|
1394 | if not try_jedi: | |
1395 | return [] |
|
1395 | return [] | |
1396 | try: |
|
1396 | try: | |
1397 | return filter(completion_filter, interpreter.completions()) |
|
1397 | return filter(completion_filter, interpreter.completions()) | |
1398 | except Exception as e: |
|
1398 | except Exception as e: | |
1399 | if self.debug: |
|
1399 | if self.debug: | |
1400 | return [_FakeJediCompletion('Oops Jedi has crashed, please report a bug with the following:\n"""\n%s\ns"""' % (e))] |
|
1400 | return [_FakeJediCompletion('Oops Jedi has crashed, please report a bug with the following:\n"""\n%s\ns"""' % (e))] | |
1401 | else: |
|
1401 | else: | |
1402 | return [] |
|
1402 | return [] | |
1403 |
|
1403 | |||
1404 | def python_matches(self, text): |
|
1404 | def python_matches(self, text): | |
1405 | """Match attributes or global python names""" |
|
1405 | """Match attributes or global python names""" | |
1406 | if "." in text: |
|
1406 | if "." in text: | |
1407 | try: |
|
1407 | try: | |
1408 | matches = self.attr_matches(text) |
|
1408 | matches = self.attr_matches(text) | |
1409 | if text.endswith('.') and self.omit__names: |
|
1409 | if text.endswith('.') and self.omit__names: | |
1410 | if self.omit__names == 1: |
|
1410 | if self.omit__names == 1: | |
1411 | # true if txt is _not_ a __ name, false otherwise: |
|
1411 | # true if txt is _not_ a __ name, false otherwise: | |
1412 | no__name = (lambda txt: |
|
1412 | no__name = (lambda txt: | |
1413 | re.match(r'.*\.__.*?__',txt) is None) |
|
1413 | re.match(r'.*\.__.*?__',txt) is None) | |
1414 | else: |
|
1414 | else: | |
1415 | # true if txt is _not_ a _ name, false otherwise: |
|
1415 | # true if txt is _not_ a _ name, false otherwise: | |
1416 | no__name = (lambda txt: |
|
1416 | no__name = (lambda txt: | |
1417 | re.match(r'\._.*?',txt[txt.rindex('.'):]) is None) |
|
1417 | re.match(r'\._.*?',txt[txt.rindex('.'):]) is None) | |
1418 | matches = filter(no__name, matches) |
|
1418 | matches = filter(no__name, matches) | |
1419 | except NameError: |
|
1419 | except NameError: | |
1420 | # catches <undefined attributes>.<tab> |
|
1420 | # catches <undefined attributes>.<tab> | |
1421 | matches = [] |
|
1421 | matches = [] | |
1422 | else: |
|
1422 | else: | |
1423 | matches = self.global_matches(text) |
|
1423 | matches = self.global_matches(text) | |
1424 | return matches |
|
1424 | return matches | |
1425 |
|
1425 | |||
1426 | def _default_arguments_from_docstring(self, doc): |
|
1426 | def _default_arguments_from_docstring(self, doc): | |
1427 | """Parse the first line of docstring for call signature. |
|
1427 | """Parse the first line of docstring for call signature. | |
1428 |
|
1428 | |||
1429 | Docstring should be of the form 'min(iterable[, key=func])\n'. |
|
1429 | Docstring should be of the form 'min(iterable[, key=func])\n'. | |
1430 | It can also parse cython docstring of the form |
|
1430 | It can also parse cython docstring of the form | |
1431 | 'Minuit.migrad(self, int ncall=10000, resume=True, int nsplit=1)'. |
|
1431 | 'Minuit.migrad(self, int ncall=10000, resume=True, int nsplit=1)'. | |
1432 | """ |
|
1432 | """ | |
1433 | if doc is None: |
|
1433 | if doc is None: | |
1434 | return [] |
|
1434 | return [] | |
1435 |
|
1435 | |||
1436 | #care only the firstline |
|
1436 | #care only the firstline | |
1437 | line = doc.lstrip().splitlines()[0] |
|
1437 | line = doc.lstrip().splitlines()[0] | |
1438 |
|
1438 | |||
1439 | #p = re.compile(r'^[\w|\s.]+\(([^)]*)\).*') |
|
1439 | #p = re.compile(r'^[\w|\s.]+\(([^)]*)\).*') | |
1440 | #'min(iterable[, key=func])\n' -> 'iterable[, key=func]' |
|
1440 | #'min(iterable[, key=func])\n' -> 'iterable[, key=func]' | |
1441 | sig = self.docstring_sig_re.search(line) |
|
1441 | sig = self.docstring_sig_re.search(line) | |
1442 | if sig is None: |
|
1442 | if sig is None: | |
1443 | return [] |
|
1443 | return [] | |
1444 | # iterable[, key=func]' -> ['iterable[' ,' key=func]'] |
|
1444 | # iterable[, key=func]' -> ['iterable[' ,' key=func]'] | |
1445 | sig = sig.groups()[0].split(',') |
|
1445 | sig = sig.groups()[0].split(',') | |
1446 | ret = [] |
|
1446 | ret = [] | |
1447 | for s in sig: |
|
1447 | for s in sig: | |
1448 | #re.compile(r'[\s|\[]*(\w+)(?:\s*=\s*.*)') |
|
1448 | #re.compile(r'[\s|\[]*(\w+)(?:\s*=\s*.*)') | |
1449 | ret += self.docstring_kwd_re.findall(s) |
|
1449 | ret += self.docstring_kwd_re.findall(s) | |
1450 | return ret |
|
1450 | return ret | |
1451 |
|
1451 | |||
1452 | def _default_arguments(self, obj): |
|
1452 | def _default_arguments(self, obj): | |
1453 | """Return the list of default arguments of obj if it is callable, |
|
1453 | """Return the list of default arguments of obj if it is callable, | |
1454 | or empty list otherwise.""" |
|
1454 | or empty list otherwise.""" | |
1455 | call_obj = obj |
|
1455 | call_obj = obj | |
1456 | ret = [] |
|
1456 | ret = [] | |
1457 | if inspect.isbuiltin(obj): |
|
1457 | if inspect.isbuiltin(obj): | |
1458 | pass |
|
1458 | pass | |
1459 | elif not (inspect.isfunction(obj) or inspect.ismethod(obj)): |
|
1459 | elif not (inspect.isfunction(obj) or inspect.ismethod(obj)): | |
1460 | if inspect.isclass(obj): |
|
1460 | if inspect.isclass(obj): | |
1461 | #for cython embedsignature=True the constructor docstring |
|
1461 | #for cython embedsignature=True the constructor docstring | |
1462 | #belongs to the object itself not __init__ |
|
1462 | #belongs to the object itself not __init__ | |
1463 | ret += self._default_arguments_from_docstring( |
|
1463 | ret += self._default_arguments_from_docstring( | |
1464 | getattr(obj, '__doc__', '')) |
|
1464 | getattr(obj, '__doc__', '')) | |
1465 | # for classes, check for __init__,__new__ |
|
1465 | # for classes, check for __init__,__new__ | |
1466 | call_obj = (getattr(obj, '__init__', None) or |
|
1466 | call_obj = (getattr(obj, '__init__', None) or | |
1467 | getattr(obj, '__new__', None)) |
|
1467 | getattr(obj, '__new__', None)) | |
1468 | # for all others, check if they are __call__able |
|
1468 | # for all others, check if they are __call__able | |
1469 | elif hasattr(obj, '__call__'): |
|
1469 | elif hasattr(obj, '__call__'): | |
1470 | call_obj = obj.__call__ |
|
1470 | call_obj = obj.__call__ | |
1471 | ret += self._default_arguments_from_docstring( |
|
1471 | ret += self._default_arguments_from_docstring( | |
1472 | getattr(call_obj, '__doc__', '')) |
|
1472 | getattr(call_obj, '__doc__', '')) | |
1473 |
|
1473 | |||
1474 | _keeps = (inspect.Parameter.KEYWORD_ONLY, |
|
1474 | _keeps = (inspect.Parameter.KEYWORD_ONLY, | |
1475 | inspect.Parameter.POSITIONAL_OR_KEYWORD) |
|
1475 | inspect.Parameter.POSITIONAL_OR_KEYWORD) | |
1476 |
|
1476 | |||
1477 | try: |
|
1477 | try: | |
1478 | sig = inspect.signature(call_obj) |
|
1478 | sig = inspect.signature(call_obj) | |
1479 | ret.extend(k for k, v in sig.parameters.items() if |
|
1479 | ret.extend(k for k, v in sig.parameters.items() if | |
1480 | v.kind in _keeps) |
|
1480 | v.kind in _keeps) | |
1481 | except ValueError: |
|
1481 | except ValueError: | |
1482 | pass |
|
1482 | pass | |
1483 |
|
1483 | |||
1484 | return list(set(ret)) |
|
1484 | return list(set(ret)) | |
1485 |
|
1485 | |||
1486 | def python_func_kw_matches(self,text): |
|
1486 | def python_func_kw_matches(self,text): | |
1487 | """Match named parameters (kwargs) of the last open function""" |
|
1487 | """Match named parameters (kwargs) of the last open function""" | |
1488 |
|
1488 | |||
1489 | if "." in text: # a parameter cannot be dotted |
|
1489 | if "." in text: # a parameter cannot be dotted | |
1490 | return [] |
|
1490 | return [] | |
1491 | try: regexp = self.__funcParamsRegex |
|
1491 | try: regexp = self.__funcParamsRegex | |
1492 | except AttributeError: |
|
1492 | except AttributeError: | |
1493 | regexp = self.__funcParamsRegex = re.compile(r''' |
|
1493 | regexp = self.__funcParamsRegex = re.compile(r''' | |
1494 | '.*?(?<!\\)' | # single quoted strings or |
|
1494 | '.*?(?<!\\)' | # single quoted strings or | |
1495 | ".*?(?<!\\)" | # double quoted strings or |
|
1495 | ".*?(?<!\\)" | # double quoted strings or | |
1496 | \w+ | # identifier |
|
1496 | \w+ | # identifier | |
1497 | \S # other characters |
|
1497 | \S # other characters | |
1498 | ''', re.VERBOSE | re.DOTALL) |
|
1498 | ''', re.VERBOSE | re.DOTALL) | |
1499 | # 1. find the nearest identifier that comes before an unclosed |
|
1499 | # 1. find the nearest identifier that comes before an unclosed | |
1500 | # parenthesis before the cursor |
|
1500 | # parenthesis before the cursor | |
1501 | # e.g. for "foo (1+bar(x), pa<cursor>,a=1)", the candidate is "foo" |
|
1501 | # e.g. for "foo (1+bar(x), pa<cursor>,a=1)", the candidate is "foo" | |
1502 | tokens = regexp.findall(self.text_until_cursor) |
|
1502 | tokens = regexp.findall(self.text_until_cursor) | |
1503 | iterTokens = reversed(tokens); openPar = 0 |
|
1503 | iterTokens = reversed(tokens); openPar = 0 | |
1504 |
|
1504 | |||
1505 | for token in iterTokens: |
|
1505 | for token in iterTokens: | |
1506 | if token == ')': |
|
1506 | if token == ')': | |
1507 | openPar -= 1 |
|
1507 | openPar -= 1 | |
1508 | elif token == '(': |
|
1508 | elif token == '(': | |
1509 | openPar += 1 |
|
1509 | openPar += 1 | |
1510 | if openPar > 0: |
|
1510 | if openPar > 0: | |
1511 | # found the last unclosed parenthesis |
|
1511 | # found the last unclosed parenthesis | |
1512 | break |
|
1512 | break | |
1513 | else: |
|
1513 | else: | |
1514 | return [] |
|
1514 | return [] | |
1515 | # 2. Concatenate dotted names ("foo.bar" for "foo.bar(x, pa" ) |
|
1515 | # 2. Concatenate dotted names ("foo.bar" for "foo.bar(x, pa" ) | |
1516 | ids = [] |
|
1516 | ids = [] | |
1517 | isId = re.compile(r'\w+$').match |
|
1517 | isId = re.compile(r'\w+$').match | |
1518 |
|
1518 | |||
1519 | while True: |
|
1519 | while True: | |
1520 | try: |
|
1520 | try: | |
1521 | ids.append(next(iterTokens)) |
|
1521 | ids.append(next(iterTokens)) | |
1522 | if not isId(ids[-1]): |
|
1522 | if not isId(ids[-1]): | |
1523 | ids.pop(); break |
|
1523 | ids.pop(); break | |
1524 | if not next(iterTokens) == '.': |
|
1524 | if not next(iterTokens) == '.': | |
1525 | break |
|
1525 | break | |
1526 | except StopIteration: |
|
1526 | except StopIteration: | |
1527 | break |
|
1527 | break | |
1528 |
|
1528 | |||
1529 | # Find all named arguments already assigned to, as to avoid suggesting |
|
1529 | # Find all named arguments already assigned to, as to avoid suggesting | |
1530 | # them again |
|
1530 | # them again | |
1531 | usedNamedArgs = set() |
|
1531 | usedNamedArgs = set() | |
1532 | par_level = -1 |
|
1532 | par_level = -1 | |
1533 | for token, next_token in zip(tokens, tokens[1:]): |
|
1533 | for token, next_token in zip(tokens, tokens[1:]): | |
1534 | if token == '(': |
|
1534 | if token == '(': | |
1535 | par_level += 1 |
|
1535 | par_level += 1 | |
1536 | elif token == ')': |
|
1536 | elif token == ')': | |
1537 | par_level -= 1 |
|
1537 | par_level -= 1 | |
1538 |
|
1538 | |||
1539 | if par_level != 0: |
|
1539 | if par_level != 0: | |
1540 | continue |
|
1540 | continue | |
1541 |
|
1541 | |||
1542 | if next_token != '=': |
|
1542 | if next_token != '=': | |
1543 | continue |
|
1543 | continue | |
1544 |
|
1544 | |||
1545 | usedNamedArgs.add(token) |
|
1545 | usedNamedArgs.add(token) | |
1546 |
|
1546 | |||
1547 | argMatches = [] |
|
1547 | argMatches = [] | |
1548 | try: |
|
1548 | try: | |
1549 | callableObj = '.'.join(ids[::-1]) |
|
1549 | callableObj = '.'.join(ids[::-1]) | |
1550 | namedArgs = self._default_arguments(eval(callableObj, |
|
1550 | namedArgs = self._default_arguments(eval(callableObj, | |
1551 | self.namespace)) |
|
1551 | self.namespace)) | |
1552 |
|
1552 | |||
1553 | # Remove used named arguments from the list, no need to show twice |
|
1553 | # Remove used named arguments from the list, no need to show twice | |
1554 | for namedArg in set(namedArgs) - usedNamedArgs: |
|
1554 | for namedArg in set(namedArgs) - usedNamedArgs: | |
1555 | if namedArg.startswith(text): |
|
1555 | if namedArg.startswith(text): | |
1556 | argMatches.append(u"%s=" %namedArg) |
|
1556 | argMatches.append(u"%s=" %namedArg) | |
1557 | except: |
|
1557 | except: | |
1558 | pass |
|
1558 | pass | |
1559 |
|
1559 | |||
1560 | return argMatches |
|
1560 | return argMatches | |
1561 |
|
1561 | |||
1562 | def dict_key_matches(self, text): |
|
1562 | def dict_key_matches(self, text): | |
1563 | "Match string keys in a dictionary, after e.g. 'foo[' " |
|
1563 | "Match string keys in a dictionary, after e.g. 'foo[' " | |
1564 | def get_keys(obj): |
|
1564 | def get_keys(obj): | |
1565 | # Objects can define their own completions by defining an |
|
1565 | # Objects can define their own completions by defining an | |
1566 | # _ipy_key_completions_() method. |
|
1566 | # _ipy_key_completions_() method. | |
1567 | method = get_real_method(obj, '_ipython_key_completions_') |
|
1567 | method = get_real_method(obj, '_ipython_key_completions_') | |
1568 | if method is not None: |
|
1568 | if method is not None: | |
1569 | return method() |
|
1569 | return method() | |
1570 |
|
1570 | |||
1571 | # Special case some common in-memory dict-like types |
|
1571 | # Special case some common in-memory dict-like types | |
1572 | if isinstance(obj, dict) or\ |
|
1572 | if isinstance(obj, dict) or\ | |
1573 | _safe_isinstance(obj, 'pandas', 'DataFrame'): |
|
1573 | _safe_isinstance(obj, 'pandas', 'DataFrame'): | |
1574 | try: |
|
1574 | try: | |
1575 | return list(obj.keys()) |
|
1575 | return list(obj.keys()) | |
1576 | except Exception: |
|
1576 | except Exception: | |
1577 | return [] |
|
1577 | return [] | |
1578 | elif _safe_isinstance(obj, 'numpy', 'ndarray') or\ |
|
1578 | elif _safe_isinstance(obj, 'numpy', 'ndarray') or\ | |
1579 | _safe_isinstance(obj, 'numpy', 'void'): |
|
1579 | _safe_isinstance(obj, 'numpy', 'void'): | |
1580 | return obj.dtype.names or [] |
|
1580 | return obj.dtype.names or [] | |
1581 | return [] |
|
1581 | return [] | |
1582 |
|
1582 | |||
1583 | try: |
|
1583 | try: | |
1584 | regexps = self.__dict_key_regexps |
|
1584 | regexps = self.__dict_key_regexps | |
1585 | except AttributeError: |
|
1585 | except AttributeError: | |
1586 | dict_key_re_fmt = r'''(?x) |
|
1586 | dict_key_re_fmt = r'''(?x) | |
1587 | ( # match dict-referring expression wrt greedy setting |
|
1587 | ( # match dict-referring expression wrt greedy setting | |
1588 | %s |
|
1588 | %s | |
1589 | ) |
|
1589 | ) | |
1590 | \[ # open bracket |
|
1590 | \[ # open bracket | |
1591 | \s* # and optional whitespace |
|
1591 | \s* # and optional whitespace | |
1592 | ([uUbB]? # string prefix (r not handled) |
|
1592 | ([uUbB]? # string prefix (r not handled) | |
1593 | (?: # unclosed string |
|
1593 | (?: # unclosed string | |
1594 | '(?:[^']|(?<!\\)\\')* |
|
1594 | '(?:[^']|(?<!\\)\\')* | |
1595 | | |
|
1595 | | | |
1596 | "(?:[^"]|(?<!\\)\\")* |
|
1596 | "(?:[^"]|(?<!\\)\\")* | |
1597 | ) |
|
1597 | ) | |
1598 | )? |
|
1598 | )? | |
1599 | $ |
|
1599 | $ | |
1600 | ''' |
|
1600 | ''' | |
1601 | regexps = self.__dict_key_regexps = { |
|
1601 | regexps = self.__dict_key_regexps = { | |
1602 | False: re.compile(dict_key_re_fmt % r''' |
|
1602 | False: re.compile(dict_key_re_fmt % r''' | |
1603 | # identifiers separated by . |
|
1603 | # identifiers separated by . | |
1604 | (?!\d)\w+ |
|
1604 | (?!\d)\w+ | |
1605 | (?:\.(?!\d)\w+)* |
|
1605 | (?:\.(?!\d)\w+)* | |
1606 | '''), |
|
1606 | '''), | |
1607 | True: re.compile(dict_key_re_fmt % ''' |
|
1607 | True: re.compile(dict_key_re_fmt % ''' | |
1608 | .+ |
|
1608 | .+ | |
1609 | ''') |
|
1609 | ''') | |
1610 | } |
|
1610 | } | |
1611 |
|
1611 | |||
1612 | match = regexps[self.greedy].search(self.text_until_cursor) |
|
1612 | match = regexps[self.greedy].search(self.text_until_cursor) | |
1613 | if match is None: |
|
1613 | if match is None: | |
1614 | return [] |
|
1614 | return [] | |
1615 |
|
1615 | |||
1616 | expr, prefix = match.groups() |
|
1616 | expr, prefix = match.groups() | |
1617 | try: |
|
1617 | try: | |
1618 | obj = eval(expr, self.namespace) |
|
1618 | obj = eval(expr, self.namespace) | |
1619 | except Exception: |
|
1619 | except Exception: | |
1620 | try: |
|
1620 | try: | |
1621 | obj = eval(expr, self.global_namespace) |
|
1621 | obj = eval(expr, self.global_namespace) | |
1622 | except Exception: |
|
1622 | except Exception: | |
1623 | return [] |
|
1623 | return [] | |
1624 |
|
1624 | |||
1625 | keys = get_keys(obj) |
|
1625 | keys = get_keys(obj) | |
1626 | if not keys: |
|
1626 | if not keys: | |
1627 | return keys |
|
1627 | return keys | |
1628 | closing_quote, token_offset, matches = match_dict_keys(keys, prefix, self.splitter.delims) |
|
1628 | closing_quote, token_offset, matches = match_dict_keys(keys, prefix, self.splitter.delims) | |
1629 | if not matches: |
|
1629 | if not matches: | |
1630 | return matches |
|
1630 | return matches | |
1631 |
|
1631 | |||
1632 | # get the cursor position of |
|
1632 | # get the cursor position of | |
1633 | # - the text being completed |
|
1633 | # - the text being completed | |
1634 | # - the start of the key text |
|
1634 | # - the start of the key text | |
1635 | # - the start of the completion |
|
1635 | # - the start of the completion | |
1636 | text_start = len(self.text_until_cursor) - len(text) |
|
1636 | text_start = len(self.text_until_cursor) - len(text) | |
1637 | if prefix: |
|
1637 | if prefix: | |
1638 | key_start = match.start(2) |
|
1638 | key_start = match.start(2) | |
1639 | completion_start = key_start + token_offset |
|
1639 | completion_start = key_start + token_offset | |
1640 | else: |
|
1640 | else: | |
1641 | key_start = completion_start = match.end() |
|
1641 | key_start = completion_start = match.end() | |
1642 |
|
1642 | |||
1643 | # grab the leading prefix, to make sure all completions start with `text` |
|
1643 | # grab the leading prefix, to make sure all completions start with `text` | |
1644 | if text_start > key_start: |
|
1644 | if text_start > key_start: | |
1645 | leading = '' |
|
1645 | leading = '' | |
1646 | else: |
|
1646 | else: | |
1647 | leading = text[text_start:completion_start] |
|
1647 | leading = text[text_start:completion_start] | |
1648 |
|
1648 | |||
1649 | # the index of the `[` character |
|
1649 | # the index of the `[` character | |
1650 | bracket_idx = match.end(1) |
|
1650 | bracket_idx = match.end(1) | |
1651 |
|
1651 | |||
1652 | # append closing quote and bracket as appropriate |
|
1652 | # append closing quote and bracket as appropriate | |
1653 | # this is *not* appropriate if the opening quote or bracket is outside |
|
1653 | # this is *not* appropriate if the opening quote or bracket is outside | |
1654 | # the text given to this method |
|
1654 | # the text given to this method | |
1655 | suf = '' |
|
1655 | suf = '' | |
1656 | continuation = self.line_buffer[len(self.text_until_cursor):] |
|
1656 | continuation = self.line_buffer[len(self.text_until_cursor):] | |
1657 | if key_start > text_start and closing_quote: |
|
1657 | if key_start > text_start and closing_quote: | |
1658 | # quotes were opened inside text, maybe close them |
|
1658 | # quotes were opened inside text, maybe close them | |
1659 | if continuation.startswith(closing_quote): |
|
1659 | if continuation.startswith(closing_quote): | |
1660 | continuation = continuation[len(closing_quote):] |
|
1660 | continuation = continuation[len(closing_quote):] | |
1661 | else: |
|
1661 | else: | |
1662 | suf += closing_quote |
|
1662 | suf += closing_quote | |
1663 | if bracket_idx > text_start: |
|
1663 | if bracket_idx > text_start: | |
1664 | # brackets were opened inside text, maybe close them |
|
1664 | # brackets were opened inside text, maybe close them | |
1665 | if not continuation.startswith(']'): |
|
1665 | if not continuation.startswith(']'): | |
1666 | suf += ']' |
|
1666 | suf += ']' | |
1667 |
|
1667 | |||
1668 | return [leading + k + suf for k in matches] |
|
1668 | return [leading + k + suf for k in matches] | |
1669 |
|
1669 | |||
1670 | def unicode_name_matches(self, text): |
|
1670 | def unicode_name_matches(self, text): | |
1671 | u"""Match Latex-like syntax for unicode characters base |
|
1671 | u"""Match Latex-like syntax for unicode characters base | |
1672 | on the name of the character. |
|
1672 | on the name of the character. | |
1673 |
|
1673 | |||
1674 | This does ``\\GREEK SMALL LETTER ETA`` -> ``Ξ·`` |
|
1674 | This does ``\\GREEK SMALL LETTER ETA`` -> ``Ξ·`` | |
1675 |
|
1675 | |||
1676 | Works only on valid python 3 identifier, or on combining characters that |
|
1676 | Works only on valid python 3 identifier, or on combining characters that | |
1677 | will combine to form a valid identifier. |
|
1677 | will combine to form a valid identifier. | |
1678 |
|
1678 | |||
1679 | Used on Python 3 only. |
|
1679 | Used on Python 3 only. | |
1680 | """ |
|
1680 | """ | |
1681 | slashpos = text.rfind('\\') |
|
1681 | slashpos = text.rfind('\\') | |
1682 | if slashpos > -1: |
|
1682 | if slashpos > -1: | |
1683 | s = text[slashpos+1:] |
|
1683 | s = text[slashpos+1:] | |
1684 | try : |
|
1684 | try : | |
1685 | unic = unicodedata.lookup(s) |
|
1685 | unic = unicodedata.lookup(s) | |
1686 | # allow combining chars |
|
1686 | # allow combining chars | |
1687 | if ('a'+unic).isidentifier(): |
|
1687 | if ('a'+unic).isidentifier(): | |
1688 | return '\\'+s,[unic] |
|
1688 | return '\\'+s,[unic] | |
1689 | except KeyError: |
|
1689 | except KeyError: | |
1690 | pass |
|
1690 | pass | |
1691 | return u'', [] |
|
1691 | return u'', [] | |
1692 |
|
1692 | |||
1693 |
|
1693 | |||
1694 | def latex_matches(self, text): |
|
1694 | def latex_matches(self, text): | |
1695 | u"""Match Latex syntax for unicode characters. |
|
1695 | u"""Match Latex syntax for unicode characters. | |
1696 |
|
1696 | |||
1697 | This does both ``\\alp`` -> ``\\alpha`` and ``\\alpha`` -> ``Ξ±`` |
|
1697 | This does both ``\\alp`` -> ``\\alpha`` and ``\\alpha`` -> ``Ξ±`` | |
1698 |
|
1698 | |||
1699 | Used on Python 3 only. |
|
1699 | Used on Python 3 only. | |
1700 | """ |
|
1700 | """ | |
1701 | slashpos = text.rfind('\\') |
|
1701 | slashpos = text.rfind('\\') | |
1702 | if slashpos > -1: |
|
1702 | if slashpos > -1: | |
1703 | s = text[slashpos:] |
|
1703 | s = text[slashpos:] | |
1704 | if s in latex_symbols: |
|
1704 | if s in latex_symbols: | |
1705 | # Try to complete a full latex symbol to unicode |
|
1705 | # Try to complete a full latex symbol to unicode | |
1706 | # \\alpha -> Ξ± |
|
1706 | # \\alpha -> Ξ± | |
1707 | return s, [latex_symbols[s]] |
|
1707 | return s, [latex_symbols[s]] | |
1708 | else: |
|
1708 | else: | |
1709 | # If a user has partially typed a latex symbol, give them |
|
1709 | # If a user has partially typed a latex symbol, give them | |
1710 | # a full list of options \al -> [\aleph, \alpha] |
|
1710 | # a full list of options \al -> [\aleph, \alpha] | |
1711 | matches = [k for k in latex_symbols if k.startswith(s)] |
|
1711 | matches = [k for k in latex_symbols if k.startswith(s)] | |
1712 | return s, matches |
|
1712 | return s, matches | |
1713 | return u'', [] |
|
1713 | return u'', [] | |
1714 |
|
1714 | |||
1715 | def dispatch_custom_completer(self, text): |
|
1715 | def dispatch_custom_completer(self, text): | |
1716 | if not self.custom_completers: |
|
1716 | if not self.custom_completers: | |
1717 | return |
|
1717 | return | |
1718 |
|
1718 | |||
1719 | line = self.line_buffer |
|
1719 | line = self.line_buffer | |
1720 | if not line.strip(): |
|
1720 | if not line.strip(): | |
1721 | return None |
|
1721 | return None | |
1722 |
|
1722 | |||
1723 | # Create a little structure to pass all the relevant information about |
|
1723 | # Create a little structure to pass all the relevant information about | |
1724 | # the current completion to any custom completer. |
|
1724 | # the current completion to any custom completer. | |
1725 | event = SimpleNamespace() |
|
1725 | event = SimpleNamespace() | |
1726 | event.line = line |
|
1726 | event.line = line | |
1727 | event.symbol = text |
|
1727 | event.symbol = text | |
1728 | cmd = line.split(None,1)[0] |
|
1728 | cmd = line.split(None,1)[0] | |
1729 | event.command = cmd |
|
1729 | event.command = cmd | |
1730 | event.text_until_cursor = self.text_until_cursor |
|
1730 | event.text_until_cursor = self.text_until_cursor | |
1731 |
|
1731 | |||
1732 | # for foo etc, try also to find completer for %foo |
|
1732 | # for foo etc, try also to find completer for %foo | |
1733 | if not cmd.startswith(self.magic_escape): |
|
1733 | if not cmd.startswith(self.magic_escape): | |
1734 | try_magic = self.custom_completers.s_matches( |
|
1734 | try_magic = self.custom_completers.s_matches( | |
1735 | self.magic_escape + cmd) |
|
1735 | self.magic_escape + cmd) | |
1736 | else: |
|
1736 | else: | |
1737 | try_magic = [] |
|
1737 | try_magic = [] | |
1738 |
|
1738 | |||
1739 | for c in itertools.chain(self.custom_completers.s_matches(cmd), |
|
1739 | for c in itertools.chain(self.custom_completers.s_matches(cmd), | |
1740 | try_magic, |
|
1740 | try_magic, | |
1741 | self.custom_completers.flat_matches(self.text_until_cursor)): |
|
1741 | self.custom_completers.flat_matches(self.text_until_cursor)): | |
1742 | try: |
|
1742 | try: | |
1743 | res = c(event) |
|
1743 | res = c(event) | |
1744 | if res: |
|
1744 | if res: | |
1745 | # first, try case sensitive match |
|
1745 | # first, try case sensitive match | |
1746 | withcase = [r for r in res if r.startswith(text)] |
|
1746 | withcase = [r for r in res if r.startswith(text)] | |
1747 | if withcase: |
|
1747 | if withcase: | |
1748 | return withcase |
|
1748 | return withcase | |
1749 | # if none, then case insensitive ones are ok too |
|
1749 | # if none, then case insensitive ones are ok too | |
1750 | text_low = text.lower() |
|
1750 | text_low = text.lower() | |
1751 | return [r for r in res if r.lower().startswith(text_low)] |
|
1751 | return [r for r in res if r.lower().startswith(text_low)] | |
1752 | except TryNext: |
|
1752 | except TryNext: | |
1753 | pass |
|
1753 | pass | |
1754 | except KeyboardInterrupt: |
|
1754 | except KeyboardInterrupt: | |
1755 | """ |
|
1755 | """ | |
1756 | If custom completer take too long, |
|
1756 | If custom completer take too long, | |
1757 | let keyboard interrupt abort and return nothing. |
|
1757 | let keyboard interrupt abort and return nothing. | |
1758 | """ |
|
1758 | """ | |
1759 | break |
|
1759 | break | |
1760 |
|
1760 | |||
1761 | return None |
|
1761 | return None | |
1762 |
|
1762 | |||
1763 | def completions(self, text: str, offset: int)->Iterator[Completion]: |
|
1763 | def completions(self, text: str, offset: int)->Iterator[Completion]: | |
1764 | """ |
|
1764 | """ | |
1765 | Returns an iterator over the possible completions |
|
1765 | Returns an iterator over the possible completions | |
1766 |
|
1766 | |||
1767 | .. warning:: Unstable |
|
1767 | .. warning:: Unstable | |
1768 |
|
1768 | |||
1769 | This function is unstable, API may change without warning. |
|
1769 | This function is unstable, API may change without warning. | |
1770 | It will also raise unless use in proper context manager. |
|
1770 | It will also raise unless use in proper context manager. | |
1771 |
|
1771 | |||
1772 | Parameters |
|
1772 | Parameters | |
1773 | ---------- |
|
1773 | ---------- | |
1774 |
|
1774 | |||
1775 | text:str |
|
1775 | text:str | |
1776 | Full text of the current input, multi line string. |
|
1776 | Full text of the current input, multi line string. | |
1777 | offset:int |
|
1777 | offset:int | |
1778 | Integer representing the position of the cursor in ``text``. Offset |
|
1778 | Integer representing the position of the cursor in ``text``. Offset | |
1779 | is 0-based indexed. |
|
1779 | is 0-based indexed. | |
1780 |
|
1780 | |||
1781 | Yields |
|
1781 | Yields | |
1782 | ------ |
|
1782 | ------ | |
1783 | :any:`Completion` object |
|
1783 | :any:`Completion` object | |
1784 |
|
1784 | |||
1785 |
|
1785 | |||
1786 | The cursor on a text can either be seen as being "in between" |
|
1786 | The cursor on a text can either be seen as being "in between" | |
1787 | characters or "On" a character depending on the interface visible to |
|
1787 | characters or "On" a character depending on the interface visible to | |
1788 | the user. For consistency the cursor being on "in between" characters X |
|
1788 | the user. For consistency the cursor being on "in between" characters X | |
1789 | and Y is equivalent to the cursor being "on" character Y, that is to say |
|
1789 | and Y is equivalent to the cursor being "on" character Y, that is to say | |
1790 | the character the cursor is on is considered as being after the cursor. |
|
1790 | the character the cursor is on is considered as being after the cursor. | |
1791 |
|
1791 | |||
1792 | Combining characters may span more that one position in the |
|
1792 | Combining characters may span more that one position in the | |
1793 | text. |
|
1793 | text. | |
1794 |
|
1794 | |||
1795 |
|
1795 | |||
1796 | .. note:: |
|
1796 | .. note:: | |
1797 |
|
1797 | |||
1798 | If ``IPCompleter.debug`` is :any:`True` will yield a ``--jedi/ipython--`` |
|
1798 | If ``IPCompleter.debug`` is :any:`True` will yield a ``--jedi/ipython--`` | |
1799 | fake Completion token to distinguish completion returned by Jedi |
|
1799 | fake Completion token to distinguish completion returned by Jedi | |
1800 | and usual IPython completion. |
|
1800 | and usual IPython completion. | |
1801 |
|
1801 | |||
1802 | .. note:: |
|
1802 | .. note:: | |
1803 |
|
1803 | |||
1804 | Completions are not completely deduplicated yet. If identical |
|
1804 | Completions are not completely deduplicated yet. If identical | |
1805 | completions are coming from different sources this function does not |
|
1805 | completions are coming from different sources this function does not | |
1806 | ensure that each completion object will only be present once. |
|
1806 | ensure that each completion object will only be present once. | |
1807 | """ |
|
1807 | """ | |
1808 | warnings.warn("_complete is a provisional API (as of IPython 6.0). " |
|
1808 | warnings.warn("_complete is a provisional API (as of IPython 6.0). " | |
1809 | "It may change without warnings. " |
|
1809 | "It may change without warnings. " | |
1810 | "Use in corresponding context manager.", |
|
1810 | "Use in corresponding context manager.", | |
1811 | category=ProvisionalCompleterWarning, stacklevel=2) |
|
1811 | category=ProvisionalCompleterWarning, stacklevel=2) | |
1812 |
|
1812 | |||
1813 | seen = set() |
|
1813 | seen = set() | |
1814 | try: |
|
1814 | try: | |
1815 | for c in self._completions(text, offset, _timeout=self.jedi_compute_type_timeout/1000): |
|
1815 | for c in self._completions(text, offset, _timeout=self.jedi_compute_type_timeout/1000): | |
1816 | if c and (c in seen): |
|
1816 | if c and (c in seen): | |
1817 | continue |
|
1817 | continue | |
1818 | yield c |
|
1818 | yield c | |
1819 | seen.add(c) |
|
1819 | seen.add(c) | |
1820 | except KeyboardInterrupt: |
|
1820 | except KeyboardInterrupt: | |
1821 | """if completions take too long and users send keyboard interrupt, |
|
1821 | """if completions take too long and users send keyboard interrupt, | |
1822 | do not crash and return ASAP. """ |
|
1822 | do not crash and return ASAP. """ | |
1823 | pass |
|
1823 | pass | |
1824 |
|
1824 | |||
1825 | def _completions(self, full_text: str, offset: int, *, _timeout)->Iterator[Completion]: |
|
1825 | def _completions(self, full_text: str, offset: int, *, _timeout)->Iterator[Completion]: | |
1826 | """ |
|
1826 | """ | |
1827 | Core completion module.Same signature as :any:`completions`, with the |
|
1827 | Core completion module.Same signature as :any:`completions`, with the | |
1828 | extra `timeout` parameter (in seconds). |
|
1828 | extra `timeout` parameter (in seconds). | |
1829 |
|
1829 | |||
1830 |
|
1830 | |||
1831 | Computing jedi's completion ``.type`` can be quite expensive (it is a |
|
1831 | Computing jedi's completion ``.type`` can be quite expensive (it is a | |
1832 | lazy property) and can require some warm-up, more warm up than just |
|
1832 | lazy property) and can require some warm-up, more warm up than just | |
1833 | computing the ``name`` of a completion. The warm-up can be : |
|
1833 | computing the ``name`` of a completion. The warm-up can be : | |
1834 |
|
1834 | |||
1835 | - Long warm-up the first time a module is encountered after |
|
1835 | - Long warm-up the first time a module is encountered after | |
1836 | install/update: actually build parse/inference tree. |
|
1836 | install/update: actually build parse/inference tree. | |
1837 |
|
1837 | |||
1838 | - first time the module is encountered in a session: load tree from |
|
1838 | - first time the module is encountered in a session: load tree from | |
1839 | disk. |
|
1839 | disk. | |
1840 |
|
1840 | |||
1841 | We don't want to block completions for tens of seconds so we give the |
|
1841 | We don't want to block completions for tens of seconds so we give the | |
1842 | completer a "budget" of ``_timeout`` seconds per invocation to compute |
|
1842 | completer a "budget" of ``_timeout`` seconds per invocation to compute | |
1843 | completions types, the completions that have not yet been computed will |
|
1843 | completions types, the completions that have not yet been computed will | |
1844 | be marked as "unknown" an will have a chance to be computed next round |
|
1844 | be marked as "unknown" an will have a chance to be computed next round | |
1845 | are things get cached. |
|
1845 | are things get cached. | |
1846 |
|
1846 | |||
1847 | Keep in mind that Jedi is not the only thing treating the completion so |
|
1847 | Keep in mind that Jedi is not the only thing treating the completion so | |
1848 | keep the timeout short-ish as if we take more than 0.3 second we still |
|
1848 | keep the timeout short-ish as if we take more than 0.3 second we still | |
1849 | have lots of processing to do. |
|
1849 | have lots of processing to do. | |
1850 |
|
1850 | |||
1851 | """ |
|
1851 | """ | |
1852 | deadline = time.monotonic() + _timeout |
|
1852 | deadline = time.monotonic() + _timeout | |
1853 |
|
1853 | |||
1854 |
|
1854 | |||
1855 | before = full_text[:offset] |
|
1855 | before = full_text[:offset] | |
1856 | cursor_line, cursor_column = position_to_cursor(full_text, offset) |
|
1856 | cursor_line, cursor_column = position_to_cursor(full_text, offset) | |
1857 |
|
1857 | |||
1858 | matched_text, matches, matches_origin, jedi_matches = self._complete( |
|
1858 | matched_text, matches, matches_origin, jedi_matches = self._complete( | |
1859 | full_text=full_text, cursor_line=cursor_line, cursor_pos=cursor_column) |
|
1859 | full_text=full_text, cursor_line=cursor_line, cursor_pos=cursor_column) | |
1860 |
|
1860 | |||
1861 | iter_jm = iter(jedi_matches) |
|
1861 | iter_jm = iter(jedi_matches) | |
1862 | if _timeout: |
|
1862 | if _timeout: | |
1863 | for jm in iter_jm: |
|
1863 | for jm in iter_jm: | |
1864 | try: |
|
1864 | try: | |
1865 | type_ = jm.type |
|
1865 | type_ = jm.type | |
1866 | except Exception: |
|
1866 | except Exception: | |
1867 | if self.debug: |
|
1867 | if self.debug: | |
1868 | print("Error in Jedi getting type of ", jm) |
|
1868 | print("Error in Jedi getting type of ", jm) | |
1869 | type_ = None |
|
1869 | type_ = None | |
1870 | delta = len(jm.name_with_symbols) - len(jm.complete) |
|
1870 | delta = len(jm.name_with_symbols) - len(jm.complete) | |
1871 | if type_ == 'function': |
|
1871 | if type_ == 'function': | |
1872 | signature = _make_signature(jm) |
|
1872 | signature = _make_signature(jm) | |
1873 | else: |
|
1873 | else: | |
1874 | signature = '' |
|
1874 | signature = '' | |
1875 | yield Completion(start=offset - delta, |
|
1875 | yield Completion(start=offset - delta, | |
1876 | end=offset, |
|
1876 | end=offset, | |
1877 | text=jm.name_with_symbols, |
|
1877 | text=jm.name_with_symbols, | |
1878 | type=type_, |
|
1878 | type=type_, | |
1879 | signature=signature, |
|
1879 | signature=signature, | |
1880 | _origin='jedi') |
|
1880 | _origin='jedi') | |
1881 |
|
1881 | |||
1882 | if time.monotonic() > deadline: |
|
1882 | if time.monotonic() > deadline: | |
1883 | break |
|
1883 | break | |
1884 |
|
1884 | |||
1885 | for jm in iter_jm: |
|
1885 | for jm in iter_jm: | |
1886 | delta = len(jm.name_with_symbols) - len(jm.complete) |
|
1886 | delta = len(jm.name_with_symbols) - len(jm.complete) | |
1887 | yield Completion(start=offset - delta, |
|
1887 | yield Completion(start=offset - delta, | |
1888 | end=offset, |
|
1888 | end=offset, | |
1889 | text=jm.name_with_symbols, |
|
1889 | text=jm.name_with_symbols, | |
1890 | type='<unknown>', # don't compute type for speed |
|
1890 | type='<unknown>', # don't compute type for speed | |
1891 | _origin='jedi', |
|
1891 | _origin='jedi', | |
1892 | signature='') |
|
1892 | signature='') | |
1893 |
|
1893 | |||
1894 |
|
1894 | |||
1895 | start_offset = before.rfind(matched_text) |
|
1895 | start_offset = before.rfind(matched_text) | |
1896 |
|
1896 | |||
1897 | # TODO: |
|
1897 | # TODO: | |
1898 | # Suppress this, right now just for debug. |
|
1898 | # Suppress this, right now just for debug. | |
1899 | if jedi_matches and matches and self.debug: |
|
1899 | if jedi_matches and matches and self.debug: | |
1900 | yield Completion(start=start_offset, end=offset, text='--jedi/ipython--', |
|
1900 | yield Completion(start=start_offset, end=offset, text='--jedi/ipython--', | |
1901 | _origin='debug', type='none', signature='') |
|
1901 | _origin='debug', type='none', signature='') | |
1902 |
|
1902 | |||
1903 | # I'm unsure if this is always true, so let's assert and see if it |
|
1903 | # I'm unsure if this is always true, so let's assert and see if it | |
1904 | # crash |
|
1904 | # crash | |
1905 | assert before.endswith(matched_text) |
|
1905 | assert before.endswith(matched_text) | |
1906 | for m, t in zip(matches, matches_origin): |
|
1906 | for m, t in zip(matches, matches_origin): | |
1907 | yield Completion(start=start_offset, end=offset, text=m, _origin=t, signature='', type='<unknown>') |
|
1907 | yield Completion(start=start_offset, end=offset, text=m, _origin=t, signature='', type='<unknown>') | |
1908 |
|
1908 | |||
1909 |
|
1909 | |||
1910 | def complete(self, text=None, line_buffer=None, cursor_pos=None): |
|
1910 | def complete(self, text=None, line_buffer=None, cursor_pos=None): | |
1911 | """Find completions for the given text and line context. |
|
1911 | """Find completions for the given text and line context. | |
1912 |
|
1912 | |||
1913 | Note that both the text and the line_buffer are optional, but at least |
|
1913 | Note that both the text and the line_buffer are optional, but at least | |
1914 | one of them must be given. |
|
1914 | one of them must be given. | |
1915 |
|
1915 | |||
1916 | Parameters |
|
1916 | Parameters | |
1917 | ---------- |
|
1917 | ---------- | |
1918 | text : string, optional |
|
1918 | text : string, optional | |
1919 | Text to perform the completion on. If not given, the line buffer |
|
1919 | Text to perform the completion on. If not given, the line buffer | |
1920 | is split using the instance's CompletionSplitter object. |
|
1920 | is split using the instance's CompletionSplitter object. | |
1921 |
|
1921 | |||
1922 | line_buffer : string, optional |
|
1922 | line_buffer : string, optional | |
1923 | If not given, the completer attempts to obtain the current line |
|
1923 | If not given, the completer attempts to obtain the current line | |
1924 | buffer via readline. This keyword allows clients which are |
|
1924 | buffer via readline. This keyword allows clients which are | |
1925 | requesting for text completions in non-readline contexts to inform |
|
1925 | requesting for text completions in non-readline contexts to inform | |
1926 | the completer of the entire text. |
|
1926 | the completer of the entire text. | |
1927 |
|
1927 | |||
1928 | cursor_pos : int, optional |
|
1928 | cursor_pos : int, optional | |
1929 | Index of the cursor in the full line buffer. Should be provided by |
|
1929 | Index of the cursor in the full line buffer. Should be provided by | |
1930 | remote frontends where kernel has no access to frontend state. |
|
1930 | remote frontends where kernel has no access to frontend state. | |
1931 |
|
1931 | |||
1932 | Returns |
|
1932 | Returns | |
1933 | ------- |
|
1933 | ------- | |
1934 | text : str |
|
1934 | text : str | |
1935 | Text that was actually used in the completion. |
|
1935 | Text that was actually used in the completion. | |
1936 |
|
1936 | |||
1937 | matches : list |
|
1937 | matches : list | |
1938 | A list of completion matches. |
|
1938 | A list of completion matches. | |
1939 |
|
1939 | |||
1940 |
|
1940 | |||
1941 | .. note:: |
|
1941 | .. note:: | |
1942 |
|
1942 | |||
1943 | This API is likely to be deprecated and replaced by |
|
1943 | This API is likely to be deprecated and replaced by | |
1944 | :any:`IPCompleter.completions` in the future. |
|
1944 | :any:`IPCompleter.completions` in the future. | |
1945 |
|
1945 | |||
1946 |
|
1946 | |||
1947 | """ |
|
1947 | """ | |
1948 | warnings.warn('`Completer.complete` is pending deprecation since ' |
|
1948 | warnings.warn('`Completer.complete` is pending deprecation since ' | |
1949 | 'IPython 6.0 and will be replaced by `Completer.completions`.', |
|
1949 | 'IPython 6.0 and will be replaced by `Completer.completions`.', | |
1950 | PendingDeprecationWarning) |
|
1950 | PendingDeprecationWarning) | |
1951 | # potential todo, FOLD the 3rd throw away argument of _complete |
|
1951 | # potential todo, FOLD the 3rd throw away argument of _complete | |
1952 | # into the first 2 one. |
|
1952 | # into the first 2 one. | |
1953 | return self._complete(line_buffer=line_buffer, cursor_pos=cursor_pos, text=text, cursor_line=0)[:2] |
|
1953 | return self._complete(line_buffer=line_buffer, cursor_pos=cursor_pos, text=text, cursor_line=0)[:2] | |
1954 |
|
1954 | |||
1955 | def _complete(self, *, cursor_line, cursor_pos, line_buffer=None, text=None, |
|
1955 | def _complete(self, *, cursor_line, cursor_pos, line_buffer=None, text=None, | |
1956 | full_text=None) -> Tuple[str, List[str], List[str], Iterable[_FakeJediCompletion]]: |
|
1956 | full_text=None) -> Tuple[str, List[str], List[str], Iterable[_FakeJediCompletion]]: | |
1957 | """ |
|
1957 | """ | |
1958 |
|
1958 | |||
1959 | Like complete but can also returns raw jedi completions as well as the |
|
1959 | Like complete but can also returns raw jedi completions as well as the | |
1960 | origin of the completion text. This could (and should) be made much |
|
1960 | origin of the completion text. This could (and should) be made much | |
1961 | cleaner but that will be simpler once we drop the old (and stateful) |
|
1961 | cleaner but that will be simpler once we drop the old (and stateful) | |
1962 | :any:`complete` API. |
|
1962 | :any:`complete` API. | |
1963 |
|
1963 | |||
1964 |
|
1964 | |||
1965 | With current provisional API, cursor_pos act both (depending on the |
|
1965 | With current provisional API, cursor_pos act both (depending on the | |
1966 | caller) as the offset in the ``text`` or ``line_buffer``, or as the |
|
1966 | caller) as the offset in the ``text`` or ``line_buffer``, or as the | |
1967 | ``column`` when passing multiline strings this could/should be renamed |
|
1967 | ``column`` when passing multiline strings this could/should be renamed | |
1968 | but would add extra noise. |
|
1968 | but would add extra noise. | |
1969 | """ |
|
1969 | """ | |
1970 |
|
1970 | |||
1971 | # if the cursor position isn't given, the only sane assumption we can |
|
1971 | # if the cursor position isn't given, the only sane assumption we can | |
1972 | # make is that it's at the end of the line (the common case) |
|
1972 | # make is that it's at the end of the line (the common case) | |
1973 | if cursor_pos is None: |
|
1973 | if cursor_pos is None: | |
1974 | cursor_pos = len(line_buffer) if text is None else len(text) |
|
1974 | cursor_pos = len(line_buffer) if text is None else len(text) | |
1975 |
|
1975 | |||
1976 | if self.use_main_ns: |
|
1976 | if self.use_main_ns: | |
1977 | self.namespace = __main__.__dict__ |
|
1977 | self.namespace = __main__.__dict__ | |
1978 |
|
1978 | |||
1979 | # if text is either None or an empty string, rely on the line buffer |
|
1979 | # if text is either None or an empty string, rely on the line buffer | |
1980 | if (not line_buffer) and full_text: |
|
1980 | if (not line_buffer) and full_text: | |
1981 | line_buffer = full_text.split('\n')[cursor_line] |
|
1981 | line_buffer = full_text.split('\n')[cursor_line] | |
1982 | if not text: |
|
1982 | if not text: | |
1983 | text = self.splitter.split_line(line_buffer, cursor_pos) |
|
1983 | text = self.splitter.split_line(line_buffer, cursor_pos) | |
1984 |
|
1984 | |||
1985 | if self.backslash_combining_completions: |
|
1985 | if self.backslash_combining_completions: | |
1986 | # allow deactivation of these on windows. |
|
1986 | # allow deactivation of these on windows. | |
1987 | base_text = text if not line_buffer else line_buffer[:cursor_pos] |
|
1987 | base_text = text if not line_buffer else line_buffer[:cursor_pos] | |
1988 | latex_text, latex_matches = self.latex_matches(base_text) |
|
1988 | latex_text, latex_matches = self.latex_matches(base_text) | |
1989 | if latex_matches: |
|
1989 | if latex_matches: | |
1990 | return latex_text, latex_matches, ['latex_matches']*len(latex_matches), () |
|
1990 | return latex_text, latex_matches, ['latex_matches']*len(latex_matches), () | |
1991 | name_text = '' |
|
1991 | name_text = '' | |
1992 | name_matches = [] |
|
1992 | name_matches = [] | |
1993 | # need to add self.fwd_unicode_match() function here when done |
|
1993 | # need to add self.fwd_unicode_match() function here when done | |
1994 | for meth in (self.unicode_name_matches, back_latex_name_matches, back_unicode_name_matches, self.fwd_unicode_match): |
|
1994 | for meth in (self.unicode_name_matches, back_latex_name_matches, back_unicode_name_matches, self.fwd_unicode_match): | |
1995 | name_text, name_matches = meth(base_text) |
|
1995 | name_text, name_matches = meth(base_text) | |
1996 | if name_text: |
|
1996 | if name_text: | |
1997 | return name_text, name_matches[:MATCHES_LIMIT], \ |
|
1997 | return name_text, name_matches[:MATCHES_LIMIT], \ | |
1998 | [meth.__qualname__]*min(len(name_matches), MATCHES_LIMIT), () |
|
1998 | [meth.__qualname__]*min(len(name_matches), MATCHES_LIMIT), () | |
1999 |
|
1999 | |||
2000 |
|
2000 | |||
2001 | # If no line buffer is given, assume the input text is all there was |
|
2001 | # If no line buffer is given, assume the input text is all there was | |
2002 | if line_buffer is None: |
|
2002 | if line_buffer is None: | |
2003 | line_buffer = text |
|
2003 | line_buffer = text | |
2004 |
|
2004 | |||
2005 | self.line_buffer = line_buffer |
|
2005 | self.line_buffer = line_buffer | |
2006 | self.text_until_cursor = self.line_buffer[:cursor_pos] |
|
2006 | self.text_until_cursor = self.line_buffer[:cursor_pos] | |
2007 |
|
2007 | |||
2008 | # Do magic arg matches |
|
2008 | # Do magic arg matches | |
2009 | for matcher in self.magic_arg_matchers: |
|
2009 | for matcher in self.magic_arg_matchers: | |
2010 | matches = list(matcher(line_buffer))[:MATCHES_LIMIT] |
|
2010 | matches = list(matcher(line_buffer))[:MATCHES_LIMIT] | |
2011 | if matches: |
|
2011 | if matches: | |
2012 | origins = [matcher.__qualname__] * len(matches) |
|
2012 | origins = [matcher.__qualname__] * len(matches) | |
2013 | return text, matches, origins, () |
|
2013 | return text, matches, origins, () | |
2014 |
|
2014 | |||
2015 | # Start with a clean slate of completions |
|
2015 | # Start with a clean slate of completions | |
2016 | matches = [] |
|
2016 | matches = [] | |
2017 |
|
2017 | |||
2018 | # FIXME: we should extend our api to return a dict with completions for |
|
2018 | # FIXME: we should extend our api to return a dict with completions for | |
2019 | # different types of objects. The rlcomplete() method could then |
|
2019 | # different types of objects. The rlcomplete() method could then | |
2020 | # simply collapse the dict into a list for readline, but we'd have |
|
2020 | # simply collapse the dict into a list for readline, but we'd have | |
2021 | # richer completion semantics in other environments. |
|
2021 | # richer completion semantics in other environments. | |
2022 | completions = () |
|
2022 | completions = () | |
2023 | if self.use_jedi: |
|
2023 | if self.use_jedi: | |
2024 | if not full_text: |
|
2024 | if not full_text: | |
2025 | full_text = line_buffer |
|
2025 | full_text = line_buffer | |
2026 | completions = self._jedi_matches( |
|
2026 | completions = self._jedi_matches( | |
2027 | cursor_pos, cursor_line, full_text) |
|
2027 | cursor_pos, cursor_line, full_text) | |
2028 |
|
2028 | |||
2029 | if self.merge_completions: |
|
2029 | if self.merge_completions: | |
2030 | matches = [] |
|
2030 | matches = [] | |
2031 | for matcher in self.matchers: |
|
2031 | for matcher in self.matchers: | |
2032 | try: |
|
2032 | try: | |
2033 | matches.extend([(m, matcher.__qualname__) |
|
2033 | matches.extend([(m, matcher.__qualname__) | |
2034 | for m in matcher(text)]) |
|
2034 | for m in matcher(text)]) | |
2035 | except: |
|
2035 | except: | |
2036 | # Show the ugly traceback if the matcher causes an |
|
2036 | # Show the ugly traceback if the matcher causes an | |
2037 | # exception, but do NOT crash the kernel! |
|
2037 | # exception, but do NOT crash the kernel! | |
2038 | sys.excepthook(*sys.exc_info()) |
|
2038 | sys.excepthook(*sys.exc_info()) | |
2039 | else: |
|
2039 | else: | |
2040 | for matcher in self.matchers: |
|
2040 | for matcher in self.matchers: | |
2041 | matches = [(m, matcher.__qualname__) |
|
2041 | matches = [(m, matcher.__qualname__) | |
2042 | for m in matcher(text)] |
|
2042 | for m in matcher(text)] | |
2043 | if matches: |
|
2043 | if matches: | |
2044 | break |
|
2044 | break | |
2045 |
|
2045 | |||
2046 | seen = set() |
|
2046 | seen = set() | |
2047 | filtered_matches = set() |
|
2047 | filtered_matches = set() | |
2048 | for m in matches: |
|
2048 | for m in matches: | |
2049 | t, c = m |
|
2049 | t, c = m | |
2050 | if t not in seen: |
|
2050 | if t not in seen: | |
2051 | filtered_matches.add(m) |
|
2051 | filtered_matches.add(m) | |
2052 | seen.add(t) |
|
2052 | seen.add(t) | |
2053 |
|
2053 | |||
2054 | _filtered_matches = sorted(filtered_matches, key=lambda x: completions_sorting_key(x[0])) |
|
2054 | _filtered_matches = sorted(filtered_matches, key=lambda x: completions_sorting_key(x[0])) | |
2055 |
|
2055 | |||
2056 | custom_res = [(m, 'custom') for m in self.dispatch_custom_completer(text) or []] |
|
2056 | custom_res = [(m, 'custom') for m in self.dispatch_custom_completer(text) or []] | |
2057 |
|
2057 | |||
2058 | _filtered_matches = custom_res or _filtered_matches |
|
2058 | _filtered_matches = custom_res or _filtered_matches | |
2059 |
|
2059 | |||
2060 | _filtered_matches = _filtered_matches[:MATCHES_LIMIT] |
|
2060 | _filtered_matches = _filtered_matches[:MATCHES_LIMIT] | |
2061 | _matches = [m[0] for m in _filtered_matches] |
|
2061 | _matches = [m[0] for m in _filtered_matches] | |
2062 | origins = [m[1] for m in _filtered_matches] |
|
2062 | origins = [m[1] for m in _filtered_matches] | |
2063 |
|
2063 | |||
2064 | self.matches = _matches |
|
2064 | self.matches = _matches | |
2065 |
|
2065 | |||
2066 | return text, _matches, origins, completions |
|
2066 | return text, _matches, origins, completions | |
2067 |
|
2067 | |||
2068 | def fwd_unicode_match(self, text:str) -> Tuple[str, list]: |
|
2068 | def fwd_unicode_match(self, text:str) -> Tuple[str, list]: | |
2069 | if self._names is None: |
|
2069 | if self._names is None: | |
2070 | self._names = [] |
|
2070 | self._names = [] | |
2071 | for c in range(0,0x10FFFF + 1): |
|
2071 | for c in range(0,0x10FFFF + 1): | |
2072 | try: |
|
2072 | try: | |
2073 | self._names.append(unicodedata.name(chr(c))) |
|
2073 | self._names.append(unicodedata.name(chr(c))) | |
2074 | except ValueError: |
|
2074 | except ValueError: | |
2075 | pass |
|
2075 | pass | |
2076 |
|
2076 | |||
2077 | slashpos = text.rfind('\\') |
|
2077 | slashpos = text.rfind('\\') | |
2078 | # if text starts with slash |
|
2078 | # if text starts with slash | |
2079 | if slashpos > -1: |
|
2079 | if slashpos > -1: | |
2080 | s = text[slashpos+1:] |
|
2080 | s = text[slashpos+1:] | |
2081 | candidates = [x for x in self._names if x.startswith(s)] |
|
2081 | candidates = [x for x in self._names if x.startswith(s)] | |
2082 | if candidates: |
|
2082 | if candidates: | |
2083 | return s, candidates |
|
2083 | return s, candidates | |
2084 | else: |
|
2084 | else: | |
2085 | return '', () |
|
2085 | return '', () | |
2086 |
|
2086 | |||
2087 | # if text does not start with slash |
|
2087 | # if text does not start with slash | |
2088 | else: |
|
2088 | else: | |
2089 | return u'', () |
|
2089 | return u'', () |
@@ -1,138 +1,138 b'' | |||||
1 | """An interface for publishing rich data to frontends. |
|
1 | """An interface for publishing rich data to frontends. | |
2 |
|
2 | |||
3 | There are two components of the display system: |
|
3 | There are two components of the display system: | |
4 |
|
4 | |||
5 | * Display formatters, which take a Python object and compute the |
|
5 | * Display formatters, which take a Python object and compute the | |
6 | representation of the object in various formats (text, HTML, SVG, etc.). |
|
6 | representation of the object in various formats (text, HTML, SVG, etc.). | |
7 | * The display publisher that is used to send the representation data to the |
|
7 | * The display publisher that is used to send the representation data to the | |
8 | various frontends. |
|
8 | various frontends. | |
9 |
|
9 | |||
10 | This module defines the logic display publishing. The display publisher uses |
|
10 | This module defines the logic display publishing. The display publisher uses | |
11 | the ``display_data`` message type that is defined in the IPython messaging |
|
11 | the ``display_data`` message type that is defined in the IPython messaging | |
12 | spec. |
|
12 | spec. | |
13 | """ |
|
13 | """ | |
14 |
|
14 | |||
15 | # Copyright (c) IPython Development Team. |
|
15 | # Copyright (c) IPython Development Team. | |
16 | # Distributed under the terms of the Modified BSD License. |
|
16 | # Distributed under the terms of the Modified BSD License. | |
17 |
|
17 | |||
18 |
|
18 | |||
19 | import sys |
|
19 | import sys | |
20 |
|
20 | |||
21 | from traitlets.config.configurable import Configurable |
|
21 | from traitlets.config.configurable import Configurable | |
22 |
from traitlets import List |
|
22 | from traitlets import List | |
23 |
|
23 | |||
24 | # This used to be defined here - it is imported for backwards compatibility |
|
24 | # This used to be defined here - it is imported for backwards compatibility | |
25 | from .display import publish_display_data |
|
25 | from .display import publish_display_data | |
26 |
|
26 | |||
27 | #----------------------------------------------------------------------------- |
|
27 | #----------------------------------------------------------------------------- | |
28 | # Main payload class |
|
28 | # Main payload class | |
29 | #----------------------------------------------------------------------------- |
|
29 | #----------------------------------------------------------------------------- | |
30 |
|
30 | |||
31 |
|
31 | |||
32 | class DisplayPublisher(Configurable): |
|
32 | class DisplayPublisher(Configurable): | |
33 | """A traited class that publishes display data to frontends. |
|
33 | """A traited class that publishes display data to frontends. | |
34 |
|
34 | |||
35 | Instances of this class are created by the main IPython object and should |
|
35 | Instances of this class are created by the main IPython object and should | |
36 | be accessed there. |
|
36 | be accessed there. | |
37 | """ |
|
37 | """ | |
38 |
|
38 | |||
39 | def __init__(self, shell=None, *args, **kwargs): |
|
39 | def __init__(self, shell=None, *args, **kwargs): | |
40 | self.shell = shell |
|
40 | self.shell = shell | |
41 | super().__init__(*args, **kwargs) |
|
41 | super().__init__(*args, **kwargs) | |
42 |
|
42 | |||
43 | def _validate_data(self, data, metadata=None): |
|
43 | def _validate_data(self, data, metadata=None): | |
44 | """Validate the display data. |
|
44 | """Validate the display data. | |
45 |
|
45 | |||
46 | Parameters |
|
46 | Parameters | |
47 | ---------- |
|
47 | ---------- | |
48 | data : dict |
|
48 | data : dict | |
49 | The formata data dictionary. |
|
49 | The formata data dictionary. | |
50 | metadata : dict |
|
50 | metadata : dict | |
51 | Any metadata for the data. |
|
51 | Any metadata for the data. | |
52 | """ |
|
52 | """ | |
53 |
|
53 | |||
54 | if not isinstance(data, dict): |
|
54 | if not isinstance(data, dict): | |
55 | raise TypeError('data must be a dict, got: %r' % data) |
|
55 | raise TypeError('data must be a dict, got: %r' % data) | |
56 | if metadata is not None: |
|
56 | if metadata is not None: | |
57 | if not isinstance(metadata, dict): |
|
57 | if not isinstance(metadata, dict): | |
58 | raise TypeError('metadata must be a dict, got: %r' % data) |
|
58 | raise TypeError('metadata must be a dict, got: %r' % data) | |
59 |
|
59 | |||
60 | # use * to indicate transient, update are keyword-only |
|
60 | # use * to indicate transient, update are keyword-only | |
61 | def publish(self, data, metadata=None, source=None, *, transient=None, update=False, **kwargs) -> None: |
|
61 | def publish(self, data, metadata=None, source=None, *, transient=None, update=False, **kwargs) -> None: | |
62 | """Publish data and metadata to all frontends. |
|
62 | """Publish data and metadata to all frontends. | |
63 |
|
63 | |||
64 | See the ``display_data`` message in the messaging documentation for |
|
64 | See the ``display_data`` message in the messaging documentation for | |
65 | more details about this message type. |
|
65 | more details about this message type. | |
66 |
|
66 | |||
67 | The following MIME types are currently implemented: |
|
67 | The following MIME types are currently implemented: | |
68 |
|
68 | |||
69 | * text/plain |
|
69 | * text/plain | |
70 | * text/html |
|
70 | * text/html | |
71 | * text/markdown |
|
71 | * text/markdown | |
72 | * text/latex |
|
72 | * text/latex | |
73 | * application/json |
|
73 | * application/json | |
74 | * application/javascript |
|
74 | * application/javascript | |
75 | * image/png |
|
75 | * image/png | |
76 | * image/jpeg |
|
76 | * image/jpeg | |
77 | * image/svg+xml |
|
77 | * image/svg+xml | |
78 |
|
78 | |||
79 | Parameters |
|
79 | Parameters | |
80 | ---------- |
|
80 | ---------- | |
81 | data : dict |
|
81 | data : dict | |
82 | A dictionary having keys that are valid MIME types (like |
|
82 | A dictionary having keys that are valid MIME types (like | |
83 | 'text/plain' or 'image/svg+xml') and values that are the data for |
|
83 | 'text/plain' or 'image/svg+xml') and values that are the data for | |
84 | that MIME type. The data itself must be a JSON'able data |
|
84 | that MIME type. The data itself must be a JSON'able data | |
85 | structure. Minimally all data should have the 'text/plain' data, |
|
85 | structure. Minimally all data should have the 'text/plain' data, | |
86 | which can be displayed by all frontends. If more than the plain |
|
86 | which can be displayed by all frontends. If more than the plain | |
87 | text is given, it is up to the frontend to decide which |
|
87 | text is given, it is up to the frontend to decide which | |
88 | representation to use. |
|
88 | representation to use. | |
89 | metadata : dict |
|
89 | metadata : dict | |
90 | A dictionary for metadata related to the data. This can contain |
|
90 | A dictionary for metadata related to the data. This can contain | |
91 | arbitrary key, value pairs that frontends can use to interpret |
|
91 | arbitrary key, value pairs that frontends can use to interpret | |
92 | the data. Metadata specific to each mime-type can be specified |
|
92 | the data. Metadata specific to each mime-type can be specified | |
93 | in the metadata dict with the same mime-type keys as |
|
93 | in the metadata dict with the same mime-type keys as | |
94 | the data itself. |
|
94 | the data itself. | |
95 | source : str, deprecated |
|
95 | source : str, deprecated | |
96 | Unused. |
|
96 | Unused. | |
97 | transient: dict, keyword-only |
|
97 | transient: dict, keyword-only | |
98 | A dictionary for transient data. |
|
98 | A dictionary for transient data. | |
99 | Data in this dictionary should not be persisted as part of saving this output. |
|
99 | Data in this dictionary should not be persisted as part of saving this output. | |
100 | Examples include 'display_id'. |
|
100 | Examples include 'display_id'. | |
101 | update: bool, keyword-only, default: False |
|
101 | update: bool, keyword-only, default: False | |
102 | If True, only update existing outputs with the same display_id, |
|
102 | If True, only update existing outputs with the same display_id, | |
103 | rather than creating a new output. |
|
103 | rather than creating a new output. | |
104 | """ |
|
104 | """ | |
105 |
|
105 | |||
106 | handlers = {} |
|
106 | handlers = {} | |
107 | if self.shell is not None: |
|
107 | if self.shell is not None: | |
108 | handlers = getattr(self.shell, 'mime_renderers', {}) |
|
108 | handlers = getattr(self.shell, 'mime_renderers', {}) | |
109 |
|
109 | |||
110 | for mime, handler in handlers.items(): |
|
110 | for mime, handler in handlers.items(): | |
111 | if mime in data: |
|
111 | if mime in data: | |
112 | handler(data[mime], metadata.get(mime, None)) |
|
112 | handler(data[mime], metadata.get(mime, None)) | |
113 | return |
|
113 | return | |
114 |
|
114 | |||
115 | if 'text/plain' in data: |
|
115 | if 'text/plain' in data: | |
116 | print(data['text/plain']) |
|
116 | print(data['text/plain']) | |
117 |
|
117 | |||
118 | def clear_output(self, wait=False): |
|
118 | def clear_output(self, wait=False): | |
119 | """Clear the output of the cell receiving output.""" |
|
119 | """Clear the output of the cell receiving output.""" | |
120 | print('\033[2K\r', end='') |
|
120 | print('\033[2K\r', end='') | |
121 | sys.stdout.flush() |
|
121 | sys.stdout.flush() | |
122 | print('\033[2K\r', end='') |
|
122 | print('\033[2K\r', end='') | |
123 | sys.stderr.flush() |
|
123 | sys.stderr.flush() | |
124 |
|
124 | |||
125 |
|
125 | |||
126 | class CapturingDisplayPublisher(DisplayPublisher): |
|
126 | class CapturingDisplayPublisher(DisplayPublisher): | |
127 | """A DisplayPublisher that stores""" |
|
127 | """A DisplayPublisher that stores""" | |
128 | outputs = List() |
|
128 | outputs = List() | |
129 |
|
129 | |||
130 | def publish(self, data, metadata=None, source=None, *, transient=None, update=False): |
|
130 | def publish(self, data, metadata=None, source=None, *, transient=None, update=False): | |
131 | self.outputs.append({'data':data, 'metadata':metadata, |
|
131 | self.outputs.append({'data':data, 'metadata':metadata, | |
132 | 'transient':transient, 'update':update}) |
|
132 | 'transient':transient, 'update':update}) | |
133 |
|
133 | |||
134 | def clear_output(self, wait=False): |
|
134 | def clear_output(self, wait=False): | |
135 | super(CapturingDisplayPublisher, self).clear_output(wait) |
|
135 | super(CapturingDisplayPublisher, self).clear_output(wait) | |
136 |
|
136 | |||
137 | # empty the list, *do not* reassign a new list |
|
137 | # empty the list, *do not* reassign a new list | |
138 | self.outputs.clear() |
|
138 | self.outputs.clear() |
1 | NO CONTENT: modified file |
|
NO CONTENT: modified file | ||
The requested commit or file is too big and content was truncated. Show full diff |
@@ -1,652 +1,651 b'' | |||||
1 | """Implementation of basic magic functions.""" |
|
1 | """Implementation of basic magic functions.""" | |
2 |
|
2 | |||
3 |
|
3 | |||
4 | import argparse |
|
4 | import argparse | |
5 | from logging import error |
|
5 | from logging import error | |
6 | import io |
|
6 | import io | |
7 | from pprint import pformat |
|
7 | from pprint import pformat | |
8 | import textwrap |
|
|||
9 | import sys |
|
8 | import sys | |
10 | from warnings import warn |
|
9 | from warnings import warn | |
11 |
|
10 | |||
12 | from traitlets.utils.importstring import import_item |
|
11 | from traitlets.utils.importstring import import_item | |
13 | from IPython.core import magic_arguments, page |
|
12 | from IPython.core import magic_arguments, page | |
14 | from IPython.core.error import UsageError |
|
13 | from IPython.core.error import UsageError | |
15 | from IPython.core.magic import Magics, magics_class, line_magic, magic_escapes |
|
14 | from IPython.core.magic import Magics, magics_class, line_magic, magic_escapes | |
16 | from IPython.utils.text import format_screen, dedent, indent |
|
15 | from IPython.utils.text import format_screen, dedent, indent | |
17 | from IPython.testing.skipdoctest import skip_doctest |
|
16 | from IPython.testing.skipdoctest import skip_doctest | |
18 | from IPython.utils.ipstruct import Struct |
|
17 | from IPython.utils.ipstruct import Struct | |
19 |
|
18 | |||
20 |
|
19 | |||
21 | class MagicsDisplay(object): |
|
20 | class MagicsDisplay(object): | |
22 | def __init__(self, magics_manager, ignore=None): |
|
21 | def __init__(self, magics_manager, ignore=None): | |
23 | self.ignore = ignore if ignore else [] |
|
22 | self.ignore = ignore if ignore else [] | |
24 | self.magics_manager = magics_manager |
|
23 | self.magics_manager = magics_manager | |
25 |
|
24 | |||
26 | def _lsmagic(self): |
|
25 | def _lsmagic(self): | |
27 | """The main implementation of the %lsmagic""" |
|
26 | """The main implementation of the %lsmagic""" | |
28 | mesc = magic_escapes['line'] |
|
27 | mesc = magic_escapes['line'] | |
29 | cesc = magic_escapes['cell'] |
|
28 | cesc = magic_escapes['cell'] | |
30 | mman = self.magics_manager |
|
29 | mman = self.magics_manager | |
31 | magics = mman.lsmagic() |
|
30 | magics = mman.lsmagic() | |
32 | out = ['Available line magics:', |
|
31 | out = ['Available line magics:', | |
33 | mesc + (' '+mesc).join(sorted([m for m,v in magics['line'].items() if (v not in self.ignore)])), |
|
32 | mesc + (' '+mesc).join(sorted([m for m,v in magics['line'].items() if (v not in self.ignore)])), | |
34 | '', |
|
33 | '', | |
35 | 'Available cell magics:', |
|
34 | 'Available cell magics:', | |
36 | cesc + (' '+cesc).join(sorted([m for m,v in magics['cell'].items() if (v not in self.ignore)])), |
|
35 | cesc + (' '+cesc).join(sorted([m for m,v in magics['cell'].items() if (v not in self.ignore)])), | |
37 | '', |
|
36 | '', | |
38 | mman.auto_status()] |
|
37 | mman.auto_status()] | |
39 | return '\n'.join(out) |
|
38 | return '\n'.join(out) | |
40 |
|
39 | |||
41 | def _repr_pretty_(self, p, cycle): |
|
40 | def _repr_pretty_(self, p, cycle): | |
42 | p.text(self._lsmagic()) |
|
41 | p.text(self._lsmagic()) | |
43 |
|
42 | |||
44 | def __str__(self): |
|
43 | def __str__(self): | |
45 | return self._lsmagic() |
|
44 | return self._lsmagic() | |
46 |
|
45 | |||
47 | def _jsonable(self): |
|
46 | def _jsonable(self): | |
48 | """turn magics dict into jsonable dict of the same structure |
|
47 | """turn magics dict into jsonable dict of the same structure | |
49 |
|
48 | |||
50 | replaces object instances with their class names as strings |
|
49 | replaces object instances with their class names as strings | |
51 | """ |
|
50 | """ | |
52 | magic_dict = {} |
|
51 | magic_dict = {} | |
53 | mman = self.magics_manager |
|
52 | mman = self.magics_manager | |
54 | magics = mman.lsmagic() |
|
53 | magics = mman.lsmagic() | |
55 | for key, subdict in magics.items(): |
|
54 | for key, subdict in magics.items(): | |
56 | d = {} |
|
55 | d = {} | |
57 | magic_dict[key] = d |
|
56 | magic_dict[key] = d | |
58 | for name, obj in subdict.items(): |
|
57 | for name, obj in subdict.items(): | |
59 | try: |
|
58 | try: | |
60 | classname = obj.__self__.__class__.__name__ |
|
59 | classname = obj.__self__.__class__.__name__ | |
61 | except AttributeError: |
|
60 | except AttributeError: | |
62 | classname = 'Other' |
|
61 | classname = 'Other' | |
63 |
|
62 | |||
64 | d[name] = classname |
|
63 | d[name] = classname | |
65 | return magic_dict |
|
64 | return magic_dict | |
66 |
|
65 | |||
67 | def _repr_json_(self): |
|
66 | def _repr_json_(self): | |
68 | return self._jsonable() |
|
67 | return self._jsonable() | |
69 |
|
68 | |||
70 |
|
69 | |||
71 | @magics_class |
|
70 | @magics_class | |
72 | class BasicMagics(Magics): |
|
71 | class BasicMagics(Magics): | |
73 | """Magics that provide central IPython functionality. |
|
72 | """Magics that provide central IPython functionality. | |
74 |
|
73 | |||
75 | These are various magics that don't fit into specific categories but that |
|
74 | These are various magics that don't fit into specific categories but that | |
76 | are all part of the base 'IPython experience'.""" |
|
75 | are all part of the base 'IPython experience'.""" | |
77 |
|
76 | |||
78 | @magic_arguments.magic_arguments() |
|
77 | @magic_arguments.magic_arguments() | |
79 | @magic_arguments.argument( |
|
78 | @magic_arguments.argument( | |
80 | '-l', '--line', action='store_true', |
|
79 | '-l', '--line', action='store_true', | |
81 | help="""Create a line magic alias.""" |
|
80 | help="""Create a line magic alias.""" | |
82 | ) |
|
81 | ) | |
83 | @magic_arguments.argument( |
|
82 | @magic_arguments.argument( | |
84 | '-c', '--cell', action='store_true', |
|
83 | '-c', '--cell', action='store_true', | |
85 | help="""Create a cell magic alias.""" |
|
84 | help="""Create a cell magic alias.""" | |
86 | ) |
|
85 | ) | |
87 | @magic_arguments.argument( |
|
86 | @magic_arguments.argument( | |
88 | 'name', |
|
87 | 'name', | |
89 | help="""Name of the magic to be created.""" |
|
88 | help="""Name of the magic to be created.""" | |
90 | ) |
|
89 | ) | |
91 | @magic_arguments.argument( |
|
90 | @magic_arguments.argument( | |
92 | 'target', |
|
91 | 'target', | |
93 | help="""Name of the existing line or cell magic.""" |
|
92 | help="""Name of the existing line or cell magic.""" | |
94 | ) |
|
93 | ) | |
95 | @magic_arguments.argument( |
|
94 | @magic_arguments.argument( | |
96 | '-p', '--params', default=None, |
|
95 | '-p', '--params', default=None, | |
97 | help="""Parameters passed to the magic function.""" |
|
96 | help="""Parameters passed to the magic function.""" | |
98 | ) |
|
97 | ) | |
99 | @line_magic |
|
98 | @line_magic | |
100 | def alias_magic(self, line=''): |
|
99 | def alias_magic(self, line=''): | |
101 | """Create an alias for an existing line or cell magic. |
|
100 | """Create an alias for an existing line or cell magic. | |
102 |
|
101 | |||
103 | Examples |
|
102 | Examples | |
104 | -------- |
|
103 | -------- | |
105 | :: |
|
104 | :: | |
106 |
|
105 | |||
107 | In [1]: %alias_magic t timeit |
|
106 | In [1]: %alias_magic t timeit | |
108 | Created `%t` as an alias for `%timeit`. |
|
107 | Created `%t` as an alias for `%timeit`. | |
109 | Created `%%t` as an alias for `%%timeit`. |
|
108 | Created `%%t` as an alias for `%%timeit`. | |
110 |
|
109 | |||
111 | In [2]: %t -n1 pass |
|
110 | In [2]: %t -n1 pass | |
112 | 1 loops, best of 3: 954 ns per loop |
|
111 | 1 loops, best of 3: 954 ns per loop | |
113 |
|
112 | |||
114 | In [3]: %%t -n1 |
|
113 | In [3]: %%t -n1 | |
115 | ...: pass |
|
114 | ...: pass | |
116 | ...: |
|
115 | ...: | |
117 | 1 loops, best of 3: 954 ns per loop |
|
116 | 1 loops, best of 3: 954 ns per loop | |
118 |
|
117 | |||
119 | In [4]: %alias_magic --cell whereami pwd |
|
118 | In [4]: %alias_magic --cell whereami pwd | |
120 | UsageError: Cell magic function `%%pwd` not found. |
|
119 | UsageError: Cell magic function `%%pwd` not found. | |
121 | In [5]: %alias_magic --line whereami pwd |
|
120 | In [5]: %alias_magic --line whereami pwd | |
122 | Created `%whereami` as an alias for `%pwd`. |
|
121 | Created `%whereami` as an alias for `%pwd`. | |
123 |
|
122 | |||
124 | In [6]: %whereami |
|
123 | In [6]: %whereami | |
125 | Out[6]: u'/home/testuser' |
|
124 | Out[6]: u'/home/testuser' | |
126 |
|
125 | |||
127 | In [7]: %alias_magic h history "-p -l 30" --line |
|
126 | In [7]: %alias_magic h history "-p -l 30" --line | |
128 | Created `%h` as an alias for `%history -l 30`. |
|
127 | Created `%h` as an alias for `%history -l 30`. | |
129 | """ |
|
128 | """ | |
130 |
|
129 | |||
131 | args = magic_arguments.parse_argstring(self.alias_magic, line) |
|
130 | args = magic_arguments.parse_argstring(self.alias_magic, line) | |
132 | shell = self.shell |
|
131 | shell = self.shell | |
133 | mman = self.shell.magics_manager |
|
132 | mman = self.shell.magics_manager | |
134 | escs = ''.join(magic_escapes.values()) |
|
133 | escs = ''.join(magic_escapes.values()) | |
135 |
|
134 | |||
136 | target = args.target.lstrip(escs) |
|
135 | target = args.target.lstrip(escs) | |
137 | name = args.name.lstrip(escs) |
|
136 | name = args.name.lstrip(escs) | |
138 |
|
137 | |||
139 | params = args.params |
|
138 | params = args.params | |
140 | if (params and |
|
139 | if (params and | |
141 | ((params.startswith('"') and params.endswith('"')) |
|
140 | ((params.startswith('"') and params.endswith('"')) | |
142 | or (params.startswith("'") and params.endswith("'")))): |
|
141 | or (params.startswith("'") and params.endswith("'")))): | |
143 | params = params[1:-1] |
|
142 | params = params[1:-1] | |
144 |
|
143 | |||
145 | # Find the requested magics. |
|
144 | # Find the requested magics. | |
146 | m_line = shell.find_magic(target, 'line') |
|
145 | m_line = shell.find_magic(target, 'line') | |
147 | m_cell = shell.find_magic(target, 'cell') |
|
146 | m_cell = shell.find_magic(target, 'cell') | |
148 | if args.line and m_line is None: |
|
147 | if args.line and m_line is None: | |
149 | raise UsageError('Line magic function `%s%s` not found.' % |
|
148 | raise UsageError('Line magic function `%s%s` not found.' % | |
150 | (magic_escapes['line'], target)) |
|
149 | (magic_escapes['line'], target)) | |
151 | if args.cell and m_cell is None: |
|
150 | if args.cell and m_cell is None: | |
152 | raise UsageError('Cell magic function `%s%s` not found.' % |
|
151 | raise UsageError('Cell magic function `%s%s` not found.' % | |
153 | (magic_escapes['cell'], target)) |
|
152 | (magic_escapes['cell'], target)) | |
154 |
|
153 | |||
155 | # If --line and --cell are not specified, default to the ones |
|
154 | # If --line and --cell are not specified, default to the ones | |
156 | # that are available. |
|
155 | # that are available. | |
157 | if not args.line and not args.cell: |
|
156 | if not args.line and not args.cell: | |
158 | if not m_line and not m_cell: |
|
157 | if not m_line and not m_cell: | |
159 | raise UsageError( |
|
158 | raise UsageError( | |
160 | 'No line or cell magic with name `%s` found.' % target |
|
159 | 'No line or cell magic with name `%s` found.' % target | |
161 | ) |
|
160 | ) | |
162 | args.line = bool(m_line) |
|
161 | args.line = bool(m_line) | |
163 | args.cell = bool(m_cell) |
|
162 | args.cell = bool(m_cell) | |
164 |
|
163 | |||
165 | params_str = "" if params is None else " " + params |
|
164 | params_str = "" if params is None else " " + params | |
166 |
|
165 | |||
167 | if args.line: |
|
166 | if args.line: | |
168 | mman.register_alias(name, target, 'line', params) |
|
167 | mman.register_alias(name, target, 'line', params) | |
169 | print('Created `%s%s` as an alias for `%s%s%s`.' % ( |
|
168 | print('Created `%s%s` as an alias for `%s%s%s`.' % ( | |
170 | magic_escapes['line'], name, |
|
169 | magic_escapes['line'], name, | |
171 | magic_escapes['line'], target, params_str)) |
|
170 | magic_escapes['line'], target, params_str)) | |
172 |
|
171 | |||
173 | if args.cell: |
|
172 | if args.cell: | |
174 | mman.register_alias(name, target, 'cell', params) |
|
173 | mman.register_alias(name, target, 'cell', params) | |
175 | print('Created `%s%s` as an alias for `%s%s%s`.' % ( |
|
174 | print('Created `%s%s` as an alias for `%s%s%s`.' % ( | |
176 | magic_escapes['cell'], name, |
|
175 | magic_escapes['cell'], name, | |
177 | magic_escapes['cell'], target, params_str)) |
|
176 | magic_escapes['cell'], target, params_str)) | |
178 |
|
177 | |||
179 | @line_magic |
|
178 | @line_magic | |
180 | def lsmagic(self, parameter_s=''): |
|
179 | def lsmagic(self, parameter_s=''): | |
181 | """List currently available magic functions.""" |
|
180 | """List currently available magic functions.""" | |
182 | return MagicsDisplay(self.shell.magics_manager, ignore=[]) |
|
181 | return MagicsDisplay(self.shell.magics_manager, ignore=[]) | |
183 |
|
182 | |||
184 | def _magic_docs(self, brief=False, rest=False): |
|
183 | def _magic_docs(self, brief=False, rest=False): | |
185 | """Return docstrings from magic functions.""" |
|
184 | """Return docstrings from magic functions.""" | |
186 | mman = self.shell.magics_manager |
|
185 | mman = self.shell.magics_manager | |
187 | docs = mman.lsmagic_docs(brief, missing='No documentation') |
|
186 | docs = mman.lsmagic_docs(brief, missing='No documentation') | |
188 |
|
187 | |||
189 | if rest: |
|
188 | if rest: | |
190 | format_string = '**%s%s**::\n\n%s\n\n' |
|
189 | format_string = '**%s%s**::\n\n%s\n\n' | |
191 | else: |
|
190 | else: | |
192 | format_string = '%s%s:\n%s\n' |
|
191 | format_string = '%s%s:\n%s\n' | |
193 |
|
192 | |||
194 | return ''.join( |
|
193 | return ''.join( | |
195 | [format_string % (magic_escapes['line'], fname, |
|
194 | [format_string % (magic_escapes['line'], fname, | |
196 | indent(dedent(fndoc))) |
|
195 | indent(dedent(fndoc))) | |
197 | for fname, fndoc in sorted(docs['line'].items())] |
|
196 | for fname, fndoc in sorted(docs['line'].items())] | |
198 | + |
|
197 | + | |
199 | [format_string % (magic_escapes['cell'], fname, |
|
198 | [format_string % (magic_escapes['cell'], fname, | |
200 | indent(dedent(fndoc))) |
|
199 | indent(dedent(fndoc))) | |
201 | for fname, fndoc in sorted(docs['cell'].items())] |
|
200 | for fname, fndoc in sorted(docs['cell'].items())] | |
202 | ) |
|
201 | ) | |
203 |
|
202 | |||
204 | @line_magic |
|
203 | @line_magic | |
205 | def magic(self, parameter_s=''): |
|
204 | def magic(self, parameter_s=''): | |
206 | """Print information about the magic function system. |
|
205 | """Print information about the magic function system. | |
207 |
|
206 | |||
208 | Supported formats: -latex, -brief, -rest |
|
207 | Supported formats: -latex, -brief, -rest | |
209 | """ |
|
208 | """ | |
210 |
|
209 | |||
211 | mode = '' |
|
210 | mode = '' | |
212 | try: |
|
211 | try: | |
213 | mode = parameter_s.split()[0][1:] |
|
212 | mode = parameter_s.split()[0][1:] | |
214 | except IndexError: |
|
213 | except IndexError: | |
215 | pass |
|
214 | pass | |
216 |
|
215 | |||
217 | brief = (mode == 'brief') |
|
216 | brief = (mode == 'brief') | |
218 | rest = (mode == 'rest') |
|
217 | rest = (mode == 'rest') | |
219 | magic_docs = self._magic_docs(brief, rest) |
|
218 | magic_docs = self._magic_docs(brief, rest) | |
220 |
|
219 | |||
221 | if mode == 'latex': |
|
220 | if mode == 'latex': | |
222 | print(self.format_latex(magic_docs)) |
|
221 | print(self.format_latex(magic_docs)) | |
223 | return |
|
222 | return | |
224 | else: |
|
223 | else: | |
225 | magic_docs = format_screen(magic_docs) |
|
224 | magic_docs = format_screen(magic_docs) | |
226 |
|
225 | |||
227 | out = [""" |
|
226 | out = [""" | |
228 | IPython's 'magic' functions |
|
227 | IPython's 'magic' functions | |
229 | =========================== |
|
228 | =========================== | |
230 |
|
229 | |||
231 | The magic function system provides a series of functions which allow you to |
|
230 | The magic function system provides a series of functions which allow you to | |
232 | control the behavior of IPython itself, plus a lot of system-type |
|
231 | control the behavior of IPython itself, plus a lot of system-type | |
233 | features. There are two kinds of magics, line-oriented and cell-oriented. |
|
232 | features. There are two kinds of magics, line-oriented and cell-oriented. | |
234 |
|
233 | |||
235 | Line magics are prefixed with the % character and work much like OS |
|
234 | Line magics are prefixed with the % character and work much like OS | |
236 | command-line calls: they get as an argument the rest of the line, where |
|
235 | command-line calls: they get as an argument the rest of the line, where | |
237 | arguments are passed without parentheses or quotes. For example, this will |
|
236 | arguments are passed without parentheses or quotes. For example, this will | |
238 | time the given statement:: |
|
237 | time the given statement:: | |
239 |
|
238 | |||
240 | %timeit range(1000) |
|
239 | %timeit range(1000) | |
241 |
|
240 | |||
242 | Cell magics are prefixed with a double %%, and they are functions that get as |
|
241 | Cell magics are prefixed with a double %%, and they are functions that get as | |
243 | an argument not only the rest of the line, but also the lines below it in a |
|
242 | an argument not only the rest of the line, but also the lines below it in a | |
244 | separate argument. These magics are called with two arguments: the rest of the |
|
243 | separate argument. These magics are called with two arguments: the rest of the | |
245 | call line and the body of the cell, consisting of the lines below the first. |
|
244 | call line and the body of the cell, consisting of the lines below the first. | |
246 | For example:: |
|
245 | For example:: | |
247 |
|
246 | |||
248 | %%timeit x = numpy.random.randn((100, 100)) |
|
247 | %%timeit x = numpy.random.randn((100, 100)) | |
249 | numpy.linalg.svd(x) |
|
248 | numpy.linalg.svd(x) | |
250 |
|
249 | |||
251 | will time the execution of the numpy svd routine, running the assignment of x |
|
250 | will time the execution of the numpy svd routine, running the assignment of x | |
252 | as part of the setup phase, which is not timed. |
|
251 | as part of the setup phase, which is not timed. | |
253 |
|
252 | |||
254 | In a line-oriented client (the terminal or Qt console IPython), starting a new |
|
253 | In a line-oriented client (the terminal or Qt console IPython), starting a new | |
255 | input with %% will automatically enter cell mode, and IPython will continue |
|
254 | input with %% will automatically enter cell mode, and IPython will continue | |
256 | reading input until a blank line is given. In the notebook, simply type the |
|
255 | reading input until a blank line is given. In the notebook, simply type the | |
257 | whole cell as one entity, but keep in mind that the %% escape can only be at |
|
256 | whole cell as one entity, but keep in mind that the %% escape can only be at | |
258 | the very start of the cell. |
|
257 | the very start of the cell. | |
259 |
|
258 | |||
260 | NOTE: If you have 'automagic' enabled (via the command line option or with the |
|
259 | NOTE: If you have 'automagic' enabled (via the command line option or with the | |
261 | %automagic function), you don't need to type in the % explicitly for line |
|
260 | %automagic function), you don't need to type in the % explicitly for line | |
262 | magics; cell magics always require an explicit '%%' escape. By default, |
|
261 | magics; cell magics always require an explicit '%%' escape. By default, | |
263 | IPython ships with automagic on, so you should only rarely need the % escape. |
|
262 | IPython ships with automagic on, so you should only rarely need the % escape. | |
264 |
|
263 | |||
265 | Example: typing '%cd mydir' (without the quotes) changes your working directory |
|
264 | Example: typing '%cd mydir' (without the quotes) changes your working directory | |
266 | to 'mydir', if it exists. |
|
265 | to 'mydir', if it exists. | |
267 |
|
266 | |||
268 | For a list of the available magic functions, use %lsmagic. For a description |
|
267 | For a list of the available magic functions, use %lsmagic. For a description | |
269 | of any of them, type %magic_name?, e.g. '%cd?'. |
|
268 | of any of them, type %magic_name?, e.g. '%cd?'. | |
270 |
|
269 | |||
271 | Currently the magic system has the following functions:""", |
|
270 | Currently the magic system has the following functions:""", | |
272 | magic_docs, |
|
271 | magic_docs, | |
273 | "Summary of magic functions (from %slsmagic):" % magic_escapes['line'], |
|
272 | "Summary of magic functions (from %slsmagic):" % magic_escapes['line'], | |
274 | str(self.lsmagic()), |
|
273 | str(self.lsmagic()), | |
275 | ] |
|
274 | ] | |
276 | page.page('\n'.join(out)) |
|
275 | page.page('\n'.join(out)) | |
277 |
|
276 | |||
278 |
|
277 | |||
279 | @line_magic |
|
278 | @line_magic | |
280 | def page(self, parameter_s=''): |
|
279 | def page(self, parameter_s=''): | |
281 | """Pretty print the object and display it through a pager. |
|
280 | """Pretty print the object and display it through a pager. | |
282 |
|
281 | |||
283 | %page [options] OBJECT |
|
282 | %page [options] OBJECT | |
284 |
|
283 | |||
285 | If no object is given, use _ (last output). |
|
284 | If no object is given, use _ (last output). | |
286 |
|
285 | |||
287 | Options: |
|
286 | Options: | |
288 |
|
287 | |||
289 | -r: page str(object), don't pretty-print it.""" |
|
288 | -r: page str(object), don't pretty-print it.""" | |
290 |
|
289 | |||
291 | # After a function contributed by Olivier Aubert, slightly modified. |
|
290 | # After a function contributed by Olivier Aubert, slightly modified. | |
292 |
|
291 | |||
293 | # Process options/args |
|
292 | # Process options/args | |
294 | opts, args = self.parse_options(parameter_s, 'r') |
|
293 | opts, args = self.parse_options(parameter_s, 'r') | |
295 | raw = 'r' in opts |
|
294 | raw = 'r' in opts | |
296 |
|
295 | |||
297 | oname = args and args or '_' |
|
296 | oname = args and args or '_' | |
298 | info = self.shell._ofind(oname) |
|
297 | info = self.shell._ofind(oname) | |
299 | if info['found']: |
|
298 | if info['found']: | |
300 | txt = (raw and str or pformat)( info['obj'] ) |
|
299 | txt = (raw and str or pformat)( info['obj'] ) | |
301 | page.page(txt) |
|
300 | page.page(txt) | |
302 | else: |
|
301 | else: | |
303 | print('Object `%s` not found' % oname) |
|
302 | print('Object `%s` not found' % oname) | |
304 |
|
303 | |||
305 | @line_magic |
|
304 | @line_magic | |
306 | def pprint(self, parameter_s=''): |
|
305 | def pprint(self, parameter_s=''): | |
307 | """Toggle pretty printing on/off.""" |
|
306 | """Toggle pretty printing on/off.""" | |
308 | ptformatter = self.shell.display_formatter.formatters['text/plain'] |
|
307 | ptformatter = self.shell.display_formatter.formatters['text/plain'] | |
309 | ptformatter.pprint = bool(1 - ptformatter.pprint) |
|
308 | ptformatter.pprint = bool(1 - ptformatter.pprint) | |
310 | print('Pretty printing has been turned', |
|
309 | print('Pretty printing has been turned', | |
311 | ['OFF','ON'][ptformatter.pprint]) |
|
310 | ['OFF','ON'][ptformatter.pprint]) | |
312 |
|
311 | |||
313 | @line_magic |
|
312 | @line_magic | |
314 | def colors(self, parameter_s=''): |
|
313 | def colors(self, parameter_s=''): | |
315 | """Switch color scheme for prompts, info system and exception handlers. |
|
314 | """Switch color scheme for prompts, info system and exception handlers. | |
316 |
|
315 | |||
317 | Currently implemented schemes: NoColor, Linux, LightBG. |
|
316 | Currently implemented schemes: NoColor, Linux, LightBG. | |
318 |
|
317 | |||
319 | Color scheme names are not case-sensitive. |
|
318 | Color scheme names are not case-sensitive. | |
320 |
|
319 | |||
321 | Examples |
|
320 | Examples | |
322 | -------- |
|
321 | -------- | |
323 | To get a plain black and white terminal:: |
|
322 | To get a plain black and white terminal:: | |
324 |
|
323 | |||
325 | %colors nocolor |
|
324 | %colors nocolor | |
326 | """ |
|
325 | """ | |
327 | def color_switch_err(name): |
|
326 | def color_switch_err(name): | |
328 | warn('Error changing %s color schemes.\n%s' % |
|
327 | warn('Error changing %s color schemes.\n%s' % | |
329 | (name, sys.exc_info()[1]), stacklevel=2) |
|
328 | (name, sys.exc_info()[1]), stacklevel=2) | |
330 |
|
329 | |||
331 |
|
330 | |||
332 | new_scheme = parameter_s.strip() |
|
331 | new_scheme = parameter_s.strip() | |
333 | if not new_scheme: |
|
332 | if not new_scheme: | |
334 | raise UsageError( |
|
333 | raise UsageError( | |
335 | "%colors: you must specify a color scheme. See '%colors?'") |
|
334 | "%colors: you must specify a color scheme. See '%colors?'") | |
336 | # local shortcut |
|
335 | # local shortcut | |
337 | shell = self.shell |
|
336 | shell = self.shell | |
338 |
|
337 | |||
339 | # Set shell colour scheme |
|
338 | # Set shell colour scheme | |
340 | try: |
|
339 | try: | |
341 | shell.colors = new_scheme |
|
340 | shell.colors = new_scheme | |
342 | shell.refresh_style() |
|
341 | shell.refresh_style() | |
343 | except: |
|
342 | except: | |
344 | color_switch_err('shell') |
|
343 | color_switch_err('shell') | |
345 |
|
344 | |||
346 | # Set exception colors |
|
345 | # Set exception colors | |
347 | try: |
|
346 | try: | |
348 | shell.InteractiveTB.set_colors(scheme = new_scheme) |
|
347 | shell.InteractiveTB.set_colors(scheme = new_scheme) | |
349 | shell.SyntaxTB.set_colors(scheme = new_scheme) |
|
348 | shell.SyntaxTB.set_colors(scheme = new_scheme) | |
350 | except: |
|
349 | except: | |
351 | color_switch_err('exception') |
|
350 | color_switch_err('exception') | |
352 |
|
351 | |||
353 | # Set info (for 'object?') colors |
|
352 | # Set info (for 'object?') colors | |
354 | if shell.color_info: |
|
353 | if shell.color_info: | |
355 | try: |
|
354 | try: | |
356 | shell.inspector.set_active_scheme(new_scheme) |
|
355 | shell.inspector.set_active_scheme(new_scheme) | |
357 | except: |
|
356 | except: | |
358 | color_switch_err('object inspector') |
|
357 | color_switch_err('object inspector') | |
359 | else: |
|
358 | else: | |
360 | shell.inspector.set_active_scheme('NoColor') |
|
359 | shell.inspector.set_active_scheme('NoColor') | |
361 |
|
360 | |||
362 | @line_magic |
|
361 | @line_magic | |
363 | def xmode(self, parameter_s=''): |
|
362 | def xmode(self, parameter_s=''): | |
364 | """Switch modes for the exception handlers. |
|
363 | """Switch modes for the exception handlers. | |
365 |
|
364 | |||
366 | Valid modes: Plain, Context, Verbose, and Minimal. |
|
365 | Valid modes: Plain, Context, Verbose, and Minimal. | |
367 |
|
366 | |||
368 | If called without arguments, acts as a toggle.""" |
|
367 | If called without arguments, acts as a toggle.""" | |
369 |
|
368 | |||
370 | def xmode_switch_err(name): |
|
369 | def xmode_switch_err(name): | |
371 | warn('Error changing %s exception modes.\n%s' % |
|
370 | warn('Error changing %s exception modes.\n%s' % | |
372 | (name,sys.exc_info()[1])) |
|
371 | (name,sys.exc_info()[1])) | |
373 |
|
372 | |||
374 | shell = self.shell |
|
373 | shell = self.shell | |
375 | new_mode = parameter_s.strip().capitalize() |
|
374 | new_mode = parameter_s.strip().capitalize() | |
376 | try: |
|
375 | try: | |
377 | shell.InteractiveTB.set_mode(mode=new_mode) |
|
376 | shell.InteractiveTB.set_mode(mode=new_mode) | |
378 | print('Exception reporting mode:',shell.InteractiveTB.mode) |
|
377 | print('Exception reporting mode:',shell.InteractiveTB.mode) | |
379 | except: |
|
378 | except: | |
380 | xmode_switch_err('user') |
|
379 | xmode_switch_err('user') | |
381 |
|
380 | |||
382 | @line_magic |
|
381 | @line_magic | |
383 | def quickref(self, arg): |
|
382 | def quickref(self, arg): | |
384 | """ Show a quick reference sheet """ |
|
383 | """ Show a quick reference sheet """ | |
385 | from IPython.core.usage import quick_reference |
|
384 | from IPython.core.usage import quick_reference | |
386 | qr = quick_reference + self._magic_docs(brief=True) |
|
385 | qr = quick_reference + self._magic_docs(brief=True) | |
387 | page.page(qr) |
|
386 | page.page(qr) | |
388 |
|
387 | |||
389 | @line_magic |
|
388 | @line_magic | |
390 | def doctest_mode(self, parameter_s=''): |
|
389 | def doctest_mode(self, parameter_s=''): | |
391 | """Toggle doctest mode on and off. |
|
390 | """Toggle doctest mode on and off. | |
392 |
|
391 | |||
393 | This mode is intended to make IPython behave as much as possible like a |
|
392 | This mode is intended to make IPython behave as much as possible like a | |
394 | plain Python shell, from the perspective of how its prompts, exceptions |
|
393 | plain Python shell, from the perspective of how its prompts, exceptions | |
395 | and output look. This makes it easy to copy and paste parts of a |
|
394 | and output look. This makes it easy to copy and paste parts of a | |
396 | session into doctests. It does so by: |
|
395 | session into doctests. It does so by: | |
397 |
|
396 | |||
398 | - Changing the prompts to the classic ``>>>`` ones. |
|
397 | - Changing the prompts to the classic ``>>>`` ones. | |
399 | - Changing the exception reporting mode to 'Plain'. |
|
398 | - Changing the exception reporting mode to 'Plain'. | |
400 | - Disabling pretty-printing of output. |
|
399 | - Disabling pretty-printing of output. | |
401 |
|
400 | |||
402 | Note that IPython also supports the pasting of code snippets that have |
|
401 | Note that IPython also supports the pasting of code snippets that have | |
403 | leading '>>>' and '...' prompts in them. This means that you can paste |
|
402 | leading '>>>' and '...' prompts in them. This means that you can paste | |
404 | doctests from files or docstrings (even if they have leading |
|
403 | doctests from files or docstrings (even if they have leading | |
405 | whitespace), and the code will execute correctly. You can then use |
|
404 | whitespace), and the code will execute correctly. You can then use | |
406 | '%history -t' to see the translated history; this will give you the |
|
405 | '%history -t' to see the translated history; this will give you the | |
407 | input after removal of all the leading prompts and whitespace, which |
|
406 | input after removal of all the leading prompts and whitespace, which | |
408 | can be pasted back into an editor. |
|
407 | can be pasted back into an editor. | |
409 |
|
408 | |||
410 | With these features, you can switch into this mode easily whenever you |
|
409 | With these features, you can switch into this mode easily whenever you | |
411 | need to do testing and changes to doctests, without having to leave |
|
410 | need to do testing and changes to doctests, without having to leave | |
412 | your existing IPython session. |
|
411 | your existing IPython session. | |
413 | """ |
|
412 | """ | |
414 |
|
413 | |||
415 | # Shorthands |
|
414 | # Shorthands | |
416 | shell = self.shell |
|
415 | shell = self.shell | |
417 | meta = shell.meta |
|
416 | meta = shell.meta | |
418 | disp_formatter = self.shell.display_formatter |
|
417 | disp_formatter = self.shell.display_formatter | |
419 | ptformatter = disp_formatter.formatters['text/plain'] |
|
418 | ptformatter = disp_formatter.formatters['text/plain'] | |
420 | # dstore is a data store kept in the instance metadata bag to track any |
|
419 | # dstore is a data store kept in the instance metadata bag to track any | |
421 | # changes we make, so we can undo them later. |
|
420 | # changes we make, so we can undo them later. | |
422 | dstore = meta.setdefault('doctest_mode',Struct()) |
|
421 | dstore = meta.setdefault('doctest_mode',Struct()) | |
423 | save_dstore = dstore.setdefault |
|
422 | save_dstore = dstore.setdefault | |
424 |
|
423 | |||
425 | # save a few values we'll need to recover later |
|
424 | # save a few values we'll need to recover later | |
426 | mode = save_dstore('mode',False) |
|
425 | mode = save_dstore('mode',False) | |
427 | save_dstore('rc_pprint',ptformatter.pprint) |
|
426 | save_dstore('rc_pprint',ptformatter.pprint) | |
428 | save_dstore('xmode',shell.InteractiveTB.mode) |
|
427 | save_dstore('xmode',shell.InteractiveTB.mode) | |
429 | save_dstore('rc_separate_out',shell.separate_out) |
|
428 | save_dstore('rc_separate_out',shell.separate_out) | |
430 | save_dstore('rc_separate_out2',shell.separate_out2) |
|
429 | save_dstore('rc_separate_out2',shell.separate_out2) | |
431 | save_dstore('rc_separate_in',shell.separate_in) |
|
430 | save_dstore('rc_separate_in',shell.separate_in) | |
432 | save_dstore('rc_active_types',disp_formatter.active_types) |
|
431 | save_dstore('rc_active_types',disp_formatter.active_types) | |
433 |
|
432 | |||
434 | if not mode: |
|
433 | if not mode: | |
435 | # turn on |
|
434 | # turn on | |
436 |
|
435 | |||
437 | # Prompt separators like plain python |
|
436 | # Prompt separators like plain python | |
438 | shell.separate_in = '' |
|
437 | shell.separate_in = '' | |
439 | shell.separate_out = '' |
|
438 | shell.separate_out = '' | |
440 | shell.separate_out2 = '' |
|
439 | shell.separate_out2 = '' | |
441 |
|
440 | |||
442 |
|
441 | |||
443 | ptformatter.pprint = False |
|
442 | ptformatter.pprint = False | |
444 | disp_formatter.active_types = ['text/plain'] |
|
443 | disp_formatter.active_types = ['text/plain'] | |
445 |
|
444 | |||
446 | shell.magic('xmode Plain') |
|
445 | shell.magic('xmode Plain') | |
447 | else: |
|
446 | else: | |
448 | # turn off |
|
447 | # turn off | |
449 | shell.separate_in = dstore.rc_separate_in |
|
448 | shell.separate_in = dstore.rc_separate_in | |
450 |
|
449 | |||
451 | shell.separate_out = dstore.rc_separate_out |
|
450 | shell.separate_out = dstore.rc_separate_out | |
452 | shell.separate_out2 = dstore.rc_separate_out2 |
|
451 | shell.separate_out2 = dstore.rc_separate_out2 | |
453 |
|
452 | |||
454 | ptformatter.pprint = dstore.rc_pprint |
|
453 | ptformatter.pprint = dstore.rc_pprint | |
455 | disp_formatter.active_types = dstore.rc_active_types |
|
454 | disp_formatter.active_types = dstore.rc_active_types | |
456 |
|
455 | |||
457 | shell.magic('xmode ' + dstore.xmode) |
|
456 | shell.magic('xmode ' + dstore.xmode) | |
458 |
|
457 | |||
459 | # mode here is the state before we switch; switch_doctest_mode takes |
|
458 | # mode here is the state before we switch; switch_doctest_mode takes | |
460 | # the mode we're switching to. |
|
459 | # the mode we're switching to. | |
461 | shell.switch_doctest_mode(not mode) |
|
460 | shell.switch_doctest_mode(not mode) | |
462 |
|
461 | |||
463 | # Store new mode and inform |
|
462 | # Store new mode and inform | |
464 | dstore.mode = bool(not mode) |
|
463 | dstore.mode = bool(not mode) | |
465 | mode_label = ['OFF','ON'][dstore.mode] |
|
464 | mode_label = ['OFF','ON'][dstore.mode] | |
466 | print('Doctest mode is:', mode_label) |
|
465 | print('Doctest mode is:', mode_label) | |
467 |
|
466 | |||
468 | @line_magic |
|
467 | @line_magic | |
469 | def gui(self, parameter_s=''): |
|
468 | def gui(self, parameter_s=''): | |
470 | """Enable or disable IPython GUI event loop integration. |
|
469 | """Enable or disable IPython GUI event loop integration. | |
471 |
|
470 | |||
472 | %gui [GUINAME] |
|
471 | %gui [GUINAME] | |
473 |
|
472 | |||
474 | This magic replaces IPython's threaded shells that were activated |
|
473 | This magic replaces IPython's threaded shells that were activated | |
475 | using the (pylab/wthread/etc.) command line flags. GUI toolkits |
|
474 | using the (pylab/wthread/etc.) command line flags. GUI toolkits | |
476 | can now be enabled at runtime and keyboard |
|
475 | can now be enabled at runtime and keyboard | |
477 | interrupts should work without any problems. The following toolkits |
|
476 | interrupts should work without any problems. The following toolkits | |
478 | are supported: wxPython, PyQt4, PyGTK, Tk and Cocoa (OSX):: |
|
477 | are supported: wxPython, PyQt4, PyGTK, Tk and Cocoa (OSX):: | |
479 |
|
478 | |||
480 | %gui wx # enable wxPython event loop integration |
|
479 | %gui wx # enable wxPython event loop integration | |
481 | %gui qt4|qt # enable PyQt4 event loop integration |
|
480 | %gui qt4|qt # enable PyQt4 event loop integration | |
482 | %gui qt5 # enable PyQt5 event loop integration |
|
481 | %gui qt5 # enable PyQt5 event loop integration | |
483 | %gui gtk # enable PyGTK event loop integration |
|
482 | %gui gtk # enable PyGTK event loop integration | |
484 | %gui gtk3 # enable Gtk3 event loop integration |
|
483 | %gui gtk3 # enable Gtk3 event loop integration | |
485 | %gui tk # enable Tk event loop integration |
|
484 | %gui tk # enable Tk event loop integration | |
486 | %gui osx # enable Cocoa event loop integration |
|
485 | %gui osx # enable Cocoa event loop integration | |
487 | # (requires %matplotlib 1.1) |
|
486 | # (requires %matplotlib 1.1) | |
488 | %gui # disable all event loop integration |
|
487 | %gui # disable all event loop integration | |
489 |
|
488 | |||
490 | WARNING: after any of these has been called you can simply create |
|
489 | WARNING: after any of these has been called you can simply create | |
491 | an application object, but DO NOT start the event loop yourself, as |
|
490 | an application object, but DO NOT start the event loop yourself, as | |
492 | we have already handled that. |
|
491 | we have already handled that. | |
493 | """ |
|
492 | """ | |
494 | opts, arg = self.parse_options(parameter_s, '') |
|
493 | opts, arg = self.parse_options(parameter_s, '') | |
495 | if arg=='': arg = None |
|
494 | if arg=='': arg = None | |
496 | try: |
|
495 | try: | |
497 | return self.shell.enable_gui(arg) |
|
496 | return self.shell.enable_gui(arg) | |
498 | except Exception as e: |
|
497 | except Exception as e: | |
499 | # print simple error message, rather than traceback if we can't |
|
498 | # print simple error message, rather than traceback if we can't | |
500 | # hook up the GUI |
|
499 | # hook up the GUI | |
501 | error(str(e)) |
|
500 | error(str(e)) | |
502 |
|
501 | |||
503 | @skip_doctest |
|
502 | @skip_doctest | |
504 | @line_magic |
|
503 | @line_magic | |
505 | def precision(self, s=''): |
|
504 | def precision(self, s=''): | |
506 | """Set floating point precision for pretty printing. |
|
505 | """Set floating point precision for pretty printing. | |
507 |
|
506 | |||
508 | Can set either integer precision or a format string. |
|
507 | Can set either integer precision or a format string. | |
509 |
|
508 | |||
510 | If numpy has been imported and precision is an int, |
|
509 | If numpy has been imported and precision is an int, | |
511 | numpy display precision will also be set, via ``numpy.set_printoptions``. |
|
510 | numpy display precision will also be set, via ``numpy.set_printoptions``. | |
512 |
|
511 | |||
513 | If no argument is given, defaults will be restored. |
|
512 | If no argument is given, defaults will be restored. | |
514 |
|
513 | |||
515 | Examples |
|
514 | Examples | |
516 | -------- |
|
515 | -------- | |
517 | :: |
|
516 | :: | |
518 |
|
517 | |||
519 | In [1]: from math import pi |
|
518 | In [1]: from math import pi | |
520 |
|
519 | |||
521 | In [2]: %precision 3 |
|
520 | In [2]: %precision 3 | |
522 | Out[2]: u'%.3f' |
|
521 | Out[2]: u'%.3f' | |
523 |
|
522 | |||
524 | In [3]: pi |
|
523 | In [3]: pi | |
525 | Out[3]: 3.142 |
|
524 | Out[3]: 3.142 | |
526 |
|
525 | |||
527 | In [4]: %precision %i |
|
526 | In [4]: %precision %i | |
528 | Out[4]: u'%i' |
|
527 | Out[4]: u'%i' | |
529 |
|
528 | |||
530 | In [5]: pi |
|
529 | In [5]: pi | |
531 | Out[5]: 3 |
|
530 | Out[5]: 3 | |
532 |
|
531 | |||
533 | In [6]: %precision %e |
|
532 | In [6]: %precision %e | |
534 | Out[6]: u'%e' |
|
533 | Out[6]: u'%e' | |
535 |
|
534 | |||
536 | In [7]: pi**10 |
|
535 | In [7]: pi**10 | |
537 | Out[7]: 9.364805e+04 |
|
536 | Out[7]: 9.364805e+04 | |
538 |
|
537 | |||
539 | In [8]: %precision |
|
538 | In [8]: %precision | |
540 | Out[8]: u'%r' |
|
539 | Out[8]: u'%r' | |
541 |
|
540 | |||
542 | In [9]: pi**10 |
|
541 | In [9]: pi**10 | |
543 | Out[9]: 93648.047476082982 |
|
542 | Out[9]: 93648.047476082982 | |
544 | """ |
|
543 | """ | |
545 | ptformatter = self.shell.display_formatter.formatters['text/plain'] |
|
544 | ptformatter = self.shell.display_formatter.formatters['text/plain'] | |
546 | ptformatter.float_precision = s |
|
545 | ptformatter.float_precision = s | |
547 | return ptformatter.float_format |
|
546 | return ptformatter.float_format | |
548 |
|
547 | |||
549 | @magic_arguments.magic_arguments() |
|
548 | @magic_arguments.magic_arguments() | |
550 | @magic_arguments.argument( |
|
549 | @magic_arguments.argument( | |
551 | '-e', '--export', action='store_true', default=False, |
|
550 | '-e', '--export', action='store_true', default=False, | |
552 | help=argparse.SUPPRESS |
|
551 | help=argparse.SUPPRESS | |
553 | ) |
|
552 | ) | |
554 | @magic_arguments.argument( |
|
553 | @magic_arguments.argument( | |
555 | 'filename', type=str, |
|
554 | 'filename', type=str, | |
556 | help='Notebook name or filename' |
|
555 | help='Notebook name or filename' | |
557 | ) |
|
556 | ) | |
558 | @line_magic |
|
557 | @line_magic | |
559 | def notebook(self, s): |
|
558 | def notebook(self, s): | |
560 | """Export and convert IPython notebooks. |
|
559 | """Export and convert IPython notebooks. | |
561 |
|
560 | |||
562 | This function can export the current IPython history to a notebook file. |
|
561 | This function can export the current IPython history to a notebook file. | |
563 | For example, to export the history to "foo.ipynb" do "%notebook foo.ipynb". |
|
562 | For example, to export the history to "foo.ipynb" do "%notebook foo.ipynb". | |
564 |
|
563 | |||
565 | The -e or --export flag is deprecated in IPython 5.2, and will be |
|
564 | The -e or --export flag is deprecated in IPython 5.2, and will be | |
566 | removed in the future. |
|
565 | removed in the future. | |
567 | """ |
|
566 | """ | |
568 | args = magic_arguments.parse_argstring(self.notebook, s) |
|
567 | args = magic_arguments.parse_argstring(self.notebook, s) | |
569 |
|
568 | |||
570 | from nbformat import write, v4 |
|
569 | from nbformat import write, v4 | |
571 |
|
570 | |||
572 | cells = [] |
|
571 | cells = [] | |
573 | hist = list(self.shell.history_manager.get_range()) |
|
572 | hist = list(self.shell.history_manager.get_range()) | |
574 | if(len(hist)<=1): |
|
573 | if(len(hist)<=1): | |
575 | raise ValueError('History is empty, cannot export') |
|
574 | raise ValueError('History is empty, cannot export') | |
576 | for session, execution_count, source in hist[:-1]: |
|
575 | for session, execution_count, source in hist[:-1]: | |
577 | cells.append(v4.new_code_cell( |
|
576 | cells.append(v4.new_code_cell( | |
578 | execution_count=execution_count, |
|
577 | execution_count=execution_count, | |
579 | source=source |
|
578 | source=source | |
580 | )) |
|
579 | )) | |
581 | nb = v4.new_notebook(cells=cells) |
|
580 | nb = v4.new_notebook(cells=cells) | |
582 | with io.open(args.filename, 'w', encoding='utf-8') as f: |
|
581 | with io.open(args.filename, 'w', encoding='utf-8') as f: | |
583 | write(nb, f, version=4) |
|
582 | write(nb, f, version=4) | |
584 |
|
583 | |||
585 | @magics_class |
|
584 | @magics_class | |
586 | class AsyncMagics(BasicMagics): |
|
585 | class AsyncMagics(BasicMagics): | |
587 |
|
586 | |||
588 | @line_magic |
|
587 | @line_magic | |
589 | def autoawait(self, parameter_s): |
|
588 | def autoawait(self, parameter_s): | |
590 | """ |
|
589 | """ | |
591 | Allow to change the status of the autoawait option. |
|
590 | Allow to change the status of the autoawait option. | |
592 |
|
591 | |||
593 | This allow you to set a specific asynchronous code runner. |
|
592 | This allow you to set a specific asynchronous code runner. | |
594 |
|
593 | |||
595 | If no value is passed, print the currently used asynchronous integration |
|
594 | If no value is passed, print the currently used asynchronous integration | |
596 | and whether it is activated. |
|
595 | and whether it is activated. | |
597 |
|
596 | |||
598 | It can take a number of value evaluated in the following order: |
|
597 | It can take a number of value evaluated in the following order: | |
599 |
|
598 | |||
600 | - False/false/off deactivate autoawait integration |
|
599 | - False/false/off deactivate autoawait integration | |
601 | - True/true/on activate autoawait integration using configured default |
|
600 | - True/true/on activate autoawait integration using configured default | |
602 | loop |
|
601 | loop | |
603 | - asyncio/curio/trio activate autoawait integration and use integration |
|
602 | - asyncio/curio/trio activate autoawait integration and use integration | |
604 | with said library. |
|
603 | with said library. | |
605 |
|
604 | |||
606 | - `sync` turn on the pseudo-sync integration (mostly used for |
|
605 | - `sync` turn on the pseudo-sync integration (mostly used for | |
607 | `IPython.embed()` which does not run IPython with a real eventloop and |
|
606 | `IPython.embed()` which does not run IPython with a real eventloop and | |
608 | deactivate running asynchronous code. Turning on Asynchronous code with |
|
607 | deactivate running asynchronous code. Turning on Asynchronous code with | |
609 | the pseudo sync loop is undefined behavior and may lead IPython to crash. |
|
608 | the pseudo sync loop is undefined behavior and may lead IPython to crash. | |
610 |
|
609 | |||
611 | If the passed parameter does not match any of the above and is a python |
|
610 | If the passed parameter does not match any of the above and is a python | |
612 | identifier, get said object from user namespace and set it as the |
|
611 | identifier, get said object from user namespace and set it as the | |
613 | runner, and activate autoawait. |
|
612 | runner, and activate autoawait. | |
614 |
|
613 | |||
615 | If the object is a fully qualified object name, attempt to import it and |
|
614 | If the object is a fully qualified object name, attempt to import it and | |
616 | set it as the runner, and activate autoawait. |
|
615 | set it as the runner, and activate autoawait. | |
617 |
|
616 | |||
618 |
|
617 | |||
619 | The exact behavior of autoawait is experimental and subject to change |
|
618 | The exact behavior of autoawait is experimental and subject to change | |
620 | across version of IPython and Python. |
|
619 | across version of IPython and Python. | |
621 | """ |
|
620 | """ | |
622 |
|
621 | |||
623 | param = parameter_s.strip() |
|
622 | param = parameter_s.strip() | |
624 | d = {True: "on", False: "off"} |
|
623 | d = {True: "on", False: "off"} | |
625 |
|
624 | |||
626 | if not param: |
|
625 | if not param: | |
627 | print("IPython autoawait is `{}`, and set to use `{}`".format( |
|
626 | print("IPython autoawait is `{}`, and set to use `{}`".format( | |
628 | d[self.shell.autoawait], |
|
627 | d[self.shell.autoawait], | |
629 | self.shell.loop_runner |
|
628 | self.shell.loop_runner | |
630 | )) |
|
629 | )) | |
631 | return None |
|
630 | return None | |
632 |
|
631 | |||
633 | if param.lower() in ('false', 'off'): |
|
632 | if param.lower() in ('false', 'off'): | |
634 | self.shell.autoawait = False |
|
633 | self.shell.autoawait = False | |
635 | return None |
|
634 | return None | |
636 | if param.lower() in ('true', 'on'): |
|
635 | if param.lower() in ('true', 'on'): | |
637 | self.shell.autoawait = True |
|
636 | self.shell.autoawait = True | |
638 | return None |
|
637 | return None | |
639 |
|
638 | |||
640 | if param in self.shell.loop_runner_map: |
|
639 | if param in self.shell.loop_runner_map: | |
641 | self.shell.loop_runner, self.shell.autoawait = self.shell.loop_runner_map[param] |
|
640 | self.shell.loop_runner, self.shell.autoawait = self.shell.loop_runner_map[param] | |
642 | return None |
|
641 | return None | |
643 |
|
642 | |||
644 | if param in self.shell.user_ns : |
|
643 | if param in self.shell.user_ns : | |
645 | self.shell.loop_runner = self.shell.user_ns[param] |
|
644 | self.shell.loop_runner = self.shell.user_ns[param] | |
646 | self.shell.autoawait = True |
|
645 | self.shell.autoawait = True | |
647 | return None |
|
646 | return None | |
648 |
|
647 | |||
649 | runner = import_item(param) |
|
648 | runner = import_item(param) | |
650 |
|
649 | |||
651 | self.shell.loop_runner = runner |
|
650 | self.shell.loop_runner = runner | |
652 | self.shell.autoawait = True |
|
651 | self.shell.autoawait = True |
@@ -1,104 +1,103 b'' | |||||
1 | """Implementation of packaging-related magic functions. |
|
1 | """Implementation of packaging-related magic functions. | |
2 | """ |
|
2 | """ | |
3 | #----------------------------------------------------------------------------- |
|
3 | #----------------------------------------------------------------------------- | |
4 | # Copyright (c) 2018 The IPython Development Team. |
|
4 | # Copyright (c) 2018 The IPython Development Team. | |
5 | # |
|
5 | # | |
6 | # Distributed under the terms of the Modified BSD License. |
|
6 | # Distributed under the terms of the Modified BSD License. | |
7 | # |
|
7 | # | |
8 | # The full license is in the file COPYING.txt, distributed with this software. |
|
8 | # The full license is in the file COPYING.txt, distributed with this software. | |
9 | #----------------------------------------------------------------------------- |
|
9 | #----------------------------------------------------------------------------- | |
10 |
|
10 | |||
11 | import os |
|
11 | import os | |
12 | import re |
|
12 | import re | |
13 | import shlex |
|
13 | import shlex | |
14 | import sys |
|
14 | import sys | |
15 | from subprocess import Popen, PIPE |
|
|||
16 |
|
15 | |||
17 | from IPython.core.magic import Magics, magics_class, line_magic |
|
16 | from IPython.core.magic import Magics, magics_class, line_magic | |
18 |
|
17 | |||
19 |
|
18 | |||
20 | def _is_conda_environment(): |
|
19 | def _is_conda_environment(): | |
21 | """Return True if the current Python executable is in a conda env""" |
|
20 | """Return True if the current Python executable is in a conda env""" | |
22 | # TODO: does this need to change on windows? |
|
21 | # TODO: does this need to change on windows? | |
23 | conda_history = os.path.join(sys.prefix, 'conda-meta', 'history') |
|
22 | conda_history = os.path.join(sys.prefix, 'conda-meta', 'history') | |
24 | return os.path.exists(conda_history) |
|
23 | return os.path.exists(conda_history) | |
25 |
|
24 | |||
26 |
|
25 | |||
27 | def _get_conda_executable(): |
|
26 | def _get_conda_executable(): | |
28 | """Find the path to the conda executable""" |
|
27 | """Find the path to the conda executable""" | |
29 | # Check if there is a conda executable in the same directory as the Python executable. |
|
28 | # Check if there is a conda executable in the same directory as the Python executable. | |
30 | # This is the case within conda's root environment. |
|
29 | # This is the case within conda's root environment. | |
31 | conda = os.path.join(os.path.dirname(sys.executable), 'conda') |
|
30 | conda = os.path.join(os.path.dirname(sys.executable), 'conda') | |
32 | if os.path.isfile(conda): |
|
31 | if os.path.isfile(conda): | |
33 | return conda |
|
32 | return conda | |
34 |
|
33 | |||
35 | # Otherwise, attempt to extract the executable from conda history. |
|
34 | # Otherwise, attempt to extract the executable from conda history. | |
36 | # This applies in any conda environment. |
|
35 | # This applies in any conda environment. | |
37 | R = re.compile(r"^#\s*cmd:\s*(?P<command>.*conda)\s[create|install]") |
|
36 | R = re.compile(r"^#\s*cmd:\s*(?P<command>.*conda)\s[create|install]") | |
38 | with open(os.path.join(sys.prefix, 'conda-meta', 'history')) as f: |
|
37 | with open(os.path.join(sys.prefix, 'conda-meta', 'history')) as f: | |
39 | for line in f: |
|
38 | for line in f: | |
40 | match = R.match(line) |
|
39 | match = R.match(line) | |
41 | if match: |
|
40 | if match: | |
42 | return match.groupdict()['command'] |
|
41 | return match.groupdict()['command'] | |
43 |
|
42 | |||
44 | # Fallback: assume conda is available on the system path. |
|
43 | # Fallback: assume conda is available on the system path. | |
45 | return "conda" |
|
44 | return "conda" | |
46 |
|
45 | |||
47 |
|
46 | |||
48 | CONDA_COMMANDS_REQUIRING_PREFIX = { |
|
47 | CONDA_COMMANDS_REQUIRING_PREFIX = { | |
49 | 'install', 'list', 'remove', 'uninstall', 'update', 'upgrade', |
|
48 | 'install', 'list', 'remove', 'uninstall', 'update', 'upgrade', | |
50 | } |
|
49 | } | |
51 | CONDA_COMMANDS_REQUIRING_YES = { |
|
50 | CONDA_COMMANDS_REQUIRING_YES = { | |
52 | 'install', 'remove', 'uninstall', 'update', 'upgrade', |
|
51 | 'install', 'remove', 'uninstall', 'update', 'upgrade', | |
53 | } |
|
52 | } | |
54 | CONDA_ENV_FLAGS = {'-p', '--prefix', '-n', '--name'} |
|
53 | CONDA_ENV_FLAGS = {'-p', '--prefix', '-n', '--name'} | |
55 | CONDA_YES_FLAGS = {'-y', '--y'} |
|
54 | CONDA_YES_FLAGS = {'-y', '--y'} | |
56 |
|
55 | |||
57 |
|
56 | |||
58 | @magics_class |
|
57 | @magics_class | |
59 | class PackagingMagics(Magics): |
|
58 | class PackagingMagics(Magics): | |
60 | """Magics related to packaging & installation""" |
|
59 | """Magics related to packaging & installation""" | |
61 |
|
60 | |||
62 | @line_magic |
|
61 | @line_magic | |
63 | def pip(self, line): |
|
62 | def pip(self, line): | |
64 | """Run the pip package manager within the current kernel. |
|
63 | """Run the pip package manager within the current kernel. | |
65 |
|
64 | |||
66 | Usage: |
|
65 | Usage: | |
67 | %pip install [pkgs] |
|
66 | %pip install [pkgs] | |
68 | """ |
|
67 | """ | |
69 | self.shell.system(' '.join([sys.executable, '-m', 'pip', line])) |
|
68 | self.shell.system(' '.join([sys.executable, '-m', 'pip', line])) | |
70 | print("Note: you may need to restart the kernel to use updated packages.") |
|
69 | print("Note: you may need to restart the kernel to use updated packages.") | |
71 |
|
70 | |||
72 | @line_magic |
|
71 | @line_magic | |
73 | def conda(self, line): |
|
72 | def conda(self, line): | |
74 | """Run the conda package manager within the current kernel. |
|
73 | """Run the conda package manager within the current kernel. | |
75 |
|
74 | |||
76 | Usage: |
|
75 | Usage: | |
77 | %conda install [pkgs] |
|
76 | %conda install [pkgs] | |
78 | """ |
|
77 | """ | |
79 | if not _is_conda_environment(): |
|
78 | if not _is_conda_environment(): | |
80 | raise ValueError("The python kernel does not appear to be a conda environment. " |
|
79 | raise ValueError("The python kernel does not appear to be a conda environment. " | |
81 | "Please use ``%pip install`` instead.") |
|
80 | "Please use ``%pip install`` instead.") | |
82 |
|
81 | |||
83 | conda = _get_conda_executable() |
|
82 | conda = _get_conda_executable() | |
84 | args = shlex.split(line) |
|
83 | args = shlex.split(line) | |
85 | command = args[0] |
|
84 | command = args[0] | |
86 | args = args[1:] |
|
85 | args = args[1:] | |
87 | extra_args = [] |
|
86 | extra_args = [] | |
88 |
|
87 | |||
89 | # When the subprocess does not allow us to respond "yes" during the installation, |
|
88 | # When the subprocess does not allow us to respond "yes" during the installation, | |
90 | # we need to insert --yes in the argument list for some commands |
|
89 | # we need to insert --yes in the argument list for some commands | |
91 | stdin_disabled = getattr(self.shell, 'kernel', None) is not None |
|
90 | stdin_disabled = getattr(self.shell, 'kernel', None) is not None | |
92 | needs_yes = command in CONDA_COMMANDS_REQUIRING_YES |
|
91 | needs_yes = command in CONDA_COMMANDS_REQUIRING_YES | |
93 | has_yes = set(args).intersection(CONDA_YES_FLAGS) |
|
92 | has_yes = set(args).intersection(CONDA_YES_FLAGS) | |
94 | if stdin_disabled and needs_yes and not has_yes: |
|
93 | if stdin_disabled and needs_yes and not has_yes: | |
95 | extra_args.append("--yes") |
|
94 | extra_args.append("--yes") | |
96 |
|
95 | |||
97 | # Add --prefix to point conda installation to the current environment |
|
96 | # Add --prefix to point conda installation to the current environment | |
98 | needs_prefix = command in CONDA_COMMANDS_REQUIRING_PREFIX |
|
97 | needs_prefix = command in CONDA_COMMANDS_REQUIRING_PREFIX | |
99 | has_prefix = set(args).intersection(CONDA_ENV_FLAGS) |
|
98 | has_prefix = set(args).intersection(CONDA_ENV_FLAGS) | |
100 | if needs_prefix and not has_prefix: |
|
99 | if needs_prefix and not has_prefix: | |
101 | extra_args.extend(["--prefix", sys.prefix]) |
|
100 | extra_args.extend(["--prefix", sys.prefix]) | |
102 |
|
101 | |||
103 | self.shell.system(' '.join([conda, command] + extra_args + args)) |
|
102 | self.shell.system(' '.join([conda, command] + extra_args + args)) | |
104 | print("\nNote: you may need to restart the kernel to use updated packages.") No newline at end of file |
|
103 | print("\nNote: you may need to restart the kernel to use updated packages.") |
@@ -1,47 +1,46 b'' | |||||
1 | """Minimal script to reproduce our nasty reference counting bug. |
|
1 | """Minimal script to reproduce our nasty reference counting bug. | |
2 |
|
2 | |||
3 | The problem is related to https://github.com/ipython/ipython/issues/141 |
|
3 | The problem is related to https://github.com/ipython/ipython/issues/141 | |
4 |
|
4 | |||
5 | The original fix for that appeared to work, but John D. Hunter found a |
|
5 | The original fix for that appeared to work, but John D. Hunter found a | |
6 | matplotlib example which, when run twice in a row, would break. The problem |
|
6 | matplotlib example which, when run twice in a row, would break. The problem | |
7 | were references held by open figures to internals of Tkinter. |
|
7 | were references held by open figures to internals of Tkinter. | |
8 |
|
8 | |||
9 | This code reproduces the problem that John saw, without matplotlib. |
|
9 | This code reproduces the problem that John saw, without matplotlib. | |
10 |
|
10 | |||
11 | This script is meant to be called by other parts of the test suite that call it |
|
11 | This script is meant to be called by other parts of the test suite that call it | |
12 | via %run as if it were executed interactively by the user. As of 2011-05-29, |
|
12 | via %run as if it were executed interactively by the user. As of 2011-05-29, | |
13 | test_run.py calls it. |
|
13 | test_run.py calls it. | |
14 | """ |
|
14 | """ | |
15 |
|
15 | |||
16 | #----------------------------------------------------------------------------- |
|
16 | #----------------------------------------------------------------------------- | |
17 | # Module imports |
|
17 | # Module imports | |
18 | #----------------------------------------------------------------------------- |
|
18 | #----------------------------------------------------------------------------- | |
19 | import sys |
|
|||
20 |
|
19 | |||
21 | from IPython import get_ipython |
|
20 | from IPython import get_ipython | |
22 |
|
21 | |||
23 | #----------------------------------------------------------------------------- |
|
22 | #----------------------------------------------------------------------------- | |
24 | # Globals |
|
23 | # Globals | |
25 | #----------------------------------------------------------------------------- |
|
24 | #----------------------------------------------------------------------------- | |
26 |
|
25 | |||
27 | # This needs to be here because nose and other test runners will import |
|
26 | # This needs to be here because nose and other test runners will import | |
28 | # this module. Importing this module has potential side effects that we |
|
27 | # this module. Importing this module has potential side effects that we | |
29 | # want to prevent. |
|
28 | # want to prevent. | |
30 | if __name__ == '__main__': |
|
29 | if __name__ == '__main__': | |
31 |
|
30 | |||
32 | ip = get_ipython() |
|
31 | ip = get_ipython() | |
33 |
|
32 | |||
34 | if not '_refbug_cache' in ip.user_ns: |
|
33 | if not '_refbug_cache' in ip.user_ns: | |
35 | ip.user_ns['_refbug_cache'] = [] |
|
34 | ip.user_ns['_refbug_cache'] = [] | |
36 |
|
35 | |||
37 |
|
36 | |||
38 | aglobal = 'Hello' |
|
37 | aglobal = 'Hello' | |
39 | def f(): |
|
38 | def f(): | |
40 | return aglobal |
|
39 | return aglobal | |
41 |
|
40 | |||
42 | cache = ip.user_ns['_refbug_cache'] |
|
41 | cache = ip.user_ns['_refbug_cache'] | |
43 | cache.append(f) |
|
42 | cache.append(f) | |
44 |
|
43 | |||
45 | def call_f(): |
|
44 | def call_f(): | |
46 | for func in cache: |
|
45 | for func in cache: | |
47 | print('lowercased:',func().lower()) |
|
46 | print('lowercased:',func().lower()) |
@@ -1,310 +1,309 b'' | |||||
1 | """ |
|
1 | """ | |
2 | Test for async helpers. |
|
2 | Test for async helpers. | |
3 |
|
3 | |||
4 | Should only trigger on python 3.5+ or will have syntax errors. |
|
4 | Should only trigger on python 3.5+ or will have syntax errors. | |
5 | """ |
|
5 | """ | |
6 | import sys |
|
|||
7 | from itertools import chain, repeat |
|
6 | from itertools import chain, repeat | |
8 | import nose.tools as nt |
|
7 | import nose.tools as nt | |
9 | from textwrap import dedent, indent |
|
8 | from textwrap import dedent, indent | |
10 | from unittest import TestCase |
|
9 | from unittest import TestCase | |
11 | from IPython.testing.decorators import skip_without |
|
10 | from IPython.testing.decorators import skip_without | |
12 |
|
11 | |||
13 |
|
12 | |||
14 | iprc = lambda x: ip.run_cell(dedent(x)).raise_error() |
|
13 | iprc = lambda x: ip.run_cell(dedent(x)).raise_error() | |
15 | iprc_nr = lambda x: ip.run_cell(dedent(x)) |
|
14 | iprc_nr = lambda x: ip.run_cell(dedent(x)) | |
16 |
|
15 | |||
17 | from IPython.core.async_helpers import _should_be_async |
|
16 | from IPython.core.async_helpers import _should_be_async | |
18 |
|
17 | |||
19 | class AsyncTest(TestCase): |
|
18 | class AsyncTest(TestCase): | |
20 | def test_should_be_async(self): |
|
19 | def test_should_be_async(self): | |
21 | nt.assert_false(_should_be_async("False")) |
|
20 | nt.assert_false(_should_be_async("False")) | |
22 | nt.assert_true(_should_be_async("await bar()")) |
|
21 | nt.assert_true(_should_be_async("await bar()")) | |
23 | nt.assert_true(_should_be_async("x = await bar()")) |
|
22 | nt.assert_true(_should_be_async("x = await bar()")) | |
24 | nt.assert_false( |
|
23 | nt.assert_false( | |
25 | _should_be_async( |
|
24 | _should_be_async( | |
26 | dedent( |
|
25 | dedent( | |
27 | """ |
|
26 | """ | |
28 | async def awaitable(): |
|
27 | async def awaitable(): | |
29 | pass |
|
28 | pass | |
30 | """ |
|
29 | """ | |
31 | ) |
|
30 | ) | |
32 | ) |
|
31 | ) | |
33 | ) |
|
32 | ) | |
34 |
|
33 | |||
35 | def _get_top_level_cases(self): |
|
34 | def _get_top_level_cases(self): | |
36 | # These are test cases that should be valid in a function |
|
35 | # These are test cases that should be valid in a function | |
37 | # but invalid outside of a function. |
|
36 | # but invalid outside of a function. | |
38 | test_cases = [] |
|
37 | test_cases = [] | |
39 | test_cases.append(('basic', "{val}")) |
|
38 | test_cases.append(('basic', "{val}")) | |
40 |
|
39 | |||
41 | # Note, in all conditional cases, I use True instead of |
|
40 | # Note, in all conditional cases, I use True instead of | |
42 | # False so that the peephole optimizer won't optimize away |
|
41 | # False so that the peephole optimizer won't optimize away | |
43 | # the return, so CPython will see this as a syntax error: |
|
42 | # the return, so CPython will see this as a syntax error: | |
44 | # |
|
43 | # | |
45 | # while True: |
|
44 | # while True: | |
46 | # break |
|
45 | # break | |
47 | # return |
|
46 | # return | |
48 | # |
|
47 | # | |
49 | # But not this: |
|
48 | # But not this: | |
50 | # |
|
49 | # | |
51 | # while False: |
|
50 | # while False: | |
52 | # return |
|
51 | # return | |
53 | # |
|
52 | # | |
54 | # See https://bugs.python.org/issue1875 |
|
53 | # See https://bugs.python.org/issue1875 | |
55 |
|
54 | |||
56 | test_cases.append(('if', dedent(""" |
|
55 | test_cases.append(('if', dedent(""" | |
57 | if True: |
|
56 | if True: | |
58 | {val} |
|
57 | {val} | |
59 | """))) |
|
58 | """))) | |
60 |
|
59 | |||
61 | test_cases.append(('while', dedent(""" |
|
60 | test_cases.append(('while', dedent(""" | |
62 | while True: |
|
61 | while True: | |
63 | {val} |
|
62 | {val} | |
64 | break |
|
63 | break | |
65 | """))) |
|
64 | """))) | |
66 |
|
65 | |||
67 | test_cases.append(('try', dedent(""" |
|
66 | test_cases.append(('try', dedent(""" | |
68 | try: |
|
67 | try: | |
69 | {val} |
|
68 | {val} | |
70 | except: |
|
69 | except: | |
71 | pass |
|
70 | pass | |
72 | """))) |
|
71 | """))) | |
73 |
|
72 | |||
74 | test_cases.append(('except', dedent(""" |
|
73 | test_cases.append(('except', dedent(""" | |
75 | try: |
|
74 | try: | |
76 | pass |
|
75 | pass | |
77 | except: |
|
76 | except: | |
78 | {val} |
|
77 | {val} | |
79 | """))) |
|
78 | """))) | |
80 |
|
79 | |||
81 | test_cases.append(('finally', dedent(""" |
|
80 | test_cases.append(('finally', dedent(""" | |
82 | try: |
|
81 | try: | |
83 | pass |
|
82 | pass | |
84 | except: |
|
83 | except: | |
85 | pass |
|
84 | pass | |
86 | finally: |
|
85 | finally: | |
87 | {val} |
|
86 | {val} | |
88 | """))) |
|
87 | """))) | |
89 |
|
88 | |||
90 | test_cases.append(('for', dedent(""" |
|
89 | test_cases.append(('for', dedent(""" | |
91 | for _ in range(4): |
|
90 | for _ in range(4): | |
92 | {val} |
|
91 | {val} | |
93 | """))) |
|
92 | """))) | |
94 |
|
93 | |||
95 |
|
94 | |||
96 | test_cases.append(('nested', dedent(""" |
|
95 | test_cases.append(('nested', dedent(""" | |
97 | if True: |
|
96 | if True: | |
98 | while True: |
|
97 | while True: | |
99 | {val} |
|
98 | {val} | |
100 | break |
|
99 | break | |
101 | """))) |
|
100 | """))) | |
102 |
|
101 | |||
103 | test_cases.append(('deep-nested', dedent(""" |
|
102 | test_cases.append(('deep-nested', dedent(""" | |
104 | if True: |
|
103 | if True: | |
105 | while True: |
|
104 | while True: | |
106 | break |
|
105 | break | |
107 | for x in range(3): |
|
106 | for x in range(3): | |
108 | if True: |
|
107 | if True: | |
109 | while True: |
|
108 | while True: | |
110 | for x in range(3): |
|
109 | for x in range(3): | |
111 | {val} |
|
110 | {val} | |
112 | """))) |
|
111 | """))) | |
113 |
|
112 | |||
114 | return test_cases |
|
113 | return test_cases | |
115 |
|
114 | |||
116 | def _get_ry_syntax_errors(self): |
|
115 | def _get_ry_syntax_errors(self): | |
117 | # This is a mix of tests that should be a syntax error if |
|
116 | # This is a mix of tests that should be a syntax error if | |
118 | # return or yield whether or not they are in a function |
|
117 | # return or yield whether or not they are in a function | |
119 |
|
118 | |||
120 | test_cases = [] |
|
119 | test_cases = [] | |
121 |
|
120 | |||
122 | test_cases.append(('class', dedent(""" |
|
121 | test_cases.append(('class', dedent(""" | |
123 | class V: |
|
122 | class V: | |
124 | {val} |
|
123 | {val} | |
125 | """))) |
|
124 | """))) | |
126 |
|
125 | |||
127 | test_cases.append(('nested-class', dedent(""" |
|
126 | test_cases.append(('nested-class', dedent(""" | |
128 | class V: |
|
127 | class V: | |
129 | class C: |
|
128 | class C: | |
130 | {val} |
|
129 | {val} | |
131 | """))) |
|
130 | """))) | |
132 |
|
131 | |||
133 | return test_cases |
|
132 | return test_cases | |
134 |
|
133 | |||
135 |
|
134 | |||
136 | def test_top_level_return_error(self): |
|
135 | def test_top_level_return_error(self): | |
137 | tl_err_test_cases = self._get_top_level_cases() |
|
136 | tl_err_test_cases = self._get_top_level_cases() | |
138 | tl_err_test_cases.extend(self._get_ry_syntax_errors()) |
|
137 | tl_err_test_cases.extend(self._get_ry_syntax_errors()) | |
139 |
|
138 | |||
140 | vals = ('return', 'yield', 'yield from (_ for _ in range(3))', |
|
139 | vals = ('return', 'yield', 'yield from (_ for _ in range(3))', | |
141 | dedent(''' |
|
140 | dedent(''' | |
142 | def f(): |
|
141 | def f(): | |
143 | pass |
|
142 | pass | |
144 | return |
|
143 | return | |
145 | '''), |
|
144 | '''), | |
146 | ) |
|
145 | ) | |
147 |
|
146 | |||
148 | for test_name, test_case in tl_err_test_cases: |
|
147 | for test_name, test_case in tl_err_test_cases: | |
149 | # This example should work if 'pass' is used as the value |
|
148 | # This example should work if 'pass' is used as the value | |
150 | with self.subTest((test_name, 'pass')): |
|
149 | with self.subTest((test_name, 'pass')): | |
151 | iprc(test_case.format(val='pass')) |
|
150 | iprc(test_case.format(val='pass')) | |
152 |
|
151 | |||
153 | # It should fail with all the values |
|
152 | # It should fail with all the values | |
154 | for val in vals: |
|
153 | for val in vals: | |
155 | with self.subTest((test_name, val)): |
|
154 | with self.subTest((test_name, val)): | |
156 | msg = "Syntax error not raised for %s, %s" % (test_name, val) |
|
155 | msg = "Syntax error not raised for %s, %s" % (test_name, val) | |
157 | with self.assertRaises(SyntaxError, msg=msg): |
|
156 | with self.assertRaises(SyntaxError, msg=msg): | |
158 | iprc(test_case.format(val=val)) |
|
157 | iprc(test_case.format(val=val)) | |
159 |
|
158 | |||
160 | def test_in_func_no_error(self): |
|
159 | def test_in_func_no_error(self): | |
161 | # Test that the implementation of top-level return/yield |
|
160 | # Test that the implementation of top-level return/yield | |
162 | # detection isn't *too* aggressive, and works inside a function |
|
161 | # detection isn't *too* aggressive, and works inside a function | |
163 | func_contexts = [] |
|
162 | func_contexts = [] | |
164 |
|
163 | |||
165 | func_contexts.append(('func', False, dedent(""" |
|
164 | func_contexts.append(('func', False, dedent(""" | |
166 | def f():"""))) |
|
165 | def f():"""))) | |
167 |
|
166 | |||
168 | func_contexts.append(('method', False, dedent(""" |
|
167 | func_contexts.append(('method', False, dedent(""" | |
169 | class MyClass: |
|
168 | class MyClass: | |
170 | def __init__(self): |
|
169 | def __init__(self): | |
171 | """))) |
|
170 | """))) | |
172 |
|
171 | |||
173 | func_contexts.append(('async-func', True, dedent(""" |
|
172 | func_contexts.append(('async-func', True, dedent(""" | |
174 | async def f():"""))) |
|
173 | async def f():"""))) | |
175 |
|
174 | |||
176 | func_contexts.append(('async-method', True, dedent(""" |
|
175 | func_contexts.append(('async-method', True, dedent(""" | |
177 | class MyClass: |
|
176 | class MyClass: | |
178 | async def f(self):"""))) |
|
177 | async def f(self):"""))) | |
179 |
|
178 | |||
180 | func_contexts.append(('closure', False, dedent(""" |
|
179 | func_contexts.append(('closure', False, dedent(""" | |
181 | def f(): |
|
180 | def f(): | |
182 | def g(): |
|
181 | def g(): | |
183 | """))) |
|
182 | """))) | |
184 |
|
183 | |||
185 | def nest_case(context, case): |
|
184 | def nest_case(context, case): | |
186 | # Detect indentation |
|
185 | # Detect indentation | |
187 | lines = context.strip().splitlines() |
|
186 | lines = context.strip().splitlines() | |
188 | prefix_len = 0 |
|
187 | prefix_len = 0 | |
189 | for c in lines[-1]: |
|
188 | for c in lines[-1]: | |
190 | if c != ' ': |
|
189 | if c != ' ': | |
191 | break |
|
190 | break | |
192 | prefix_len += 1 |
|
191 | prefix_len += 1 | |
193 |
|
192 | |||
194 | indented_case = indent(case, ' ' * (prefix_len + 4)) |
|
193 | indented_case = indent(case, ' ' * (prefix_len + 4)) | |
195 | return context + '\n' + indented_case |
|
194 | return context + '\n' + indented_case | |
196 |
|
195 | |||
197 | # Gather and run the tests |
|
196 | # Gather and run the tests | |
198 |
|
197 | |||
199 | # yield is allowed in async functions, starting in Python 3.6, |
|
198 | # yield is allowed in async functions, starting in Python 3.6, | |
200 | # and yield from is not allowed in any version |
|
199 | # and yield from is not allowed in any version | |
201 | vals = ('return', 'yield', 'yield from (_ for _ in range(3))') |
|
200 | vals = ('return', 'yield', 'yield from (_ for _ in range(3))') | |
202 | async_safe = (True, |
|
201 | async_safe = (True, | |
203 | True, |
|
202 | True, | |
204 | False) |
|
203 | False) | |
205 | vals = tuple(zip(vals, async_safe)) |
|
204 | vals = tuple(zip(vals, async_safe)) | |
206 |
|
205 | |||
207 | success_tests = zip(self._get_top_level_cases(), repeat(False)) |
|
206 | success_tests = zip(self._get_top_level_cases(), repeat(False)) | |
208 | failure_tests = zip(self._get_ry_syntax_errors(), repeat(True)) |
|
207 | failure_tests = zip(self._get_ry_syntax_errors(), repeat(True)) | |
209 |
|
208 | |||
210 | tests = chain(success_tests, failure_tests) |
|
209 | tests = chain(success_tests, failure_tests) | |
211 |
|
210 | |||
212 | for context_name, async_func, context in func_contexts: |
|
211 | for context_name, async_func, context in func_contexts: | |
213 | for (test_name, test_case), should_fail in tests: |
|
212 | for (test_name, test_case), should_fail in tests: | |
214 | nested_case = nest_case(context, test_case) |
|
213 | nested_case = nest_case(context, test_case) | |
215 |
|
214 | |||
216 | for val, async_safe in vals: |
|
215 | for val, async_safe in vals: | |
217 | val_should_fail = (should_fail or |
|
216 | val_should_fail = (should_fail or | |
218 | (async_func and not async_safe)) |
|
217 | (async_func and not async_safe)) | |
219 |
|
218 | |||
220 | test_id = (context_name, test_name, val) |
|
219 | test_id = (context_name, test_name, val) | |
221 | cell = nested_case.format(val=val) |
|
220 | cell = nested_case.format(val=val) | |
222 |
|
221 | |||
223 | with self.subTest(test_id): |
|
222 | with self.subTest(test_id): | |
224 | if val_should_fail: |
|
223 | if val_should_fail: | |
225 | msg = ("SyntaxError not raised for %s" % |
|
224 | msg = ("SyntaxError not raised for %s" % | |
226 | str(test_id)) |
|
225 | str(test_id)) | |
227 | with self.assertRaises(SyntaxError, msg=msg): |
|
226 | with self.assertRaises(SyntaxError, msg=msg): | |
228 | iprc(cell) |
|
227 | iprc(cell) | |
229 |
|
228 | |||
230 | print(cell) |
|
229 | print(cell) | |
231 | else: |
|
230 | else: | |
232 | iprc(cell) |
|
231 | iprc(cell) | |
233 |
|
232 | |||
234 | def test_nonlocal(self): |
|
233 | def test_nonlocal(self): | |
235 | # fails if outer scope is not a function scope or if var not defined |
|
234 | # fails if outer scope is not a function scope or if var not defined | |
236 | with self.assertRaises(SyntaxError): |
|
235 | with self.assertRaises(SyntaxError): | |
237 | iprc("nonlocal x") |
|
236 | iprc("nonlocal x") | |
238 | iprc(""" |
|
237 | iprc(""" | |
239 | x = 1 |
|
238 | x = 1 | |
240 | def f(): |
|
239 | def f(): | |
241 | nonlocal x |
|
240 | nonlocal x | |
242 | x = 10000 |
|
241 | x = 10000 | |
243 | yield x |
|
242 | yield x | |
244 | """) |
|
243 | """) | |
245 | iprc(""" |
|
244 | iprc(""" | |
246 | def f(): |
|
245 | def f(): | |
247 | def g(): |
|
246 | def g(): | |
248 | nonlocal x |
|
247 | nonlocal x | |
249 | x = 10000 |
|
248 | x = 10000 | |
250 | yield x |
|
249 | yield x | |
251 | """) |
|
250 | """) | |
252 |
|
251 | |||
253 | # works if outer scope is a function scope and var exists |
|
252 | # works if outer scope is a function scope and var exists | |
254 | iprc(""" |
|
253 | iprc(""" | |
255 | def f(): |
|
254 | def f(): | |
256 | x = 20 |
|
255 | x = 20 | |
257 | def g(): |
|
256 | def g(): | |
258 | nonlocal x |
|
257 | nonlocal x | |
259 | x = 10000 |
|
258 | x = 10000 | |
260 | yield x |
|
259 | yield x | |
261 | """) |
|
260 | """) | |
262 |
|
261 | |||
263 |
|
262 | |||
264 | def test_execute(self): |
|
263 | def test_execute(self): | |
265 | iprc(""" |
|
264 | iprc(""" | |
266 | import asyncio |
|
265 | import asyncio | |
267 | await asyncio.sleep(0.001) |
|
266 | await asyncio.sleep(0.001) | |
268 | """ |
|
267 | """ | |
269 | ) |
|
268 | ) | |
270 |
|
269 | |||
271 | def test_autoawait(self): |
|
270 | def test_autoawait(self): | |
272 | iprc("%autoawait False") |
|
271 | iprc("%autoawait False") | |
273 | iprc("%autoawait True") |
|
272 | iprc("%autoawait True") | |
274 | iprc(""" |
|
273 | iprc(""" | |
275 | from asyncio import sleep |
|
274 | from asyncio import sleep | |
276 | await sleep(0.1) |
|
275 | await sleep(0.1) | |
277 | """ |
|
276 | """ | |
278 | ) |
|
277 | ) | |
279 |
|
278 | |||
280 | @skip_without('curio') |
|
279 | @skip_without('curio') | |
281 | def test_autoawait_curio(self): |
|
280 | def test_autoawait_curio(self): | |
282 | iprc("%autoawait curio") |
|
281 | iprc("%autoawait curio") | |
283 |
|
282 | |||
284 | @skip_without('trio') |
|
283 | @skip_without('trio') | |
285 | def test_autoawait_trio(self): |
|
284 | def test_autoawait_trio(self): | |
286 | iprc("%autoawait trio") |
|
285 | iprc("%autoawait trio") | |
287 |
|
286 | |||
288 | @skip_without('trio') |
|
287 | @skip_without('trio') | |
289 | def test_autoawait_trio_wrong_sleep(self): |
|
288 | def test_autoawait_trio_wrong_sleep(self): | |
290 | iprc("%autoawait trio") |
|
289 | iprc("%autoawait trio") | |
291 | res = iprc_nr(""" |
|
290 | res = iprc_nr(""" | |
292 | import asyncio |
|
291 | import asyncio | |
293 | await asyncio.sleep(0) |
|
292 | await asyncio.sleep(0) | |
294 | """) |
|
293 | """) | |
295 | with nt.assert_raises(TypeError): |
|
294 | with nt.assert_raises(TypeError): | |
296 | res.raise_error() |
|
295 | res.raise_error() | |
297 |
|
296 | |||
298 | @skip_without('trio') |
|
297 | @skip_without('trio') | |
299 | def test_autoawait_asyncio_wrong_sleep(self): |
|
298 | def test_autoawait_asyncio_wrong_sleep(self): | |
300 | iprc("%autoawait asyncio") |
|
299 | iprc("%autoawait asyncio") | |
301 | res = iprc_nr(""" |
|
300 | res = iprc_nr(""" | |
302 | import trio |
|
301 | import trio | |
303 | await trio.sleep(0) |
|
302 | await trio.sleep(0) | |
304 | """) |
|
303 | """) | |
305 | with nt.assert_raises(RuntimeError): |
|
304 | with nt.assert_raises(RuntimeError): | |
306 | res.raise_error() |
|
305 | res.raise_error() | |
307 |
|
306 | |||
308 |
|
307 | |||
309 | def tearDown(self): |
|
308 | def tearDown(self): | |
310 | ip.loop_runner = "asyncio" |
|
309 | ip.loop_runner = "asyncio" |
@@ -1,421 +1,421 b'' | |||||
1 | # Copyright (c) IPython Development Team. |
|
1 | # Copyright (c) IPython Development Team. | |
2 | # Distributed under the terms of the Modified BSD License. |
|
2 | # Distributed under the terms of the Modified BSD License. | |
3 |
|
3 | |||
4 | import json |
|
4 | import json | |
5 | import os |
|
5 | import os | |
6 | import warnings |
|
6 | import warnings | |
7 |
|
7 | |||
8 | from unittest import mock |
|
8 | from unittest import mock | |
9 |
|
9 | |||
10 | import nose.tools as nt |
|
10 | import nose.tools as nt | |
11 |
|
11 | |||
12 | from IPython.core import display |
|
12 | from IPython.core import display | |
13 | from IPython.core.getipython import get_ipython |
|
13 | from IPython.core.getipython import get_ipython | |
14 | from IPython.utils.io import capture_output |
|
14 | from IPython.utils.io import capture_output | |
15 | from IPython.utils.tempdir import NamedFileInTemporaryDirectory |
|
15 | from IPython.utils.tempdir import NamedFileInTemporaryDirectory | |
16 | from IPython import paths as ipath |
|
16 | from IPython import paths as ipath | |
17 |
from IPython.testing.tools import |
|
17 | from IPython.testing.tools import AssertNotPrints | |
18 |
|
18 | |||
19 | import IPython.testing.decorators as dec |
|
19 | import IPython.testing.decorators as dec | |
20 |
|
20 | |||
21 | def test_image_size(): |
|
21 | def test_image_size(): | |
22 | """Simple test for display.Image(args, width=x,height=y)""" |
|
22 | """Simple test for display.Image(args, width=x,height=y)""" | |
23 | thisurl = 'http://www.google.fr/images/srpr/logo3w.png' |
|
23 | thisurl = 'http://www.google.fr/images/srpr/logo3w.png' | |
24 | img = display.Image(url=thisurl, width=200, height=200) |
|
24 | img = display.Image(url=thisurl, width=200, height=200) | |
25 | nt.assert_equal(u'<img src="%s" width="200" height="200"/>' % (thisurl), img._repr_html_()) |
|
25 | nt.assert_equal(u'<img src="%s" width="200" height="200"/>' % (thisurl), img._repr_html_()) | |
26 | img = display.Image(url=thisurl, metadata={'width':200, 'height':200}) |
|
26 | img = display.Image(url=thisurl, metadata={'width':200, 'height':200}) | |
27 | nt.assert_equal(u'<img src="%s" width="200" height="200"/>' % (thisurl), img._repr_html_()) |
|
27 | nt.assert_equal(u'<img src="%s" width="200" height="200"/>' % (thisurl), img._repr_html_()) | |
28 | img = display.Image(url=thisurl, width=200) |
|
28 | img = display.Image(url=thisurl, width=200) | |
29 | nt.assert_equal(u'<img src="%s" width="200"/>' % (thisurl), img._repr_html_()) |
|
29 | nt.assert_equal(u'<img src="%s" width="200"/>' % (thisurl), img._repr_html_()) | |
30 | img = display.Image(url=thisurl) |
|
30 | img = display.Image(url=thisurl) | |
31 | nt.assert_equal(u'<img src="%s"/>' % (thisurl), img._repr_html_()) |
|
31 | nt.assert_equal(u'<img src="%s"/>' % (thisurl), img._repr_html_()) | |
32 | img = display.Image(url=thisurl, unconfined=True) |
|
32 | img = display.Image(url=thisurl, unconfined=True) | |
33 | nt.assert_equal(u'<img src="%s" class="unconfined"/>' % (thisurl), img._repr_html_()) |
|
33 | nt.assert_equal(u'<img src="%s" class="unconfined"/>' % (thisurl), img._repr_html_()) | |
34 |
|
34 | |||
35 |
|
35 | |||
36 | def test_image_mimes(): |
|
36 | def test_image_mimes(): | |
37 | fmt = get_ipython().display_formatter.format |
|
37 | fmt = get_ipython().display_formatter.format | |
38 | for format in display.Image._ACCEPTABLE_EMBEDDINGS: |
|
38 | for format in display.Image._ACCEPTABLE_EMBEDDINGS: | |
39 | mime = display.Image._MIMETYPES[format] |
|
39 | mime = display.Image._MIMETYPES[format] | |
40 | img = display.Image(b'garbage', format=format) |
|
40 | img = display.Image(b'garbage', format=format) | |
41 | data, metadata = fmt(img) |
|
41 | data, metadata = fmt(img) | |
42 | nt.assert_equal(sorted(data), sorted([mime, 'text/plain'])) |
|
42 | nt.assert_equal(sorted(data), sorted([mime, 'text/plain'])) | |
43 |
|
43 | |||
44 |
|
44 | |||
45 | def test_geojson(): |
|
45 | def test_geojson(): | |
46 |
|
46 | |||
47 | gj = display.GeoJSON(data={ |
|
47 | gj = display.GeoJSON(data={ | |
48 | "type": "Feature", |
|
48 | "type": "Feature", | |
49 | "geometry": { |
|
49 | "geometry": { | |
50 | "type": "Point", |
|
50 | "type": "Point", | |
51 | "coordinates": [-81.327, 296.038] |
|
51 | "coordinates": [-81.327, 296.038] | |
52 | }, |
|
52 | }, | |
53 | "properties": { |
|
53 | "properties": { | |
54 | "name": "Inca City" |
|
54 | "name": "Inca City" | |
55 | } |
|
55 | } | |
56 | }, |
|
56 | }, | |
57 | url_template="http://s3-eu-west-1.amazonaws.com/whereonmars.cartodb.net/{basemap_id}/{z}/{x}/{y}.png", |
|
57 | url_template="http://s3-eu-west-1.amazonaws.com/whereonmars.cartodb.net/{basemap_id}/{z}/{x}/{y}.png", | |
58 | layer_options={ |
|
58 | layer_options={ | |
59 | "basemap_id": "celestia_mars-shaded-16k_global", |
|
59 | "basemap_id": "celestia_mars-shaded-16k_global", | |
60 | "attribution": "Celestia/praesepe", |
|
60 | "attribution": "Celestia/praesepe", | |
61 | "minZoom": 0, |
|
61 | "minZoom": 0, | |
62 | "maxZoom": 18, |
|
62 | "maxZoom": 18, | |
63 | }) |
|
63 | }) | |
64 | nt.assert_equal(u'<IPython.core.display.GeoJSON object>', str(gj)) |
|
64 | nt.assert_equal(u'<IPython.core.display.GeoJSON object>', str(gj)) | |
65 |
|
65 | |||
66 | def test_retina_png(): |
|
66 | def test_retina_png(): | |
67 | here = os.path.dirname(__file__) |
|
67 | here = os.path.dirname(__file__) | |
68 | img = display.Image(os.path.join(here, "2x2.png"), retina=True) |
|
68 | img = display.Image(os.path.join(here, "2x2.png"), retina=True) | |
69 | nt.assert_equal(img.height, 1) |
|
69 | nt.assert_equal(img.height, 1) | |
70 | nt.assert_equal(img.width, 1) |
|
70 | nt.assert_equal(img.width, 1) | |
71 | data, md = img._repr_png_() |
|
71 | data, md = img._repr_png_() | |
72 | nt.assert_equal(md['width'], 1) |
|
72 | nt.assert_equal(md['width'], 1) | |
73 | nt.assert_equal(md['height'], 1) |
|
73 | nt.assert_equal(md['height'], 1) | |
74 |
|
74 | |||
75 | def test_retina_jpeg(): |
|
75 | def test_retina_jpeg(): | |
76 | here = os.path.dirname(__file__) |
|
76 | here = os.path.dirname(__file__) | |
77 | img = display.Image(os.path.join(here, "2x2.jpg"), retina=True) |
|
77 | img = display.Image(os.path.join(here, "2x2.jpg"), retina=True) | |
78 | nt.assert_equal(img.height, 1) |
|
78 | nt.assert_equal(img.height, 1) | |
79 | nt.assert_equal(img.width, 1) |
|
79 | nt.assert_equal(img.width, 1) | |
80 | data, md = img._repr_jpeg_() |
|
80 | data, md = img._repr_jpeg_() | |
81 | nt.assert_equal(md['width'], 1) |
|
81 | nt.assert_equal(md['width'], 1) | |
82 | nt.assert_equal(md['height'], 1) |
|
82 | nt.assert_equal(md['height'], 1) | |
83 |
|
83 | |||
84 | def test_base64image(): |
|
84 | def test_base64image(): | |
85 | display.Image("iVBORw0KGgoAAAANSUhEUgAAAAEAAAABAQMAAAAl21bKAAAAA1BMVEUAAACnej3aAAAAAWJLR0QAiAUdSAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB94BCRQnOqNu0b4AAAAKSURBVAjXY2AAAAACAAHiIbwzAAAAAElFTkSuQmCC") |
|
85 | display.Image("iVBORw0KGgoAAAANSUhEUgAAAAEAAAABAQMAAAAl21bKAAAAA1BMVEUAAACnej3aAAAAAWJLR0QAiAUdSAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB94BCRQnOqNu0b4AAAAKSURBVAjXY2AAAAACAAHiIbwzAAAAAElFTkSuQmCC") | |
86 |
|
86 | |||
87 | def test_image_filename_defaults(): |
|
87 | def test_image_filename_defaults(): | |
88 | '''test format constraint, and validity of jpeg and png''' |
|
88 | '''test format constraint, and validity of jpeg and png''' | |
89 | tpath = ipath.get_ipython_package_dir() |
|
89 | tpath = ipath.get_ipython_package_dir() | |
90 | nt.assert_raises(ValueError, display.Image, filename=os.path.join(tpath, 'testing/tests/badformat.zip'), |
|
90 | nt.assert_raises(ValueError, display.Image, filename=os.path.join(tpath, 'testing/tests/badformat.zip'), | |
91 | embed=True) |
|
91 | embed=True) | |
92 | nt.assert_raises(ValueError, display.Image) |
|
92 | nt.assert_raises(ValueError, display.Image) | |
93 | nt.assert_raises(ValueError, display.Image, data='this is not an image', format='badformat', embed=True) |
|
93 | nt.assert_raises(ValueError, display.Image, data='this is not an image', format='badformat', embed=True) | |
94 | # check boths paths to allow packages to test at build and install time |
|
94 | # check boths paths to allow packages to test at build and install time | |
95 | imgfile = os.path.join(tpath, 'core/tests/2x2.png') |
|
95 | imgfile = os.path.join(tpath, 'core/tests/2x2.png') | |
96 | img = display.Image(filename=imgfile) |
|
96 | img = display.Image(filename=imgfile) | |
97 | nt.assert_equal('png', img.format) |
|
97 | nt.assert_equal('png', img.format) | |
98 | nt.assert_is_not_none(img._repr_png_()) |
|
98 | nt.assert_is_not_none(img._repr_png_()) | |
99 | img = display.Image(filename=os.path.join(tpath, 'testing/tests/logo.jpg'), embed=False) |
|
99 | img = display.Image(filename=os.path.join(tpath, 'testing/tests/logo.jpg'), embed=False) | |
100 | nt.assert_equal('jpeg', img.format) |
|
100 | nt.assert_equal('jpeg', img.format) | |
101 | nt.assert_is_none(img._repr_jpeg_()) |
|
101 | nt.assert_is_none(img._repr_jpeg_()) | |
102 |
|
102 | |||
103 | def _get_inline_config(): |
|
103 | def _get_inline_config(): | |
104 | from ipykernel.pylab.config import InlineBackend |
|
104 | from ipykernel.pylab.config import InlineBackend | |
105 | return InlineBackend.instance() |
|
105 | return InlineBackend.instance() | |
106 |
|
106 | |||
107 | @dec.skip_without('matplotlib') |
|
107 | @dec.skip_without('matplotlib') | |
108 | def test_set_matplotlib_close(): |
|
108 | def test_set_matplotlib_close(): | |
109 | cfg = _get_inline_config() |
|
109 | cfg = _get_inline_config() | |
110 | cfg.close_figures = False |
|
110 | cfg.close_figures = False | |
111 | display.set_matplotlib_close() |
|
111 | display.set_matplotlib_close() | |
112 | assert cfg.close_figures |
|
112 | assert cfg.close_figures | |
113 | display.set_matplotlib_close(False) |
|
113 | display.set_matplotlib_close(False) | |
114 | assert not cfg.close_figures |
|
114 | assert not cfg.close_figures | |
115 |
|
115 | |||
116 | _fmt_mime_map = { |
|
116 | _fmt_mime_map = { | |
117 | 'png': 'image/png', |
|
117 | 'png': 'image/png', | |
118 | 'jpeg': 'image/jpeg', |
|
118 | 'jpeg': 'image/jpeg', | |
119 | 'pdf': 'application/pdf', |
|
119 | 'pdf': 'application/pdf', | |
120 | 'retina': 'image/png', |
|
120 | 'retina': 'image/png', | |
121 | 'svg': 'image/svg+xml', |
|
121 | 'svg': 'image/svg+xml', | |
122 | } |
|
122 | } | |
123 |
|
123 | |||
124 | @dec.skip_without('matplotlib') |
|
124 | @dec.skip_without('matplotlib') | |
125 | def test_set_matplotlib_formats(): |
|
125 | def test_set_matplotlib_formats(): | |
126 | from matplotlib.figure import Figure |
|
126 | from matplotlib.figure import Figure | |
127 | formatters = get_ipython().display_formatter.formatters |
|
127 | formatters = get_ipython().display_formatter.formatters | |
128 | for formats in [ |
|
128 | for formats in [ | |
129 | ('png',), |
|
129 | ('png',), | |
130 | ('pdf', 'svg'), |
|
130 | ('pdf', 'svg'), | |
131 | ('jpeg', 'retina', 'png'), |
|
131 | ('jpeg', 'retina', 'png'), | |
132 | (), |
|
132 | (), | |
133 | ]: |
|
133 | ]: | |
134 | active_mimes = {_fmt_mime_map[fmt] for fmt in formats} |
|
134 | active_mimes = {_fmt_mime_map[fmt] for fmt in formats} | |
135 | display.set_matplotlib_formats(*formats) |
|
135 | display.set_matplotlib_formats(*formats) | |
136 | for mime, f in formatters.items(): |
|
136 | for mime, f in formatters.items(): | |
137 | if mime in active_mimes: |
|
137 | if mime in active_mimes: | |
138 | nt.assert_in(Figure, f) |
|
138 | nt.assert_in(Figure, f) | |
139 | else: |
|
139 | else: | |
140 | nt.assert_not_in(Figure, f) |
|
140 | nt.assert_not_in(Figure, f) | |
141 |
|
141 | |||
142 | @dec.skip_without('matplotlib') |
|
142 | @dec.skip_without('matplotlib') | |
143 | def test_set_matplotlib_formats_kwargs(): |
|
143 | def test_set_matplotlib_formats_kwargs(): | |
144 | from matplotlib.figure import Figure |
|
144 | from matplotlib.figure import Figure | |
145 | ip = get_ipython() |
|
145 | ip = get_ipython() | |
146 | cfg = _get_inline_config() |
|
146 | cfg = _get_inline_config() | |
147 | cfg.print_figure_kwargs.update(dict(foo='bar')) |
|
147 | cfg.print_figure_kwargs.update(dict(foo='bar')) | |
148 | kwargs = dict(quality=10) |
|
148 | kwargs = dict(quality=10) | |
149 | display.set_matplotlib_formats('png', **kwargs) |
|
149 | display.set_matplotlib_formats('png', **kwargs) | |
150 | formatter = ip.display_formatter.formatters['image/png'] |
|
150 | formatter = ip.display_formatter.formatters['image/png'] | |
151 | f = formatter.lookup_by_type(Figure) |
|
151 | f = formatter.lookup_by_type(Figure) | |
152 | cell = f.__closure__[0].cell_contents |
|
152 | cell = f.__closure__[0].cell_contents | |
153 | expected = kwargs |
|
153 | expected = kwargs | |
154 | expected.update(cfg.print_figure_kwargs) |
|
154 | expected.update(cfg.print_figure_kwargs) | |
155 | nt.assert_equal(cell, expected) |
|
155 | nt.assert_equal(cell, expected) | |
156 |
|
156 | |||
157 | def test_display_available(): |
|
157 | def test_display_available(): | |
158 | """ |
|
158 | """ | |
159 | Test that display is available without import |
|
159 | Test that display is available without import | |
160 |
|
160 | |||
161 | We don't really care if it's in builtin or anything else, but it should |
|
161 | We don't really care if it's in builtin or anything else, but it should | |
162 | always be available. |
|
162 | always be available. | |
163 | """ |
|
163 | """ | |
164 | ip = get_ipython() |
|
164 | ip = get_ipython() | |
165 | with AssertNotPrints('NameError'): |
|
165 | with AssertNotPrints('NameError'): | |
166 | ip.run_cell('display') |
|
166 | ip.run_cell('display') | |
167 | try: |
|
167 | try: | |
168 | ip.run_cell('del display') |
|
168 | ip.run_cell('del display') | |
169 | except NameError: |
|
169 | except NameError: | |
170 | pass # it's ok, it might be in builtins |
|
170 | pass # it's ok, it might be in builtins | |
171 | # even if deleted it should be back |
|
171 | # even if deleted it should be back | |
172 | with AssertNotPrints('NameError'): |
|
172 | with AssertNotPrints('NameError'): | |
173 | ip.run_cell('display') |
|
173 | ip.run_cell('display') | |
174 |
|
174 | |||
175 | def test_textdisplayobj_pretty_repr(): |
|
175 | def test_textdisplayobj_pretty_repr(): | |
176 | p = display.Pretty("This is a simple test") |
|
176 | p = display.Pretty("This is a simple test") | |
177 | nt.assert_equal(repr(p), '<IPython.core.display.Pretty object>') |
|
177 | nt.assert_equal(repr(p), '<IPython.core.display.Pretty object>') | |
178 | nt.assert_equal(p.data, 'This is a simple test') |
|
178 | nt.assert_equal(p.data, 'This is a simple test') | |
179 |
|
179 | |||
180 | p._show_mem_addr = True |
|
180 | p._show_mem_addr = True | |
181 | nt.assert_equal(repr(p), object.__repr__(p)) |
|
181 | nt.assert_equal(repr(p), object.__repr__(p)) | |
182 |
|
182 | |||
183 | def test_displayobject_repr(): |
|
183 | def test_displayobject_repr(): | |
184 | h = display.HTML('<br />') |
|
184 | h = display.HTML('<br />') | |
185 | nt.assert_equal(repr(h), '<IPython.core.display.HTML object>') |
|
185 | nt.assert_equal(repr(h), '<IPython.core.display.HTML object>') | |
186 | h._show_mem_addr = True |
|
186 | h._show_mem_addr = True | |
187 | nt.assert_equal(repr(h), object.__repr__(h)) |
|
187 | nt.assert_equal(repr(h), object.__repr__(h)) | |
188 | h._show_mem_addr = False |
|
188 | h._show_mem_addr = False | |
189 | nt.assert_equal(repr(h), '<IPython.core.display.HTML object>') |
|
189 | nt.assert_equal(repr(h), '<IPython.core.display.HTML object>') | |
190 |
|
190 | |||
191 | j = display.Javascript('') |
|
191 | j = display.Javascript('') | |
192 | nt.assert_equal(repr(j), '<IPython.core.display.Javascript object>') |
|
192 | nt.assert_equal(repr(j), '<IPython.core.display.Javascript object>') | |
193 | j._show_mem_addr = True |
|
193 | j._show_mem_addr = True | |
194 | nt.assert_equal(repr(j), object.__repr__(j)) |
|
194 | nt.assert_equal(repr(j), object.__repr__(j)) | |
195 | j._show_mem_addr = False |
|
195 | j._show_mem_addr = False | |
196 | nt.assert_equal(repr(j), '<IPython.core.display.Javascript object>') |
|
196 | nt.assert_equal(repr(j), '<IPython.core.display.Javascript object>') | |
197 |
|
197 | |||
198 | @mock.patch('warnings.warn') |
|
198 | @mock.patch('warnings.warn') | |
199 | def test_encourage_iframe_over_html(m_warn): |
|
199 | def test_encourage_iframe_over_html(m_warn): | |
200 | display.HTML() |
|
200 | display.HTML() | |
201 | m_warn.assert_not_called() |
|
201 | m_warn.assert_not_called() | |
202 |
|
202 | |||
203 | display.HTML('<br />') |
|
203 | display.HTML('<br />') | |
204 | m_warn.assert_not_called() |
|
204 | m_warn.assert_not_called() | |
205 |
|
205 | |||
206 | display.HTML('<html><p>Lots of content here</p><iframe src="http://a.com"></iframe>') |
|
206 | display.HTML('<html><p>Lots of content here</p><iframe src="http://a.com"></iframe>') | |
207 | m_warn.assert_not_called() |
|
207 | m_warn.assert_not_called() | |
208 |
|
208 | |||
209 | display.HTML('<iframe src="http://a.com"></iframe>') |
|
209 | display.HTML('<iframe src="http://a.com"></iframe>') | |
210 | m_warn.assert_called_with('Consider using IPython.display.IFrame instead') |
|
210 | m_warn.assert_called_with('Consider using IPython.display.IFrame instead') | |
211 |
|
211 | |||
212 | m_warn.reset_mock() |
|
212 | m_warn.reset_mock() | |
213 | display.HTML('<IFRAME SRC="http://a.com"></IFRAME>') |
|
213 | display.HTML('<IFRAME SRC="http://a.com"></IFRAME>') | |
214 | m_warn.assert_called_with('Consider using IPython.display.IFrame instead') |
|
214 | m_warn.assert_called_with('Consider using IPython.display.IFrame instead') | |
215 |
|
215 | |||
216 | def test_progress(): |
|
216 | def test_progress(): | |
217 | p = display.ProgressBar(10) |
|
217 | p = display.ProgressBar(10) | |
218 | nt.assert_in('0/10',repr(p)) |
|
218 | nt.assert_in('0/10',repr(p)) | |
219 | p.html_width = '100%' |
|
219 | p.html_width = '100%' | |
220 | p.progress = 5 |
|
220 | p.progress = 5 | |
221 | nt.assert_equal(p._repr_html_(), "<progress style='width:100%' max='10' value='5'></progress>") |
|
221 | nt.assert_equal(p._repr_html_(), "<progress style='width:100%' max='10' value='5'></progress>") | |
222 |
|
222 | |||
223 | def test_progress_iter(): |
|
223 | def test_progress_iter(): | |
224 | with capture_output(display=False) as captured: |
|
224 | with capture_output(display=False) as captured: | |
225 | for i in display.ProgressBar(5): |
|
225 | for i in display.ProgressBar(5): | |
226 | out = captured.stdout |
|
226 | out = captured.stdout | |
227 | nt.assert_in('{0}/5'.format(i), out) |
|
227 | nt.assert_in('{0}/5'.format(i), out) | |
228 | out = captured.stdout |
|
228 | out = captured.stdout | |
229 | nt.assert_in('5/5', out) |
|
229 | nt.assert_in('5/5', out) | |
230 |
|
230 | |||
231 | def test_json(): |
|
231 | def test_json(): | |
232 | d = {'a': 5} |
|
232 | d = {'a': 5} | |
233 | lis = [d] |
|
233 | lis = [d] | |
234 | metadata = [ |
|
234 | metadata = [ | |
235 | {'expanded': False, 'root': 'root'}, |
|
235 | {'expanded': False, 'root': 'root'}, | |
236 | {'expanded': True, 'root': 'root'}, |
|
236 | {'expanded': True, 'root': 'root'}, | |
237 | {'expanded': False, 'root': 'custom'}, |
|
237 | {'expanded': False, 'root': 'custom'}, | |
238 | {'expanded': True, 'root': 'custom'}, |
|
238 | {'expanded': True, 'root': 'custom'}, | |
239 | ] |
|
239 | ] | |
240 | json_objs = [ |
|
240 | json_objs = [ | |
241 | display.JSON(d), |
|
241 | display.JSON(d), | |
242 | display.JSON(d, expanded=True), |
|
242 | display.JSON(d, expanded=True), | |
243 | display.JSON(d, root='custom'), |
|
243 | display.JSON(d, root='custom'), | |
244 | display.JSON(d, expanded=True, root='custom'), |
|
244 | display.JSON(d, expanded=True, root='custom'), | |
245 | ] |
|
245 | ] | |
246 | for j, md in zip(json_objs, metadata): |
|
246 | for j, md in zip(json_objs, metadata): | |
247 | nt.assert_equal(j._repr_json_(), (d, md)) |
|
247 | nt.assert_equal(j._repr_json_(), (d, md)) | |
248 |
|
248 | |||
249 | with warnings.catch_warnings(record=True) as w: |
|
249 | with warnings.catch_warnings(record=True) as w: | |
250 | warnings.simplefilter("always") |
|
250 | warnings.simplefilter("always") | |
251 | j = display.JSON(json.dumps(d)) |
|
251 | j = display.JSON(json.dumps(d)) | |
252 | nt.assert_equal(len(w), 1) |
|
252 | nt.assert_equal(len(w), 1) | |
253 | nt.assert_equal(j._repr_json_(), (d, metadata[0])) |
|
253 | nt.assert_equal(j._repr_json_(), (d, metadata[0])) | |
254 |
|
254 | |||
255 | json_objs = [ |
|
255 | json_objs = [ | |
256 | display.JSON(lis), |
|
256 | display.JSON(lis), | |
257 | display.JSON(lis, expanded=True), |
|
257 | display.JSON(lis, expanded=True), | |
258 | display.JSON(lis, root='custom'), |
|
258 | display.JSON(lis, root='custom'), | |
259 | display.JSON(lis, expanded=True, root='custom'), |
|
259 | display.JSON(lis, expanded=True, root='custom'), | |
260 | ] |
|
260 | ] | |
261 | for j, md in zip(json_objs, metadata): |
|
261 | for j, md in zip(json_objs, metadata): | |
262 | nt.assert_equal(j._repr_json_(), (lis, md)) |
|
262 | nt.assert_equal(j._repr_json_(), (lis, md)) | |
263 |
|
263 | |||
264 | with warnings.catch_warnings(record=True) as w: |
|
264 | with warnings.catch_warnings(record=True) as w: | |
265 | warnings.simplefilter("always") |
|
265 | warnings.simplefilter("always") | |
266 | j = display.JSON(json.dumps(lis)) |
|
266 | j = display.JSON(json.dumps(lis)) | |
267 | nt.assert_equal(len(w), 1) |
|
267 | nt.assert_equal(len(w), 1) | |
268 | nt.assert_equal(j._repr_json_(), (lis, metadata[0])) |
|
268 | nt.assert_equal(j._repr_json_(), (lis, metadata[0])) | |
269 |
|
269 | |||
270 | def test_video_embedding(): |
|
270 | def test_video_embedding(): | |
271 | """use a tempfile, with dummy-data, to ensure that video embedding doesn't crash""" |
|
271 | """use a tempfile, with dummy-data, to ensure that video embedding doesn't crash""" | |
272 | v = display.Video("http://ignored") |
|
272 | v = display.Video("http://ignored") | |
273 | assert not v.embed |
|
273 | assert not v.embed | |
274 | html = v._repr_html_() |
|
274 | html = v._repr_html_() | |
275 | nt.assert_not_in('src="data:', html) |
|
275 | nt.assert_not_in('src="data:', html) | |
276 | nt.assert_in('src="http://ignored"', html) |
|
276 | nt.assert_in('src="http://ignored"', html) | |
277 |
|
277 | |||
278 | with nt.assert_raises(ValueError): |
|
278 | with nt.assert_raises(ValueError): | |
279 | v = display.Video(b'abc') |
|
279 | v = display.Video(b'abc') | |
280 |
|
280 | |||
281 | with NamedFileInTemporaryDirectory('test.mp4') as f: |
|
281 | with NamedFileInTemporaryDirectory('test.mp4') as f: | |
282 | f.write(b'abc') |
|
282 | f.write(b'abc') | |
283 | f.close() |
|
283 | f.close() | |
284 |
|
284 | |||
285 | v = display.Video(f.name) |
|
285 | v = display.Video(f.name) | |
286 | assert not v.embed |
|
286 | assert not v.embed | |
287 | html = v._repr_html_() |
|
287 | html = v._repr_html_() | |
288 | nt.assert_not_in('src="data:', html) |
|
288 | nt.assert_not_in('src="data:', html) | |
289 |
|
289 | |||
290 | v = display.Video(f.name, embed=True) |
|
290 | v = display.Video(f.name, embed=True) | |
291 | html = v._repr_html_() |
|
291 | html = v._repr_html_() | |
292 | nt.assert_in('src="data:video/mp4;base64,YWJj"',html) |
|
292 | nt.assert_in('src="data:video/mp4;base64,YWJj"',html) | |
293 |
|
293 | |||
294 | v = display.Video(f.name, embed=True, mimetype='video/other') |
|
294 | v = display.Video(f.name, embed=True, mimetype='video/other') | |
295 | html = v._repr_html_() |
|
295 | html = v._repr_html_() | |
296 | nt.assert_in('src="data:video/other;base64,YWJj"',html) |
|
296 | nt.assert_in('src="data:video/other;base64,YWJj"',html) | |
297 |
|
297 | |||
298 | v = display.Video(b'abc', embed=True, mimetype='video/mp4') |
|
298 | v = display.Video(b'abc', embed=True, mimetype='video/mp4') | |
299 | html = v._repr_html_() |
|
299 | html = v._repr_html_() | |
300 | nt.assert_in('src="data:video/mp4;base64,YWJj"',html) |
|
300 | nt.assert_in('src="data:video/mp4;base64,YWJj"',html) | |
301 |
|
301 | |||
302 | v = display.Video(u'YWJj', embed=True, mimetype='video/xyz') |
|
302 | v = display.Video(u'YWJj', embed=True, mimetype='video/xyz') | |
303 | html = v._repr_html_() |
|
303 | html = v._repr_html_() | |
304 | nt.assert_in('src="data:video/xyz;base64,YWJj"',html) |
|
304 | nt.assert_in('src="data:video/xyz;base64,YWJj"',html) | |
305 |
|
305 | |||
306 | def test_html_metadata(): |
|
306 | def test_html_metadata(): | |
307 | s = "<h1>Test</h1>" |
|
307 | s = "<h1>Test</h1>" | |
308 | h = display.HTML(s, metadata={"isolated": True}) |
|
308 | h = display.HTML(s, metadata={"isolated": True}) | |
309 | nt.assert_equal(h._repr_html_(), (s, {"isolated": True})) |
|
309 | nt.assert_equal(h._repr_html_(), (s, {"isolated": True})) | |
310 |
|
310 | |||
311 | def test_display_id(): |
|
311 | def test_display_id(): | |
312 | ip = get_ipython() |
|
312 | ip = get_ipython() | |
313 | with mock.patch.object(ip.display_pub, 'publish') as pub: |
|
313 | with mock.patch.object(ip.display_pub, 'publish') as pub: | |
314 | handle = display.display('x') |
|
314 | handle = display.display('x') | |
315 | nt.assert_is(handle, None) |
|
315 | nt.assert_is(handle, None) | |
316 | handle = display.display('y', display_id='secret') |
|
316 | handle = display.display('y', display_id='secret') | |
317 | nt.assert_is_instance(handle, display.DisplayHandle) |
|
317 | nt.assert_is_instance(handle, display.DisplayHandle) | |
318 | handle2 = display.display('z', display_id=True) |
|
318 | handle2 = display.display('z', display_id=True) | |
319 | nt.assert_is_instance(handle2, display.DisplayHandle) |
|
319 | nt.assert_is_instance(handle2, display.DisplayHandle) | |
320 | nt.assert_not_equal(handle.display_id, handle2.display_id) |
|
320 | nt.assert_not_equal(handle.display_id, handle2.display_id) | |
321 |
|
321 | |||
322 | nt.assert_equal(pub.call_count, 3) |
|
322 | nt.assert_equal(pub.call_count, 3) | |
323 | args, kwargs = pub.call_args_list[0] |
|
323 | args, kwargs = pub.call_args_list[0] | |
324 | nt.assert_equal(args, ()) |
|
324 | nt.assert_equal(args, ()) | |
325 | nt.assert_equal(kwargs, { |
|
325 | nt.assert_equal(kwargs, { | |
326 | 'data': { |
|
326 | 'data': { | |
327 | 'text/plain': repr('x') |
|
327 | 'text/plain': repr('x') | |
328 | }, |
|
328 | }, | |
329 | 'metadata': {}, |
|
329 | 'metadata': {}, | |
330 | }) |
|
330 | }) | |
331 | args, kwargs = pub.call_args_list[1] |
|
331 | args, kwargs = pub.call_args_list[1] | |
332 | nt.assert_equal(args, ()) |
|
332 | nt.assert_equal(args, ()) | |
333 | nt.assert_equal(kwargs, { |
|
333 | nt.assert_equal(kwargs, { | |
334 | 'data': { |
|
334 | 'data': { | |
335 | 'text/plain': repr('y') |
|
335 | 'text/plain': repr('y') | |
336 | }, |
|
336 | }, | |
337 | 'metadata': {}, |
|
337 | 'metadata': {}, | |
338 | 'transient': { |
|
338 | 'transient': { | |
339 | 'display_id': handle.display_id, |
|
339 | 'display_id': handle.display_id, | |
340 | }, |
|
340 | }, | |
341 | }) |
|
341 | }) | |
342 | args, kwargs = pub.call_args_list[2] |
|
342 | args, kwargs = pub.call_args_list[2] | |
343 | nt.assert_equal(args, ()) |
|
343 | nt.assert_equal(args, ()) | |
344 | nt.assert_equal(kwargs, { |
|
344 | nt.assert_equal(kwargs, { | |
345 | 'data': { |
|
345 | 'data': { | |
346 | 'text/plain': repr('z') |
|
346 | 'text/plain': repr('z') | |
347 | }, |
|
347 | }, | |
348 | 'metadata': {}, |
|
348 | 'metadata': {}, | |
349 | 'transient': { |
|
349 | 'transient': { | |
350 | 'display_id': handle2.display_id, |
|
350 | 'display_id': handle2.display_id, | |
351 | }, |
|
351 | }, | |
352 | }) |
|
352 | }) | |
353 |
|
353 | |||
354 |
|
354 | |||
355 | def test_update_display(): |
|
355 | def test_update_display(): | |
356 | ip = get_ipython() |
|
356 | ip = get_ipython() | |
357 | with mock.patch.object(ip.display_pub, 'publish') as pub: |
|
357 | with mock.patch.object(ip.display_pub, 'publish') as pub: | |
358 | with nt.assert_raises(TypeError): |
|
358 | with nt.assert_raises(TypeError): | |
359 | display.update_display('x') |
|
359 | display.update_display('x') | |
360 | display.update_display('x', display_id='1') |
|
360 | display.update_display('x', display_id='1') | |
361 | display.update_display('y', display_id='2') |
|
361 | display.update_display('y', display_id='2') | |
362 | args, kwargs = pub.call_args_list[0] |
|
362 | args, kwargs = pub.call_args_list[0] | |
363 | nt.assert_equal(args, ()) |
|
363 | nt.assert_equal(args, ()) | |
364 | nt.assert_equal(kwargs, { |
|
364 | nt.assert_equal(kwargs, { | |
365 | 'data': { |
|
365 | 'data': { | |
366 | 'text/plain': repr('x') |
|
366 | 'text/plain': repr('x') | |
367 | }, |
|
367 | }, | |
368 | 'metadata': {}, |
|
368 | 'metadata': {}, | |
369 | 'transient': { |
|
369 | 'transient': { | |
370 | 'display_id': '1', |
|
370 | 'display_id': '1', | |
371 | }, |
|
371 | }, | |
372 | 'update': True, |
|
372 | 'update': True, | |
373 | }) |
|
373 | }) | |
374 | args, kwargs = pub.call_args_list[1] |
|
374 | args, kwargs = pub.call_args_list[1] | |
375 | nt.assert_equal(args, ()) |
|
375 | nt.assert_equal(args, ()) | |
376 | nt.assert_equal(kwargs, { |
|
376 | nt.assert_equal(kwargs, { | |
377 | 'data': { |
|
377 | 'data': { | |
378 | 'text/plain': repr('y') |
|
378 | 'text/plain': repr('y') | |
379 | }, |
|
379 | }, | |
380 | 'metadata': {}, |
|
380 | 'metadata': {}, | |
381 | 'transient': { |
|
381 | 'transient': { | |
382 | 'display_id': '2', |
|
382 | 'display_id': '2', | |
383 | }, |
|
383 | }, | |
384 | 'update': True, |
|
384 | 'update': True, | |
385 | }) |
|
385 | }) | |
386 |
|
386 | |||
387 |
|
387 | |||
388 | def test_display_handle(): |
|
388 | def test_display_handle(): | |
389 | ip = get_ipython() |
|
389 | ip = get_ipython() | |
390 | handle = display.DisplayHandle() |
|
390 | handle = display.DisplayHandle() | |
391 | nt.assert_is_instance(handle.display_id, str) |
|
391 | nt.assert_is_instance(handle.display_id, str) | |
392 | handle = display.DisplayHandle('my-id') |
|
392 | handle = display.DisplayHandle('my-id') | |
393 | nt.assert_equal(handle.display_id, 'my-id') |
|
393 | nt.assert_equal(handle.display_id, 'my-id') | |
394 | with mock.patch.object(ip.display_pub, 'publish') as pub: |
|
394 | with mock.patch.object(ip.display_pub, 'publish') as pub: | |
395 | handle.display('x') |
|
395 | handle.display('x') | |
396 | handle.update('y') |
|
396 | handle.update('y') | |
397 |
|
397 | |||
398 | args, kwargs = pub.call_args_list[0] |
|
398 | args, kwargs = pub.call_args_list[0] | |
399 | nt.assert_equal(args, ()) |
|
399 | nt.assert_equal(args, ()) | |
400 | nt.assert_equal(kwargs, { |
|
400 | nt.assert_equal(kwargs, { | |
401 | 'data': { |
|
401 | 'data': { | |
402 | 'text/plain': repr('x') |
|
402 | 'text/plain': repr('x') | |
403 | }, |
|
403 | }, | |
404 | 'metadata': {}, |
|
404 | 'metadata': {}, | |
405 | 'transient': { |
|
405 | 'transient': { | |
406 | 'display_id': handle.display_id, |
|
406 | 'display_id': handle.display_id, | |
407 | } |
|
407 | } | |
408 | }) |
|
408 | }) | |
409 | args, kwargs = pub.call_args_list[1] |
|
409 | args, kwargs = pub.call_args_list[1] | |
410 | nt.assert_equal(args, ()) |
|
410 | nt.assert_equal(args, ()) | |
411 | nt.assert_equal(kwargs, { |
|
411 | nt.assert_equal(kwargs, { | |
412 | 'data': { |
|
412 | 'data': { | |
413 | 'text/plain': repr('y') |
|
413 | 'text/plain': repr('y') | |
414 | }, |
|
414 | }, | |
415 | 'metadata': {}, |
|
415 | 'metadata': {}, | |
416 | 'transient': { |
|
416 | 'transient': { | |
417 | 'display_id': handle.display_id, |
|
417 | 'display_id': handle.display_id, | |
418 | }, |
|
418 | }, | |
419 | 'update': True, |
|
419 | 'update': True, | |
420 | }) |
|
420 | }) | |
421 |
|
421 |
@@ -1,93 +1,92 b'' | |||||
1 | from backcall import callback_prototype |
|
|||
2 |
|
|
1 | import unittest | |
3 | from unittest.mock import Mock |
|
2 | from unittest.mock import Mock | |
4 | import nose.tools as nt |
|
3 | import nose.tools as nt | |
5 |
|
4 | |||
6 | from IPython.core import events |
|
5 | from IPython.core import events | |
7 | import IPython.testing.tools as tt |
|
6 | import IPython.testing.tools as tt | |
8 |
|
7 | |||
9 |
|
8 | |||
10 | @events._define_event |
|
9 | @events._define_event | |
11 | def ping_received(): |
|
10 | def ping_received(): | |
12 | pass |
|
11 | pass | |
13 |
|
12 | |||
14 |
|
13 | |||
15 | @events._define_event |
|
14 | @events._define_event | |
16 | def event_with_argument(argument): |
|
15 | def event_with_argument(argument): | |
17 | pass |
|
16 | pass | |
18 |
|
17 | |||
19 |
|
18 | |||
20 | class CallbackTests(unittest.TestCase): |
|
19 | class CallbackTests(unittest.TestCase): | |
21 | def setUp(self): |
|
20 | def setUp(self): | |
22 | self.em = events.EventManager(get_ipython(), |
|
21 | self.em = events.EventManager(get_ipython(), | |
23 | {'ping_received': ping_received, |
|
22 | {'ping_received': ping_received, | |
24 | 'event_with_argument': event_with_argument}) |
|
23 | 'event_with_argument': event_with_argument}) | |
25 |
|
24 | |||
26 | def test_register_unregister(self): |
|
25 | def test_register_unregister(self): | |
27 | cb = Mock() |
|
26 | cb = Mock() | |
28 |
|
27 | |||
29 | self.em.register('ping_received', cb) |
|
28 | self.em.register('ping_received', cb) | |
30 | self.em.trigger('ping_received') |
|
29 | self.em.trigger('ping_received') | |
31 | self.assertEqual(cb.call_count, 1) |
|
30 | self.assertEqual(cb.call_count, 1) | |
32 |
|
31 | |||
33 | self.em.unregister('ping_received', cb) |
|
32 | self.em.unregister('ping_received', cb) | |
34 | self.em.trigger('ping_received') |
|
33 | self.em.trigger('ping_received') | |
35 | self.assertEqual(cb.call_count, 1) |
|
34 | self.assertEqual(cb.call_count, 1) | |
36 |
|
35 | |||
37 | def test_bare_function_missed_unregister(self): |
|
36 | def test_bare_function_missed_unregister(self): | |
38 | def cb1(): |
|
37 | def cb1(): | |
39 | ... |
|
38 | ... | |
40 |
|
39 | |||
41 | def cb2(): |
|
40 | def cb2(): | |
42 | ... |
|
41 | ... | |
43 |
|
42 | |||
44 | self.em.register('ping_received', cb1) |
|
43 | self.em.register('ping_received', cb1) | |
45 | nt.assert_raises(ValueError, self.em.unregister, 'ping_received', cb2) |
|
44 | nt.assert_raises(ValueError, self.em.unregister, 'ping_received', cb2) | |
46 | self.em.unregister('ping_received', cb1) |
|
45 | self.em.unregister('ping_received', cb1) | |
47 |
|
46 | |||
48 | def test_cb_error(self): |
|
47 | def test_cb_error(self): | |
49 | cb = Mock(side_effect=ValueError) |
|
48 | cb = Mock(side_effect=ValueError) | |
50 | self.em.register('ping_received', cb) |
|
49 | self.em.register('ping_received', cb) | |
51 | with tt.AssertPrints("Error in callback"): |
|
50 | with tt.AssertPrints("Error in callback"): | |
52 | self.em.trigger('ping_received') |
|
51 | self.em.trigger('ping_received') | |
53 |
|
52 | |||
54 | def test_cb_keyboard_interrupt(self): |
|
53 | def test_cb_keyboard_interrupt(self): | |
55 | cb = Mock(side_effect=KeyboardInterrupt) |
|
54 | cb = Mock(side_effect=KeyboardInterrupt) | |
56 | self.em.register('ping_received', cb) |
|
55 | self.em.register('ping_received', cb) | |
57 | with tt.AssertPrints("Error in callback"): |
|
56 | with tt.AssertPrints("Error in callback"): | |
58 | self.em.trigger('ping_received') |
|
57 | self.em.trigger('ping_received') | |
59 |
|
58 | |||
60 | def test_unregister_during_callback(self): |
|
59 | def test_unregister_during_callback(self): | |
61 | invoked = [False] * 3 |
|
60 | invoked = [False] * 3 | |
62 |
|
61 | |||
63 | def func1(*_): |
|
62 | def func1(*_): | |
64 | invoked[0] = True |
|
63 | invoked[0] = True | |
65 | self.em.unregister('ping_received', func1) |
|
64 | self.em.unregister('ping_received', func1) | |
66 | self.em.register('ping_received', func3) |
|
65 | self.em.register('ping_received', func3) | |
67 |
|
66 | |||
68 | def func2(*_): |
|
67 | def func2(*_): | |
69 | invoked[1] = True |
|
68 | invoked[1] = True | |
70 | self.em.unregister('ping_received', func2) |
|
69 | self.em.unregister('ping_received', func2) | |
71 |
|
70 | |||
72 | def func3(*_): |
|
71 | def func3(*_): | |
73 | invoked[2] = True |
|
72 | invoked[2] = True | |
74 |
|
73 | |||
75 | self.em.register('ping_received', func1) |
|
74 | self.em.register('ping_received', func1) | |
76 | self.em.register('ping_received', func2) |
|
75 | self.em.register('ping_received', func2) | |
77 |
|
76 | |||
78 | self.em.trigger('ping_received') |
|
77 | self.em.trigger('ping_received') | |
79 | self.assertEqual([True, True, False], invoked) |
|
78 | self.assertEqual([True, True, False], invoked) | |
80 | self.assertEqual([func3], self.em.callbacks['ping_received']) |
|
79 | self.assertEqual([func3], self.em.callbacks['ping_received']) | |
81 |
|
80 | |||
82 | def test_ignore_event_arguments_if_no_argument_required(self): |
|
81 | def test_ignore_event_arguments_if_no_argument_required(self): | |
83 | call_count = [0] |
|
82 | call_count = [0] | |
84 | def event_with_no_argument(): |
|
83 | def event_with_no_argument(): | |
85 | call_count[0] += 1 |
|
84 | call_count[0] += 1 | |
86 |
|
85 | |||
87 | self.em.register('event_with_argument', event_with_no_argument) |
|
86 | self.em.register('event_with_argument', event_with_no_argument) | |
88 | self.em.trigger('event_with_argument', 'the argument') |
|
87 | self.em.trigger('event_with_argument', 'the argument') | |
89 | self.assertEqual(call_count[0], 1) |
|
88 | self.assertEqual(call_count[0], 1) | |
90 |
|
89 | |||
91 | self.em.unregister('event_with_argument', event_with_no_argument) |
|
90 | self.em.unregister('event_with_argument', event_with_no_argument) | |
92 | self.em.trigger('ping_received') |
|
91 | self.em.trigger('ping_received') | |
93 | self.assertEqual(call_count[0], 1) |
|
92 | self.assertEqual(call_count[0], 1) |
@@ -1,95 +1,94 b'' | |||||
1 | """Tests for input handlers. |
|
1 | """Tests for input handlers. | |
2 | """ |
|
2 | """ | |
3 | #----------------------------------------------------------------------------- |
|
3 | #----------------------------------------------------------------------------- | |
4 | # Module imports |
|
4 | # Module imports | |
5 | #----------------------------------------------------------------------------- |
|
5 | #----------------------------------------------------------------------------- | |
6 |
|
6 | |||
7 | # third party |
|
7 | # third party | |
8 | import nose.tools as nt |
|
8 | import nose.tools as nt | |
9 |
|
9 | |||
10 | # our own packages |
|
10 | # our own packages | |
11 | from IPython.core import autocall |
|
11 | from IPython.core import autocall | |
12 | from IPython.testing import tools as tt |
|
12 | from IPython.testing import tools as tt | |
13 | from IPython.utils import py3compat |
|
|||
14 |
|
13 | |||
15 | #----------------------------------------------------------------------------- |
|
14 | #----------------------------------------------------------------------------- | |
16 | # Globals |
|
15 | # Globals | |
17 | #----------------------------------------------------------------------------- |
|
16 | #----------------------------------------------------------------------------- | |
18 |
|
17 | |||
19 | # Get the public instance of IPython |
|
18 | # Get the public instance of IPython | |
20 |
|
19 | |||
21 | failures = [] |
|
20 | failures = [] | |
22 | num_tests = 0 |
|
21 | num_tests = 0 | |
23 |
|
22 | |||
24 | #----------------------------------------------------------------------------- |
|
23 | #----------------------------------------------------------------------------- | |
25 | # Test functions |
|
24 | # Test functions | |
26 | #----------------------------------------------------------------------------- |
|
25 | #----------------------------------------------------------------------------- | |
27 |
|
26 | |||
28 | class CallableIndexable(object): |
|
27 | class CallableIndexable(object): | |
29 | def __getitem__(self, idx): return True |
|
28 | def __getitem__(self, idx): return True | |
30 | def __call__(self, *args, **kws): return True |
|
29 | def __call__(self, *args, **kws): return True | |
31 |
|
30 | |||
32 |
|
31 | |||
33 | class Autocallable(autocall.IPyAutocall): |
|
32 | class Autocallable(autocall.IPyAutocall): | |
34 | def __call__(self): |
|
33 | def __call__(self): | |
35 | return "called" |
|
34 | return "called" | |
36 |
|
35 | |||
37 |
|
36 | |||
38 | def run(tests): |
|
37 | def run(tests): | |
39 | """Loop through a list of (pre, post) inputs, where pre is the string |
|
38 | """Loop through a list of (pre, post) inputs, where pre is the string | |
40 | handed to ipython, and post is how that string looks after it's been |
|
39 | handed to ipython, and post is how that string looks after it's been | |
41 | transformed (i.e. ipython's notion of _i)""" |
|
40 | transformed (i.e. ipython's notion of _i)""" | |
42 | tt.check_pairs(ip.prefilter_manager.prefilter_lines, tests) |
|
41 | tt.check_pairs(ip.prefilter_manager.prefilter_lines, tests) | |
43 |
|
42 | |||
44 |
|
43 | |||
45 | def test_handlers(): |
|
44 | def test_handlers(): | |
46 | call_idx = CallableIndexable() |
|
45 | call_idx = CallableIndexable() | |
47 | ip.user_ns['call_idx'] = call_idx |
|
46 | ip.user_ns['call_idx'] = call_idx | |
48 |
|
47 | |||
49 | # For many of the below, we're also checking that leading whitespace |
|
48 | # For many of the below, we're also checking that leading whitespace | |
50 | # turns off the esc char, which it should unless there is a continuation |
|
49 | # turns off the esc char, which it should unless there is a continuation | |
51 | # line. |
|
50 | # line. | |
52 | run( |
|
51 | run( | |
53 | [('"no change"', '"no change"'), # normal |
|
52 | [('"no change"', '"no change"'), # normal | |
54 | (u"lsmagic", "get_ipython().run_line_magic('lsmagic', '')"), # magic |
|
53 | (u"lsmagic", "get_ipython().run_line_magic('lsmagic', '')"), # magic | |
55 | #("a = b # PYTHON-MODE", '_i'), # emacs -- avoids _in cache |
|
54 | #("a = b # PYTHON-MODE", '_i'), # emacs -- avoids _in cache | |
56 | ]) |
|
55 | ]) | |
57 |
|
56 | |||
58 | # Objects which are instances of IPyAutocall are *always* autocalled |
|
57 | # Objects which are instances of IPyAutocall are *always* autocalled | |
59 | autocallable = Autocallable() |
|
58 | autocallable = Autocallable() | |
60 | ip.user_ns['autocallable'] = autocallable |
|
59 | ip.user_ns['autocallable'] = autocallable | |
61 |
|
60 | |||
62 | # auto |
|
61 | # auto | |
63 | ip.magic('autocall 0') |
|
62 | ip.magic('autocall 0') | |
64 | # Only explicit escapes or instances of IPyAutocallable should get |
|
63 | # Only explicit escapes or instances of IPyAutocallable should get | |
65 | # expanded |
|
64 | # expanded | |
66 | run([ |
|
65 | run([ | |
67 | ('len "abc"', 'len "abc"'), |
|
66 | ('len "abc"', 'len "abc"'), | |
68 | ('autocallable', 'autocallable()'), |
|
67 | ('autocallable', 'autocallable()'), | |
69 | # Don't add extra brackets (gh-1117) |
|
68 | # Don't add extra brackets (gh-1117) | |
70 | ('autocallable()', 'autocallable()'), |
|
69 | ('autocallable()', 'autocallable()'), | |
71 | ]) |
|
70 | ]) | |
72 | ip.magic('autocall 1') |
|
71 | ip.magic('autocall 1') | |
73 | run([ |
|
72 | run([ | |
74 | ('len "abc"', 'len("abc")'), |
|
73 | ('len "abc"', 'len("abc")'), | |
75 | ('len "abc";', 'len("abc");'), # ; is special -- moves out of parens |
|
74 | ('len "abc";', 'len("abc");'), # ; is special -- moves out of parens | |
76 | # Autocall is turned off if first arg is [] and the object |
|
75 | # Autocall is turned off if first arg is [] and the object | |
77 | # is both callable and indexable. Like so: |
|
76 | # is both callable and indexable. Like so: | |
78 | ('len [1,2]', 'len([1,2])'), # len doesn't support __getitem__... |
|
77 | ('len [1,2]', 'len([1,2])'), # len doesn't support __getitem__... | |
79 | ('call_idx [1]', 'call_idx [1]'), # call_idx *does*.. |
|
78 | ('call_idx [1]', 'call_idx [1]'), # call_idx *does*.. | |
80 | ('call_idx 1', 'call_idx(1)'), |
|
79 | ('call_idx 1', 'call_idx(1)'), | |
81 | ('len', 'len'), # only at 2 does it auto-call on single args |
|
80 | ('len', 'len'), # only at 2 does it auto-call on single args | |
82 | ]) |
|
81 | ]) | |
83 | ip.magic('autocall 2') |
|
82 | ip.magic('autocall 2') | |
84 | run([ |
|
83 | run([ | |
85 | ('len "abc"', 'len("abc")'), |
|
84 | ('len "abc"', 'len("abc")'), | |
86 | ('len "abc";', 'len("abc");'), |
|
85 | ('len "abc";', 'len("abc");'), | |
87 | ('len [1,2]', 'len([1,2])'), |
|
86 | ('len [1,2]', 'len([1,2])'), | |
88 | ('call_idx [1]', 'call_idx [1]'), |
|
87 | ('call_idx [1]', 'call_idx [1]'), | |
89 | ('call_idx 1', 'call_idx(1)'), |
|
88 | ('call_idx 1', 'call_idx(1)'), | |
90 | # This is what's different: |
|
89 | # This is what's different: | |
91 | ('len', 'len()'), # only at 2 does it auto-call on single args |
|
90 | ('len', 'len()'), # only at 2 does it auto-call on single args | |
92 | ]) |
|
91 | ]) | |
93 | ip.magic('autocall 1') |
|
92 | ip.magic('autocall 1') | |
94 |
|
93 | |||
95 | nt.assert_equal(failures, []) |
|
94 | nt.assert_equal(failures, []) |
@@ -1,450 +1,447 b'' | |||||
1 | """Tests for autoreload extension. |
|
1 | """Tests for autoreload extension. | |
2 | """ |
|
2 | """ | |
3 | #----------------------------------------------------------------------------- |
|
3 | #----------------------------------------------------------------------------- | |
4 | # Copyright (c) 2012 IPython Development Team. |
|
4 | # Copyright (c) 2012 IPython Development Team. | |
5 | # |
|
5 | # | |
6 | # Distributed under the terms of the Modified BSD License. |
|
6 | # Distributed under the terms of the Modified BSD License. | |
7 | # |
|
7 | # | |
8 | # The full license is in the file COPYING.txt, distributed with this software. |
|
8 | # The full license is in the file COPYING.txt, distributed with this software. | |
9 | #----------------------------------------------------------------------------- |
|
9 | #----------------------------------------------------------------------------- | |
10 |
|
10 | |||
11 | #----------------------------------------------------------------------------- |
|
11 | #----------------------------------------------------------------------------- | |
12 | # Imports |
|
12 | # Imports | |
13 | #----------------------------------------------------------------------------- |
|
13 | #----------------------------------------------------------------------------- | |
14 |
|
14 | |||
15 | import os |
|
15 | import os | |
16 | import sys |
|
16 | import sys | |
17 | import tempfile |
|
17 | import tempfile | |
18 | import textwrap |
|
18 | import textwrap | |
19 | import shutil |
|
19 | import shutil | |
20 | import random |
|
20 | import random | |
21 | import time |
|
21 | import time | |
22 | from io import StringIO |
|
22 | from io import StringIO | |
23 |
|
23 | |||
24 | import nose.tools as nt |
|
24 | import nose.tools as nt | |
25 | import IPython.testing.tools as tt |
|
25 | import IPython.testing.tools as tt | |
26 |
|
26 | |||
27 | from unittest import TestCase |
|
27 | from unittest import TestCase | |
28 |
|
28 | |||
29 | from IPython.testing.decorators import skipif |
|
|||
30 |
|
||||
31 | from IPython.extensions.autoreload import AutoreloadMagics |
|
29 | from IPython.extensions.autoreload import AutoreloadMagics | |
32 | from IPython.core.events import EventManager, pre_run_cell |
|
30 | from IPython.core.events import EventManager, pre_run_cell | |
33 |
|
31 | |||
34 | #----------------------------------------------------------------------------- |
|
32 | #----------------------------------------------------------------------------- | |
35 | # Test fixture |
|
33 | # Test fixture | |
36 | #----------------------------------------------------------------------------- |
|
34 | #----------------------------------------------------------------------------- | |
37 |
|
35 | |||
38 | noop = lambda *a, **kw: None |
|
36 | noop = lambda *a, **kw: None | |
39 |
|
37 | |||
40 | class FakeShell: |
|
38 | class FakeShell: | |
41 |
|
39 | |||
42 | def __init__(self): |
|
40 | def __init__(self): | |
43 | self.ns = {} |
|
41 | self.ns = {} | |
44 | self.user_ns = self.ns |
|
42 | self.user_ns = self.ns | |
45 | self.user_ns_hidden = {} |
|
43 | self.user_ns_hidden = {} | |
46 | self.events = EventManager(self, {'pre_run_cell', pre_run_cell}) |
|
44 | self.events = EventManager(self, {'pre_run_cell', pre_run_cell}) | |
47 | self.auto_magics = AutoreloadMagics(shell=self) |
|
45 | self.auto_magics = AutoreloadMagics(shell=self) | |
48 | self.events.register('pre_run_cell', self.auto_magics.pre_run_cell) |
|
46 | self.events.register('pre_run_cell', self.auto_magics.pre_run_cell) | |
49 |
|
47 | |||
50 | register_magics = set_hook = noop |
|
48 | register_magics = set_hook = noop | |
51 |
|
49 | |||
52 | def run_code(self, code): |
|
50 | def run_code(self, code): | |
53 | self.events.trigger('pre_run_cell') |
|
51 | self.events.trigger('pre_run_cell') | |
54 | exec(code, self.user_ns) |
|
52 | exec(code, self.user_ns) | |
55 | self.auto_magics.post_execute_hook() |
|
53 | self.auto_magics.post_execute_hook() | |
56 |
|
54 | |||
57 | def push(self, items): |
|
55 | def push(self, items): | |
58 | self.ns.update(items) |
|
56 | self.ns.update(items) | |
59 |
|
57 | |||
60 | def magic_autoreload(self, parameter): |
|
58 | def magic_autoreload(self, parameter): | |
61 | self.auto_magics.autoreload(parameter) |
|
59 | self.auto_magics.autoreload(parameter) | |
62 |
|
60 | |||
63 | def magic_aimport(self, parameter, stream=None): |
|
61 | def magic_aimport(self, parameter, stream=None): | |
64 | self.auto_magics.aimport(parameter, stream=stream) |
|
62 | self.auto_magics.aimport(parameter, stream=stream) | |
65 | self.auto_magics.post_execute_hook() |
|
63 | self.auto_magics.post_execute_hook() | |
66 |
|
64 | |||
67 |
|
65 | |||
68 | class Fixture(TestCase): |
|
66 | class Fixture(TestCase): | |
69 | """Fixture for creating test module files""" |
|
67 | """Fixture for creating test module files""" | |
70 |
|
68 | |||
71 | test_dir = None |
|
69 | test_dir = None | |
72 | old_sys_path = None |
|
70 | old_sys_path = None | |
73 | filename_chars = "abcdefghijklmopqrstuvwxyz0123456789" |
|
71 | filename_chars = "abcdefghijklmopqrstuvwxyz0123456789" | |
74 |
|
72 | |||
75 | def setUp(self): |
|
73 | def setUp(self): | |
76 | self.test_dir = tempfile.mkdtemp() |
|
74 | self.test_dir = tempfile.mkdtemp() | |
77 | self.old_sys_path = list(sys.path) |
|
75 | self.old_sys_path = list(sys.path) | |
78 | sys.path.insert(0, self.test_dir) |
|
76 | sys.path.insert(0, self.test_dir) | |
79 | self.shell = FakeShell() |
|
77 | self.shell = FakeShell() | |
80 |
|
78 | |||
81 | def tearDown(self): |
|
79 | def tearDown(self): | |
82 | shutil.rmtree(self.test_dir) |
|
80 | shutil.rmtree(self.test_dir) | |
83 | sys.path = self.old_sys_path |
|
81 | sys.path = self.old_sys_path | |
84 |
|
82 | |||
85 | self.test_dir = None |
|
83 | self.test_dir = None | |
86 | self.old_sys_path = None |
|
84 | self.old_sys_path = None | |
87 | self.shell = None |
|
85 | self.shell = None | |
88 |
|
86 | |||
89 | def get_module(self): |
|
87 | def get_module(self): | |
90 | module_name = "tmpmod_" + "".join(random.sample(self.filename_chars,20)) |
|
88 | module_name = "tmpmod_" + "".join(random.sample(self.filename_chars,20)) | |
91 | if module_name in sys.modules: |
|
89 | if module_name in sys.modules: | |
92 | del sys.modules[module_name] |
|
90 | del sys.modules[module_name] | |
93 | file_name = os.path.join(self.test_dir, module_name + ".py") |
|
91 | file_name = os.path.join(self.test_dir, module_name + ".py") | |
94 | return module_name, file_name |
|
92 | return module_name, file_name | |
95 |
|
93 | |||
96 | def write_file(self, filename, content): |
|
94 | def write_file(self, filename, content): | |
97 | """ |
|
95 | """ | |
98 | Write a file, and force a timestamp difference of at least one second |
|
96 | Write a file, and force a timestamp difference of at least one second | |
99 |
|
97 | |||
100 | Notes |
|
98 | Notes | |
101 | ----- |
|
99 | ----- | |
102 | Python's .pyc files record the timestamp of their compilation |
|
100 | Python's .pyc files record the timestamp of their compilation | |
103 | with a time resolution of one second. |
|
101 | with a time resolution of one second. | |
104 |
|
102 | |||
105 | Therefore, we need to force a timestamp difference between .py |
|
103 | Therefore, we need to force a timestamp difference between .py | |
106 | and .pyc, without having the .py file be timestamped in the |
|
104 | and .pyc, without having the .py file be timestamped in the | |
107 | future, and without changing the timestamp of the .pyc file |
|
105 | future, and without changing the timestamp of the .pyc file | |
108 | (because that is stored in the file). The only reliable way |
|
106 | (because that is stored in the file). The only reliable way | |
109 | to achieve this seems to be to sleep. |
|
107 | to achieve this seems to be to sleep. | |
110 | """ |
|
108 | """ | |
111 | content = textwrap.dedent(content) |
|
109 | content = textwrap.dedent(content) | |
112 | # Sleep one second + eps |
|
110 | # Sleep one second + eps | |
113 | time.sleep(1.05) |
|
111 | time.sleep(1.05) | |
114 |
|
112 | |||
115 | # Write |
|
113 | # Write | |
116 | with open(filename, 'w') as f: |
|
114 | with open(filename, 'w') as f: | |
117 | f.write(content) |
|
115 | f.write(content) | |
118 |
|
116 | |||
119 | def new_module(self, code): |
|
117 | def new_module(self, code): | |
120 | code = textwrap.dedent(code) |
|
118 | code = textwrap.dedent(code) | |
121 | mod_name, mod_fn = self.get_module() |
|
119 | mod_name, mod_fn = self.get_module() | |
122 | with open(mod_fn, 'w') as f: |
|
120 | with open(mod_fn, 'w') as f: | |
123 | f.write(code) |
|
121 | f.write(code) | |
124 | return mod_name, mod_fn |
|
122 | return mod_name, mod_fn | |
125 |
|
123 | |||
126 | #----------------------------------------------------------------------------- |
|
124 | #----------------------------------------------------------------------------- | |
127 | # Test automatic reloading |
|
125 | # Test automatic reloading | |
128 | #----------------------------------------------------------------------------- |
|
126 | #----------------------------------------------------------------------------- | |
129 |
|
127 | |||
130 | def pickle_get_current_class(obj): |
|
128 | def pickle_get_current_class(obj): | |
131 | """ |
|
129 | """ | |
132 | Original issue comes from pickle; hence the name. |
|
130 | Original issue comes from pickle; hence the name. | |
133 | """ |
|
131 | """ | |
134 | name = obj.__class__.__name__ |
|
132 | name = obj.__class__.__name__ | |
135 | module_name = getattr(obj, "__module__", None) |
|
133 | module_name = getattr(obj, "__module__", None) | |
136 | obj2 = sys.modules[module_name] |
|
134 | obj2 = sys.modules[module_name] | |
137 | for subpath in name.split("."): |
|
135 | for subpath in name.split("."): | |
138 | obj2 = getattr(obj2, subpath) |
|
136 | obj2 = getattr(obj2, subpath) | |
139 | return obj2 |
|
137 | return obj2 | |
140 |
|
138 | |||
141 | class TestAutoreload(Fixture): |
|
139 | class TestAutoreload(Fixture): | |
142 |
|
140 | |||
143 | def test_reload_enums(self): |
|
141 | def test_reload_enums(self): | |
144 | import enum |
|
|||
145 | mod_name, mod_fn = self.new_module(textwrap.dedent(""" |
|
142 | mod_name, mod_fn = self.new_module(textwrap.dedent(""" | |
146 | from enum import Enum |
|
143 | from enum import Enum | |
147 | class MyEnum(Enum): |
|
144 | class MyEnum(Enum): | |
148 | A = 'A' |
|
145 | A = 'A' | |
149 | B = 'B' |
|
146 | B = 'B' | |
150 | """)) |
|
147 | """)) | |
151 | self.shell.magic_autoreload("2") |
|
148 | self.shell.magic_autoreload("2") | |
152 | self.shell.magic_aimport(mod_name) |
|
149 | self.shell.magic_aimport(mod_name) | |
153 | self.write_file(mod_fn, textwrap.dedent(""" |
|
150 | self.write_file(mod_fn, textwrap.dedent(""" | |
154 | from enum import Enum |
|
151 | from enum import Enum | |
155 | class MyEnum(Enum): |
|
152 | class MyEnum(Enum): | |
156 | A = 'A' |
|
153 | A = 'A' | |
157 | B = 'B' |
|
154 | B = 'B' | |
158 | C = 'C' |
|
155 | C = 'C' | |
159 | """)) |
|
156 | """)) | |
160 | with tt.AssertNotPrints(('[autoreload of %s failed:' % mod_name), channel='stderr'): |
|
157 | with tt.AssertNotPrints(('[autoreload of %s failed:' % mod_name), channel='stderr'): | |
161 | self.shell.run_code("pass") # trigger another reload |
|
158 | self.shell.run_code("pass") # trigger another reload | |
162 |
|
159 | |||
163 | def test_reload_class_type(self): |
|
160 | def test_reload_class_type(self): | |
164 | self.shell.magic_autoreload("2") |
|
161 | self.shell.magic_autoreload("2") | |
165 | mod_name, mod_fn = self.new_module( |
|
162 | mod_name, mod_fn = self.new_module( | |
166 | """ |
|
163 | """ | |
167 | class Test(): |
|
164 | class Test(): | |
168 | def meth(self): |
|
165 | def meth(self): | |
169 | return "old" |
|
166 | return "old" | |
170 | """ |
|
167 | """ | |
171 | ) |
|
168 | ) | |
172 | assert "test" not in self.shell.ns |
|
169 | assert "test" not in self.shell.ns | |
173 | assert "result" not in self.shell.ns |
|
170 | assert "result" not in self.shell.ns | |
174 |
|
171 | |||
175 | self.shell.run_code("from %s import Test" % mod_name) |
|
172 | self.shell.run_code("from %s import Test" % mod_name) | |
176 | self.shell.run_code("test = Test()") |
|
173 | self.shell.run_code("test = Test()") | |
177 |
|
174 | |||
178 | self.write_file( |
|
175 | self.write_file( | |
179 | mod_fn, |
|
176 | mod_fn, | |
180 | """ |
|
177 | """ | |
181 | class Test(): |
|
178 | class Test(): | |
182 | def meth(self): |
|
179 | def meth(self): | |
183 | return "new" |
|
180 | return "new" | |
184 | """, |
|
181 | """, | |
185 | ) |
|
182 | ) | |
186 |
|
183 | |||
187 | test_object = self.shell.ns["test"] |
|
184 | test_object = self.shell.ns["test"] | |
188 |
|
185 | |||
189 | # important to trigger autoreload logic ! |
|
186 | # important to trigger autoreload logic ! | |
190 | self.shell.run_code("pass") |
|
187 | self.shell.run_code("pass") | |
191 |
|
188 | |||
192 | test_class = pickle_get_current_class(test_object) |
|
189 | test_class = pickle_get_current_class(test_object) | |
193 | assert isinstance(test_object, test_class) |
|
190 | assert isinstance(test_object, test_class) | |
194 |
|
191 | |||
195 | # extra check. |
|
192 | # extra check. | |
196 | self.shell.run_code("import pickle") |
|
193 | self.shell.run_code("import pickle") | |
197 | self.shell.run_code("p = pickle.dumps(test)") |
|
194 | self.shell.run_code("p = pickle.dumps(test)") | |
198 |
|
195 | |||
199 | def test_reload_class_attributes(self): |
|
196 | def test_reload_class_attributes(self): | |
200 | self.shell.magic_autoreload("2") |
|
197 | self.shell.magic_autoreload("2") | |
201 | mod_name, mod_fn = self.new_module(textwrap.dedent(""" |
|
198 | mod_name, mod_fn = self.new_module(textwrap.dedent(""" | |
202 | class MyClass: |
|
199 | class MyClass: | |
203 |
|
200 | |||
204 | def __init__(self, a=10): |
|
201 | def __init__(self, a=10): | |
205 | self.a = a |
|
202 | self.a = a | |
206 | self.b = 22 |
|
203 | self.b = 22 | |
207 | # self.toto = 33 |
|
204 | # self.toto = 33 | |
208 |
|
205 | |||
209 | def square(self): |
|
206 | def square(self): | |
210 | print('compute square') |
|
207 | print('compute square') | |
211 | return self.a*self.a |
|
208 | return self.a*self.a | |
212 | """ |
|
209 | """ | |
213 | ) |
|
210 | ) | |
214 | ) |
|
211 | ) | |
215 | self.shell.run_code("from %s import MyClass" % mod_name) |
|
212 | self.shell.run_code("from %s import MyClass" % mod_name) | |
216 | self.shell.run_code("first = MyClass(5)") |
|
213 | self.shell.run_code("first = MyClass(5)") | |
217 | self.shell.run_code("first.square()") |
|
214 | self.shell.run_code("first.square()") | |
218 | with nt.assert_raises(AttributeError): |
|
215 | with nt.assert_raises(AttributeError): | |
219 | self.shell.run_code("first.cube()") |
|
216 | self.shell.run_code("first.cube()") | |
220 | with nt.assert_raises(AttributeError): |
|
217 | with nt.assert_raises(AttributeError): | |
221 | self.shell.run_code("first.power(5)") |
|
218 | self.shell.run_code("first.power(5)") | |
222 | self.shell.run_code("first.b") |
|
219 | self.shell.run_code("first.b") | |
223 | with nt.assert_raises(AttributeError): |
|
220 | with nt.assert_raises(AttributeError): | |
224 | self.shell.run_code("first.toto") |
|
221 | self.shell.run_code("first.toto") | |
225 |
|
222 | |||
226 | # remove square, add power |
|
223 | # remove square, add power | |
227 |
|
224 | |||
228 | self.write_file( |
|
225 | self.write_file( | |
229 | mod_fn, |
|
226 | mod_fn, | |
230 | textwrap.dedent( |
|
227 | textwrap.dedent( | |
231 | """ |
|
228 | """ | |
232 | class MyClass: |
|
229 | class MyClass: | |
233 |
|
230 | |||
234 | def __init__(self, a=10): |
|
231 | def __init__(self, a=10): | |
235 | self.a = a |
|
232 | self.a = a | |
236 | self.b = 11 |
|
233 | self.b = 11 | |
237 |
|
234 | |||
238 | def power(self, p): |
|
235 | def power(self, p): | |
239 | print('compute power '+str(p)) |
|
236 | print('compute power '+str(p)) | |
240 | return self.a**p |
|
237 | return self.a**p | |
241 | """ |
|
238 | """ | |
242 | ), |
|
239 | ), | |
243 | ) |
|
240 | ) | |
244 |
|
241 | |||
245 | self.shell.run_code("second = MyClass(5)") |
|
242 | self.shell.run_code("second = MyClass(5)") | |
246 |
|
243 | |||
247 | for object_name in {'first', 'second'}: |
|
244 | for object_name in {'first', 'second'}: | |
248 | self.shell.run_code("{object_name}.power(5)".format(object_name=object_name)) |
|
245 | self.shell.run_code("{object_name}.power(5)".format(object_name=object_name)) | |
249 | with nt.assert_raises(AttributeError): |
|
246 | with nt.assert_raises(AttributeError): | |
250 | self.shell.run_code("{object_name}.cube()".format(object_name=object_name)) |
|
247 | self.shell.run_code("{object_name}.cube()".format(object_name=object_name)) | |
251 | with nt.assert_raises(AttributeError): |
|
248 | with nt.assert_raises(AttributeError): | |
252 | self.shell.run_code("{object_name}.square()".format(object_name=object_name)) |
|
249 | self.shell.run_code("{object_name}.square()".format(object_name=object_name)) | |
253 | self.shell.run_code("{object_name}.b".format(object_name=object_name)) |
|
250 | self.shell.run_code("{object_name}.b".format(object_name=object_name)) | |
254 | self.shell.run_code("{object_name}.a".format(object_name=object_name)) |
|
251 | self.shell.run_code("{object_name}.a".format(object_name=object_name)) | |
255 | with nt.assert_raises(AttributeError): |
|
252 | with nt.assert_raises(AttributeError): | |
256 | self.shell.run_code("{object_name}.toto".format(object_name=object_name)) |
|
253 | self.shell.run_code("{object_name}.toto".format(object_name=object_name)) | |
257 |
|
254 | |||
258 | def _check_smoketest(self, use_aimport=True): |
|
255 | def _check_smoketest(self, use_aimport=True): | |
259 | """ |
|
256 | """ | |
260 | Functional test for the automatic reloader using either |
|
257 | Functional test for the automatic reloader using either | |
261 | '%autoreload 1' or '%autoreload 2' |
|
258 | '%autoreload 1' or '%autoreload 2' | |
262 | """ |
|
259 | """ | |
263 |
|
260 | |||
264 | mod_name, mod_fn = self.new_module(""" |
|
261 | mod_name, mod_fn = self.new_module(""" | |
265 | x = 9 |
|
262 | x = 9 | |
266 |
|
263 | |||
267 | z = 123 # this item will be deleted |
|
264 | z = 123 # this item will be deleted | |
268 |
|
265 | |||
269 | def foo(y): |
|
266 | def foo(y): | |
270 | return y + 3 |
|
267 | return y + 3 | |
271 |
|
268 | |||
272 | class Baz(object): |
|
269 | class Baz(object): | |
273 | def __init__(self, x): |
|
270 | def __init__(self, x): | |
274 | self.x = x |
|
271 | self.x = x | |
275 | def bar(self, y): |
|
272 | def bar(self, y): | |
276 | return self.x + y |
|
273 | return self.x + y | |
277 | @property |
|
274 | @property | |
278 | def quux(self): |
|
275 | def quux(self): | |
279 | return 42 |
|
276 | return 42 | |
280 | def zzz(self): |
|
277 | def zzz(self): | |
281 | '''This method will be deleted below''' |
|
278 | '''This method will be deleted below''' | |
282 | return 99 |
|
279 | return 99 | |
283 |
|
280 | |||
284 | class Bar: # old-style class: weakref doesn't work for it on Python < 2.7 |
|
281 | class Bar: # old-style class: weakref doesn't work for it on Python < 2.7 | |
285 | def foo(self): |
|
282 | def foo(self): | |
286 | return 1 |
|
283 | return 1 | |
287 | """) |
|
284 | """) | |
288 |
|
285 | |||
289 | # |
|
286 | # | |
290 | # Import module, and mark for reloading |
|
287 | # Import module, and mark for reloading | |
291 | # |
|
288 | # | |
292 | if use_aimport: |
|
289 | if use_aimport: | |
293 | self.shell.magic_autoreload("1") |
|
290 | self.shell.magic_autoreload("1") | |
294 | self.shell.magic_aimport(mod_name) |
|
291 | self.shell.magic_aimport(mod_name) | |
295 | stream = StringIO() |
|
292 | stream = StringIO() | |
296 | self.shell.magic_aimport("", stream=stream) |
|
293 | self.shell.magic_aimport("", stream=stream) | |
297 | nt.assert_in(("Modules to reload:\n%s" % mod_name), stream.getvalue()) |
|
294 | nt.assert_in(("Modules to reload:\n%s" % mod_name), stream.getvalue()) | |
298 |
|
295 | |||
299 | with nt.assert_raises(ImportError): |
|
296 | with nt.assert_raises(ImportError): | |
300 | self.shell.magic_aimport("tmpmod_as318989e89ds") |
|
297 | self.shell.magic_aimport("tmpmod_as318989e89ds") | |
301 | else: |
|
298 | else: | |
302 | self.shell.magic_autoreload("2") |
|
299 | self.shell.magic_autoreload("2") | |
303 | self.shell.run_code("import %s" % mod_name) |
|
300 | self.shell.run_code("import %s" % mod_name) | |
304 | stream = StringIO() |
|
301 | stream = StringIO() | |
305 | self.shell.magic_aimport("", stream=stream) |
|
302 | self.shell.magic_aimport("", stream=stream) | |
306 | nt.assert_true("Modules to reload:\nall-except-skipped" in |
|
303 | nt.assert_true("Modules to reload:\nall-except-skipped" in | |
307 | stream.getvalue()) |
|
304 | stream.getvalue()) | |
308 | nt.assert_in(mod_name, self.shell.ns) |
|
305 | nt.assert_in(mod_name, self.shell.ns) | |
309 |
|
306 | |||
310 | mod = sys.modules[mod_name] |
|
307 | mod = sys.modules[mod_name] | |
311 |
|
308 | |||
312 | # |
|
309 | # | |
313 | # Test module contents |
|
310 | # Test module contents | |
314 | # |
|
311 | # | |
315 | old_foo = mod.foo |
|
312 | old_foo = mod.foo | |
316 | old_obj = mod.Baz(9) |
|
313 | old_obj = mod.Baz(9) | |
317 | old_obj2 = mod.Bar() |
|
314 | old_obj2 = mod.Bar() | |
318 |
|
315 | |||
319 | def check_module_contents(): |
|
316 | def check_module_contents(): | |
320 | nt.assert_equal(mod.x, 9) |
|
317 | nt.assert_equal(mod.x, 9) | |
321 | nt.assert_equal(mod.z, 123) |
|
318 | nt.assert_equal(mod.z, 123) | |
322 |
|
319 | |||
323 | nt.assert_equal(old_foo(0), 3) |
|
320 | nt.assert_equal(old_foo(0), 3) | |
324 | nt.assert_equal(mod.foo(0), 3) |
|
321 | nt.assert_equal(mod.foo(0), 3) | |
325 |
|
322 | |||
326 | obj = mod.Baz(9) |
|
323 | obj = mod.Baz(9) | |
327 | nt.assert_equal(old_obj.bar(1), 10) |
|
324 | nt.assert_equal(old_obj.bar(1), 10) | |
328 | nt.assert_equal(obj.bar(1), 10) |
|
325 | nt.assert_equal(obj.bar(1), 10) | |
329 | nt.assert_equal(obj.quux, 42) |
|
326 | nt.assert_equal(obj.quux, 42) | |
330 | nt.assert_equal(obj.zzz(), 99) |
|
327 | nt.assert_equal(obj.zzz(), 99) | |
331 |
|
328 | |||
332 | obj2 = mod.Bar() |
|
329 | obj2 = mod.Bar() | |
333 | nt.assert_equal(old_obj2.foo(), 1) |
|
330 | nt.assert_equal(old_obj2.foo(), 1) | |
334 | nt.assert_equal(obj2.foo(), 1) |
|
331 | nt.assert_equal(obj2.foo(), 1) | |
335 |
|
332 | |||
336 | check_module_contents() |
|
333 | check_module_contents() | |
337 |
|
334 | |||
338 | # |
|
335 | # | |
339 | # Simulate a failed reload: no reload should occur and exactly |
|
336 | # Simulate a failed reload: no reload should occur and exactly | |
340 | # one error message should be printed |
|
337 | # one error message should be printed | |
341 | # |
|
338 | # | |
342 | self.write_file(mod_fn, """ |
|
339 | self.write_file(mod_fn, """ | |
343 | a syntax error |
|
340 | a syntax error | |
344 | """) |
|
341 | """) | |
345 |
|
342 | |||
346 | with tt.AssertPrints(('[autoreload of %s failed:' % mod_name), channel='stderr'): |
|
343 | with tt.AssertPrints(('[autoreload of %s failed:' % mod_name), channel='stderr'): | |
347 | self.shell.run_code("pass") # trigger reload |
|
344 | self.shell.run_code("pass") # trigger reload | |
348 | with tt.AssertNotPrints(('[autoreload of %s failed:' % mod_name), channel='stderr'): |
|
345 | with tt.AssertNotPrints(('[autoreload of %s failed:' % mod_name), channel='stderr'): | |
349 | self.shell.run_code("pass") # trigger another reload |
|
346 | self.shell.run_code("pass") # trigger another reload | |
350 | check_module_contents() |
|
347 | check_module_contents() | |
351 |
|
348 | |||
352 | # |
|
349 | # | |
353 | # Rewrite module (this time reload should succeed) |
|
350 | # Rewrite module (this time reload should succeed) | |
354 | # |
|
351 | # | |
355 | self.write_file(mod_fn, """ |
|
352 | self.write_file(mod_fn, """ | |
356 | x = 10 |
|
353 | x = 10 | |
357 |
|
354 | |||
358 | def foo(y): |
|
355 | def foo(y): | |
359 | return y + 4 |
|
356 | return y + 4 | |
360 |
|
357 | |||
361 | class Baz(object): |
|
358 | class Baz(object): | |
362 | def __init__(self, x): |
|
359 | def __init__(self, x): | |
363 | self.x = x |
|
360 | self.x = x | |
364 | def bar(self, y): |
|
361 | def bar(self, y): | |
365 | return self.x + y + 1 |
|
362 | return self.x + y + 1 | |
366 | @property |
|
363 | @property | |
367 | def quux(self): |
|
364 | def quux(self): | |
368 | return 43 |
|
365 | return 43 | |
369 |
|
366 | |||
370 | class Bar: # old-style class |
|
367 | class Bar: # old-style class | |
371 | def foo(self): |
|
368 | def foo(self): | |
372 | return 2 |
|
369 | return 2 | |
373 | """) |
|
370 | """) | |
374 |
|
371 | |||
375 | def check_module_contents(): |
|
372 | def check_module_contents(): | |
376 | nt.assert_equal(mod.x, 10) |
|
373 | nt.assert_equal(mod.x, 10) | |
377 | nt.assert_false(hasattr(mod, 'z')) |
|
374 | nt.assert_false(hasattr(mod, 'z')) | |
378 |
|
375 | |||
379 | nt.assert_equal(old_foo(0), 4) # superreload magic! |
|
376 | nt.assert_equal(old_foo(0), 4) # superreload magic! | |
380 | nt.assert_equal(mod.foo(0), 4) |
|
377 | nt.assert_equal(mod.foo(0), 4) | |
381 |
|
378 | |||
382 | obj = mod.Baz(9) |
|
379 | obj = mod.Baz(9) | |
383 | nt.assert_equal(old_obj.bar(1), 11) # superreload magic! |
|
380 | nt.assert_equal(old_obj.bar(1), 11) # superreload magic! | |
384 | nt.assert_equal(obj.bar(1), 11) |
|
381 | nt.assert_equal(obj.bar(1), 11) | |
385 |
|
382 | |||
386 | nt.assert_equal(old_obj.quux, 43) |
|
383 | nt.assert_equal(old_obj.quux, 43) | |
387 | nt.assert_equal(obj.quux, 43) |
|
384 | nt.assert_equal(obj.quux, 43) | |
388 |
|
385 | |||
389 | nt.assert_false(hasattr(old_obj, 'zzz')) |
|
386 | nt.assert_false(hasattr(old_obj, 'zzz')) | |
390 | nt.assert_false(hasattr(obj, 'zzz')) |
|
387 | nt.assert_false(hasattr(obj, 'zzz')) | |
391 |
|
388 | |||
392 | obj2 = mod.Bar() |
|
389 | obj2 = mod.Bar() | |
393 | nt.assert_equal(old_obj2.foo(), 2) |
|
390 | nt.assert_equal(old_obj2.foo(), 2) | |
394 | nt.assert_equal(obj2.foo(), 2) |
|
391 | nt.assert_equal(obj2.foo(), 2) | |
395 |
|
392 | |||
396 | self.shell.run_code("pass") # trigger reload |
|
393 | self.shell.run_code("pass") # trigger reload | |
397 | check_module_contents() |
|
394 | check_module_contents() | |
398 |
|
395 | |||
399 | # |
|
396 | # | |
400 | # Another failure case: deleted file (shouldn't reload) |
|
397 | # Another failure case: deleted file (shouldn't reload) | |
401 | # |
|
398 | # | |
402 | os.unlink(mod_fn) |
|
399 | os.unlink(mod_fn) | |
403 |
|
400 | |||
404 | self.shell.run_code("pass") # trigger reload |
|
401 | self.shell.run_code("pass") # trigger reload | |
405 | check_module_contents() |
|
402 | check_module_contents() | |
406 |
|
403 | |||
407 | # |
|
404 | # | |
408 | # Disable autoreload and rewrite module: no reload should occur |
|
405 | # Disable autoreload and rewrite module: no reload should occur | |
409 | # |
|
406 | # | |
410 | if use_aimport: |
|
407 | if use_aimport: | |
411 | self.shell.magic_aimport("-" + mod_name) |
|
408 | self.shell.magic_aimport("-" + mod_name) | |
412 | stream = StringIO() |
|
409 | stream = StringIO() | |
413 | self.shell.magic_aimport("", stream=stream) |
|
410 | self.shell.magic_aimport("", stream=stream) | |
414 | nt.assert_true(("Modules to skip:\n%s" % mod_name) in |
|
411 | nt.assert_true(("Modules to skip:\n%s" % mod_name) in | |
415 | stream.getvalue()) |
|
412 | stream.getvalue()) | |
416 |
|
413 | |||
417 | # This should succeed, although no such module exists |
|
414 | # This should succeed, although no such module exists | |
418 | self.shell.magic_aimport("-tmpmod_as318989e89ds") |
|
415 | self.shell.magic_aimport("-tmpmod_as318989e89ds") | |
419 | else: |
|
416 | else: | |
420 | self.shell.magic_autoreload("0") |
|
417 | self.shell.magic_autoreload("0") | |
421 |
|
418 | |||
422 | self.write_file(mod_fn, """ |
|
419 | self.write_file(mod_fn, """ | |
423 | x = -99 |
|
420 | x = -99 | |
424 | """) |
|
421 | """) | |
425 |
|
422 | |||
426 | self.shell.run_code("pass") # trigger reload |
|
423 | self.shell.run_code("pass") # trigger reload | |
427 | self.shell.run_code("pass") |
|
424 | self.shell.run_code("pass") | |
428 | check_module_contents() |
|
425 | check_module_contents() | |
429 |
|
426 | |||
430 | # |
|
427 | # | |
431 | # Re-enable autoreload: reload should now occur |
|
428 | # Re-enable autoreload: reload should now occur | |
432 | # |
|
429 | # | |
433 | if use_aimport: |
|
430 | if use_aimport: | |
434 | self.shell.magic_aimport(mod_name) |
|
431 | self.shell.magic_aimport(mod_name) | |
435 | else: |
|
432 | else: | |
436 | self.shell.magic_autoreload("") |
|
433 | self.shell.magic_autoreload("") | |
437 |
|
434 | |||
438 | self.shell.run_code("pass") # trigger reload |
|
435 | self.shell.run_code("pass") # trigger reload | |
439 | nt.assert_equal(mod.x, -99) |
|
436 | nt.assert_equal(mod.x, -99) | |
440 |
|
437 | |||
441 | def test_smoketest_aimport(self): |
|
438 | def test_smoketest_aimport(self): | |
442 | self._check_smoketest(use_aimport=True) |
|
439 | self._check_smoketest(use_aimport=True) | |
443 |
|
440 | |||
444 | def test_smoketest_autoreload(self): |
|
441 | def test_smoketest_autoreload(self): | |
445 | self._check_smoketest(use_aimport=False) |
|
442 | self._check_smoketest(use_aimport=False) | |
446 |
|
443 | |||
447 |
|
444 | |||
448 |
|
445 | |||
449 |
|
446 | |||
450 |
|
447 |
@@ -1,4 +1,4 b'' | |||||
1 | from warnings import warn |
|
1 | from warnings import warn | |
2 |
|
2 | |||
3 | warn("IPython.utils.daemonize has moved to ipyparallel.apps.daemonize", stacklevel=2) |
|
3 | warn("IPython.utils.daemonize has moved to ipyparallel.apps.daemonize since IPython 4.0", DeprecationWarning, stacklevel=2) | |
4 | from ipyparallel.apps.daemonize import daemonize |
|
4 | from ipyparallel.apps.daemonize import daemonize |
@@ -1,95 +1,94 b'' | |||||
1 | # encoding: utf-8 |
|
1 | # encoding: utf-8 | |
2 | """ |
|
2 | """ | |
3 | Utilities for working with stack frames. |
|
3 | Utilities for working with stack frames. | |
4 | """ |
|
4 | """ | |
5 |
|
5 | |||
6 | #----------------------------------------------------------------------------- |
|
6 | #----------------------------------------------------------------------------- | |
7 | # Copyright (C) 2008-2011 The IPython Development Team |
|
7 | # Copyright (C) 2008-2011 The IPython Development Team | |
8 | # |
|
8 | # | |
9 | # Distributed under the terms of the BSD License. The full license is in |
|
9 | # Distributed under the terms of the BSD License. The full license is in | |
10 | # the file COPYING, distributed as part of this software. |
|
10 | # the file COPYING, distributed as part of this software. | |
11 | #----------------------------------------------------------------------------- |
|
11 | #----------------------------------------------------------------------------- | |
12 |
|
12 | |||
13 | #----------------------------------------------------------------------------- |
|
13 | #----------------------------------------------------------------------------- | |
14 | # Imports |
|
14 | # Imports | |
15 | #----------------------------------------------------------------------------- |
|
15 | #----------------------------------------------------------------------------- | |
16 |
|
16 | |||
17 | import sys |
|
17 | import sys | |
18 | from IPython.utils import py3compat |
|
|||
19 |
|
18 | |||
20 | #----------------------------------------------------------------------------- |
|
19 | #----------------------------------------------------------------------------- | |
21 | # Code |
|
20 | # Code | |
22 | #----------------------------------------------------------------------------- |
|
21 | #----------------------------------------------------------------------------- | |
23 |
|
22 | |||
24 | def extract_vars(*names,**kw): |
|
23 | def extract_vars(*names,**kw): | |
25 | """Extract a set of variables by name from another frame. |
|
24 | """Extract a set of variables by name from another frame. | |
26 |
|
25 | |||
27 | Parameters |
|
26 | Parameters | |
28 | ---------- |
|
27 | ---------- | |
29 | *names : str |
|
28 | *names : str | |
30 | One or more variable names which will be extracted from the caller's |
|
29 | One or more variable names which will be extracted from the caller's | |
31 | frame. |
|
30 | frame. | |
32 |
|
31 | |||
33 | depth : integer, optional |
|
32 | depth : integer, optional | |
34 | How many frames in the stack to walk when looking for your variables. |
|
33 | How many frames in the stack to walk when looking for your variables. | |
35 | The default is 0, which will use the frame where the call was made. |
|
34 | The default is 0, which will use the frame where the call was made. | |
36 |
|
35 | |||
37 |
|
36 | |||
38 | Examples |
|
37 | Examples | |
39 | -------- |
|
38 | -------- | |
40 | :: |
|
39 | :: | |
41 |
|
40 | |||
42 | In [2]: def func(x): |
|
41 | In [2]: def func(x): | |
43 | ...: y = 1 |
|
42 | ...: y = 1 | |
44 | ...: print(sorted(extract_vars('x','y').items())) |
|
43 | ...: print(sorted(extract_vars('x','y').items())) | |
45 | ...: |
|
44 | ...: | |
46 |
|
45 | |||
47 | In [3]: func('hello') |
|
46 | In [3]: func('hello') | |
48 | [('x', 'hello'), ('y', 1)] |
|
47 | [('x', 'hello'), ('y', 1)] | |
49 | """ |
|
48 | """ | |
50 |
|
49 | |||
51 | depth = kw.get('depth',0) |
|
50 | depth = kw.get('depth',0) | |
52 |
|
51 | |||
53 | callerNS = sys._getframe(depth+1).f_locals |
|
52 | callerNS = sys._getframe(depth+1).f_locals | |
54 | return dict((k,callerNS[k]) for k in names) |
|
53 | return dict((k,callerNS[k]) for k in names) | |
55 |
|
54 | |||
56 |
|
55 | |||
57 | def extract_vars_above(*names): |
|
56 | def extract_vars_above(*names): | |
58 | """Extract a set of variables by name from another frame. |
|
57 | """Extract a set of variables by name from another frame. | |
59 |
|
58 | |||
60 | Similar to extractVars(), but with a specified depth of 1, so that names |
|
59 | Similar to extractVars(), but with a specified depth of 1, so that names | |
61 | are extracted exactly from above the caller. |
|
60 | are extracted exactly from above the caller. | |
62 |
|
61 | |||
63 | This is simply a convenience function so that the very common case (for us) |
|
62 | This is simply a convenience function so that the very common case (for us) | |
64 | of skipping exactly 1 frame doesn't have to construct a special dict for |
|
63 | of skipping exactly 1 frame doesn't have to construct a special dict for | |
65 | keyword passing.""" |
|
64 | keyword passing.""" | |
66 |
|
65 | |||
67 | callerNS = sys._getframe(2).f_locals |
|
66 | callerNS = sys._getframe(2).f_locals | |
68 | return dict((k,callerNS[k]) for k in names) |
|
67 | return dict((k,callerNS[k]) for k in names) | |
69 |
|
68 | |||
70 |
|
69 | |||
71 | def debugx(expr,pre_msg=''): |
|
70 | def debugx(expr,pre_msg=''): | |
72 | """Print the value of an expression from the caller's frame. |
|
71 | """Print the value of an expression from the caller's frame. | |
73 |
|
72 | |||
74 | Takes an expression, evaluates it in the caller's frame and prints both |
|
73 | Takes an expression, evaluates it in the caller's frame and prints both | |
75 | the given expression and the resulting value (as well as a debug mark |
|
74 | the given expression and the resulting value (as well as a debug mark | |
76 | indicating the name of the calling function. The input must be of a form |
|
75 | indicating the name of the calling function. The input must be of a form | |
77 | suitable for eval(). |
|
76 | suitable for eval(). | |
78 |
|
77 | |||
79 | An optional message can be passed, which will be prepended to the printed |
|
78 | An optional message can be passed, which will be prepended to the printed | |
80 | expr->value pair.""" |
|
79 | expr->value pair.""" | |
81 |
|
80 | |||
82 | cf = sys._getframe(1) |
|
81 | cf = sys._getframe(1) | |
83 | print('[DBG:%s] %s%s -> %r' % (cf.f_code.co_name,pre_msg,expr, |
|
82 | print('[DBG:%s] %s%s -> %r' % (cf.f_code.co_name,pre_msg,expr, | |
84 | eval(expr,cf.f_globals,cf.f_locals))) |
|
83 | eval(expr,cf.f_globals,cf.f_locals))) | |
85 |
|
84 | |||
86 |
|
85 | |||
87 | # deactivate it by uncommenting the following line, which makes it a no-op |
|
86 | # deactivate it by uncommenting the following line, which makes it a no-op | |
88 | #def debugx(expr,pre_msg=''): pass |
|
87 | #def debugx(expr,pre_msg=''): pass | |
89 |
|
88 | |||
90 | def extract_module_locals(depth=0): |
|
89 | def extract_module_locals(depth=0): | |
91 | """Returns (module, locals) of the function `depth` frames away from the caller""" |
|
90 | """Returns (module, locals) of the function `depth` frames away from the caller""" | |
92 | f = sys._getframe(depth + 1) |
|
91 | f = sys._getframe(depth + 1) | |
93 | global_ns = f.f_globals |
|
92 | global_ns = f.f_globals | |
94 | module = sys.modules[global_ns['__name__']] |
|
93 | module = sys.modules[global_ns['__name__']] | |
95 | return (module, f.f_locals) |
|
94 | return (module, f.f_locals) |
@@ -1,94 +1,89 b'' | |||||
1 | # encoding: utf-8 |
|
1 | # encoding: utf-8 | |
2 | """Tests for io.py""" |
|
2 | """Tests for io.py""" | |
3 |
|
3 | |||
4 | # Copyright (c) IPython Development Team. |
|
4 | # Copyright (c) IPython Development Team. | |
5 | # Distributed under the terms of the Modified BSD License. |
|
5 | # Distributed under the terms of the Modified BSD License. | |
6 |
|
6 | |||
7 |
|
7 | |||
8 | import io as stdlib_io |
|
|||
9 | import os.path |
|
|||
10 | import stat |
|
|||
11 | import sys |
|
8 | import sys | |
12 | from io import StringIO |
|
9 | from io import StringIO | |
13 |
|
10 | |||
14 | from subprocess import Popen, PIPE |
|
11 | from subprocess import Popen, PIPE | |
15 | import unittest |
|
12 | import unittest | |
16 |
|
13 | |||
17 | import nose.tools as nt |
|
14 | import nose.tools as nt | |
18 |
|
15 | |||
19 | from IPython.testing.decorators import skipif, skip_win32 |
|
|||
20 | from IPython.utils.io import IOStream, Tee, capture_output |
|
16 | from IPython.utils.io import IOStream, Tee, capture_output | |
21 | from IPython.utils.tempdir import TemporaryDirectory |
|
|||
22 |
|
17 | |||
23 |
|
18 | |||
24 | def test_tee_simple(): |
|
19 | def test_tee_simple(): | |
25 | "Very simple check with stdout only" |
|
20 | "Very simple check with stdout only" | |
26 | chan = StringIO() |
|
21 | chan = StringIO() | |
27 | text = 'Hello' |
|
22 | text = 'Hello' | |
28 | tee = Tee(chan, channel='stdout') |
|
23 | tee = Tee(chan, channel='stdout') | |
29 | print(text, file=chan) |
|
24 | print(text, file=chan) | |
30 | nt.assert_equal(chan.getvalue(), text+"\n") |
|
25 | nt.assert_equal(chan.getvalue(), text+"\n") | |
31 |
|
26 | |||
32 |
|
27 | |||
33 | class TeeTestCase(unittest.TestCase): |
|
28 | class TeeTestCase(unittest.TestCase): | |
34 |
|
29 | |||
35 | def tchan(self, channel): |
|
30 | def tchan(self, channel): | |
36 | trap = StringIO() |
|
31 | trap = StringIO() | |
37 | chan = StringIO() |
|
32 | chan = StringIO() | |
38 | text = 'Hello' |
|
33 | text = 'Hello' | |
39 |
|
34 | |||
40 | std_ori = getattr(sys, channel) |
|
35 | std_ori = getattr(sys, channel) | |
41 | setattr(sys, channel, trap) |
|
36 | setattr(sys, channel, trap) | |
42 |
|
37 | |||
43 | tee = Tee(chan, channel=channel) |
|
38 | tee = Tee(chan, channel=channel) | |
44 |
|
39 | |||
45 | print(text, end='', file=chan) |
|
40 | print(text, end='', file=chan) | |
46 | trap_val = trap.getvalue() |
|
41 | trap_val = trap.getvalue() | |
47 | nt.assert_equal(chan.getvalue(), text) |
|
42 | nt.assert_equal(chan.getvalue(), text) | |
48 |
|
43 | |||
49 | tee.close() |
|
44 | tee.close() | |
50 |
|
45 | |||
51 | setattr(sys, channel, std_ori) |
|
46 | setattr(sys, channel, std_ori) | |
52 | assert getattr(sys, channel) == std_ori |
|
47 | assert getattr(sys, channel) == std_ori | |
53 |
|
48 | |||
54 | def test(self): |
|
49 | def test(self): | |
55 | for chan in ['stdout', 'stderr']: |
|
50 | for chan in ['stdout', 'stderr']: | |
56 | self.tchan(chan) |
|
51 | self.tchan(chan) | |
57 |
|
52 | |||
58 | def test_io_init(): |
|
53 | def test_io_init(): | |
59 | """Test that io.stdin/out/err exist at startup""" |
|
54 | """Test that io.stdin/out/err exist at startup""" | |
60 | for name in ('stdin', 'stdout', 'stderr'): |
|
55 | for name in ('stdin', 'stdout', 'stderr'): | |
61 | cmd = "from IPython.utils import io;print(io.%s.__class__)"%name |
|
56 | cmd = "from IPython.utils import io;print(io.%s.__class__)"%name | |
62 | with Popen([sys.executable, '-c', cmd], stdout=PIPE) as p: |
|
57 | with Popen([sys.executable, '-c', cmd], stdout=PIPE) as p: | |
63 | p.wait() |
|
58 | p.wait() | |
64 | classname = p.stdout.read().strip().decode('ascii') |
|
59 | classname = p.stdout.read().strip().decode('ascii') | |
65 | # __class__ is a reference to the class object in Python 3, so we can't |
|
60 | # __class__ is a reference to the class object in Python 3, so we can't | |
66 | # just test for string equality. |
|
61 | # just test for string equality. | |
67 | assert 'IPython.utils.io.IOStream' in classname, classname |
|
62 | assert 'IPython.utils.io.IOStream' in classname, classname | |
68 |
|
63 | |||
69 | class TestIOStream(unittest.TestCase): |
|
64 | class TestIOStream(unittest.TestCase): | |
70 |
|
65 | |||
71 | def test_IOStream_init(self): |
|
66 | def test_IOStream_init(self): | |
72 | """IOStream initializes from a file-like object missing attributes. """ |
|
67 | """IOStream initializes from a file-like object missing attributes. """ | |
73 | # Cause a failure from getattr and dir(). (Issue #6386) |
|
68 | # Cause a failure from getattr and dir(). (Issue #6386) | |
74 | class BadStringIO(StringIO): |
|
69 | class BadStringIO(StringIO): | |
75 | def __dir__(self): |
|
70 | def __dir__(self): | |
76 | attrs = super().__dir__() |
|
71 | attrs = super().__dir__() | |
77 | attrs.append('name') |
|
72 | attrs.append('name') | |
78 | return attrs |
|
73 | return attrs | |
79 | with self.assertWarns(DeprecationWarning): |
|
74 | with self.assertWarns(DeprecationWarning): | |
80 | iostream = IOStream(BadStringIO()) |
|
75 | iostream = IOStream(BadStringIO()) | |
81 | iostream.write('hi, bad iostream\n') |
|
76 | iostream.write('hi, bad iostream\n') | |
82 |
|
77 | |||
83 | assert not hasattr(iostream, 'name') |
|
78 | assert not hasattr(iostream, 'name') | |
84 | iostream.close() |
|
79 | iostream.close() | |
85 |
|
80 | |||
86 | def test_capture_output(self): |
|
81 | def test_capture_output(self): | |
87 | """capture_output() context works""" |
|
82 | """capture_output() context works""" | |
88 |
|
83 | |||
89 | with capture_output() as io: |
|
84 | with capture_output() as io: | |
90 | print('hi, stdout') |
|
85 | print('hi, stdout') | |
91 | print('hi, stderr', file=sys.stderr) |
|
86 | print('hi, stderr', file=sys.stderr) | |
92 |
|
87 | |||
93 | nt.assert_equal(io.stdout, 'hi, stdout\n') |
|
88 | nt.assert_equal(io.stdout, 'hi, stdout\n') | |
94 | nt.assert_equal(io.stderr, 'hi, stderr\n') |
|
89 | nt.assert_equal(io.stderr, 'hi, stderr\n') |
@@ -1,492 +1,492 b'' | |||||
1 | # encoding: utf-8 |
|
1 | # encoding: utf-8 | |
2 | """Tests for IPython.utils.path.py""" |
|
2 | """Tests for IPython.utils.path.py""" | |
3 |
|
3 | |||
4 | # Copyright (c) IPython Development Team. |
|
4 | # Copyright (c) IPython Development Team. | |
5 | # Distributed under the terms of the Modified BSD License. |
|
5 | # Distributed under the terms of the Modified BSD License. | |
6 |
|
6 | |||
7 | import os |
|
7 | import os | |
8 | import shutil |
|
8 | import shutil | |
9 | import sys |
|
9 | import sys | |
10 | import tempfile |
|
10 | import tempfile | |
11 | import unittest |
|
11 | import unittest | |
12 | from contextlib import contextmanager |
|
12 | from contextlib import contextmanager | |
13 | from unittest.mock import patch |
|
13 | from unittest.mock import patch | |
14 | from os.path import join, abspath |
|
14 | from os.path import join, abspath | |
15 | from imp import reload |
|
15 | from imp import reload | |
16 |
|
16 | |||
17 | from nose import SkipTest, with_setup |
|
17 | from nose import SkipTest, with_setup | |
18 | import nose.tools as nt |
|
18 | import nose.tools as nt | |
19 |
|
19 | |||
20 | import IPython |
|
20 | import IPython | |
21 | from IPython import paths |
|
21 | from IPython import paths | |
22 | from IPython.testing import decorators as dec |
|
22 | from IPython.testing import decorators as dec | |
23 | from IPython.testing.decorators import (skip_if_not_win32, skip_win32, |
|
23 | from IPython.testing.decorators import (skip_if_not_win32, skip_win32, | |
24 |
onlyif_unicode_paths, |
|
24 | onlyif_unicode_paths, | |
25 | skip_win32_py38,) |
|
25 | skip_win32_py38,) | |
26 |
from IPython.testing.tools import make_tempfile |
|
26 | from IPython.testing.tools import make_tempfile | |
27 | from IPython.utils import path |
|
27 | from IPython.utils import path | |
28 | from IPython.utils.tempdir import TemporaryDirectory |
|
28 | from IPython.utils.tempdir import TemporaryDirectory | |
29 |
|
29 | |||
30 |
|
30 | |||
31 | # Platform-dependent imports |
|
31 | # Platform-dependent imports | |
32 | try: |
|
32 | try: | |
33 | import winreg as wreg |
|
33 | import winreg as wreg | |
34 | except ImportError: |
|
34 | except ImportError: | |
35 | #Fake _winreg module on non-windows platforms |
|
35 | #Fake _winreg module on non-windows platforms | |
36 | import types |
|
36 | import types | |
37 | wr_name = "winreg" |
|
37 | wr_name = "winreg" | |
38 | sys.modules[wr_name] = types.ModuleType(wr_name) |
|
38 | sys.modules[wr_name] = types.ModuleType(wr_name) | |
39 | try: |
|
39 | try: | |
40 | import winreg as wreg |
|
40 | import winreg as wreg | |
41 | except ImportError: |
|
41 | except ImportError: | |
42 | import _winreg as wreg |
|
42 | import _winreg as wreg | |
43 | #Add entries that needs to be stubbed by the testing code |
|
43 | #Add entries that needs to be stubbed by the testing code | |
44 | (wreg.OpenKey, wreg.QueryValueEx,) = (None, None) |
|
44 | (wreg.OpenKey, wreg.QueryValueEx,) = (None, None) | |
45 |
|
45 | |||
46 | #----------------------------------------------------------------------------- |
|
46 | #----------------------------------------------------------------------------- | |
47 | # Globals |
|
47 | # Globals | |
48 | #----------------------------------------------------------------------------- |
|
48 | #----------------------------------------------------------------------------- | |
49 | env = os.environ |
|
49 | env = os.environ | |
50 | TMP_TEST_DIR = tempfile.mkdtemp() |
|
50 | TMP_TEST_DIR = tempfile.mkdtemp() | |
51 | HOME_TEST_DIR = join(TMP_TEST_DIR, "home_test_dir") |
|
51 | HOME_TEST_DIR = join(TMP_TEST_DIR, "home_test_dir") | |
52 | # |
|
52 | # | |
53 | # Setup/teardown functions/decorators |
|
53 | # Setup/teardown functions/decorators | |
54 | # |
|
54 | # | |
55 |
|
55 | |||
56 | def setup_module(): |
|
56 | def setup_module(): | |
57 | """Setup testenvironment for the module: |
|
57 | """Setup testenvironment for the module: | |
58 |
|
58 | |||
59 | - Adds dummy home dir tree |
|
59 | - Adds dummy home dir tree | |
60 | """ |
|
60 | """ | |
61 | # Do not mask exceptions here. In particular, catching WindowsError is a |
|
61 | # Do not mask exceptions here. In particular, catching WindowsError is a | |
62 | # problem because that exception is only defined on Windows... |
|
62 | # problem because that exception is only defined on Windows... | |
63 | os.makedirs(os.path.join(HOME_TEST_DIR, 'ipython')) |
|
63 | os.makedirs(os.path.join(HOME_TEST_DIR, 'ipython')) | |
64 |
|
64 | |||
65 |
|
65 | |||
66 | def teardown_module(): |
|
66 | def teardown_module(): | |
67 | """Teardown testenvironment for the module: |
|
67 | """Teardown testenvironment for the module: | |
68 |
|
68 | |||
69 | - Remove dummy home dir tree |
|
69 | - Remove dummy home dir tree | |
70 | """ |
|
70 | """ | |
71 | # Note: we remove the parent test dir, which is the root of all test |
|
71 | # Note: we remove the parent test dir, which is the root of all test | |
72 | # subdirs we may have created. Use shutil instead of os.removedirs, so |
|
72 | # subdirs we may have created. Use shutil instead of os.removedirs, so | |
73 | # that non-empty directories are all recursively removed. |
|
73 | # that non-empty directories are all recursively removed. | |
74 | shutil.rmtree(TMP_TEST_DIR) |
|
74 | shutil.rmtree(TMP_TEST_DIR) | |
75 |
|
75 | |||
76 |
|
76 | |||
77 | def setup_environment(): |
|
77 | def setup_environment(): | |
78 | """Setup testenvironment for some functions that are tested |
|
78 | """Setup testenvironment for some functions that are tested | |
79 | in this module. In particular this functions stores attributes |
|
79 | in this module. In particular this functions stores attributes | |
80 | and other things that we need to stub in some test functions. |
|
80 | and other things that we need to stub in some test functions. | |
81 | This needs to be done on a function level and not module level because |
|
81 | This needs to be done on a function level and not module level because | |
82 | each testfunction needs a pristine environment. |
|
82 | each testfunction needs a pristine environment. | |
83 | """ |
|
83 | """ | |
84 | global oldstuff, platformstuff |
|
84 | global oldstuff, platformstuff | |
85 | oldstuff = (env.copy(), os.name, sys.platform, path.get_home_dir, IPython.__file__, os.getcwd()) |
|
85 | oldstuff = (env.copy(), os.name, sys.platform, path.get_home_dir, IPython.__file__, os.getcwd()) | |
86 |
|
86 | |||
87 | def teardown_environment(): |
|
87 | def teardown_environment(): | |
88 | """Restore things that were remembered by the setup_environment function |
|
88 | """Restore things that were remembered by the setup_environment function | |
89 | """ |
|
89 | """ | |
90 | (oldenv, os.name, sys.platform, path.get_home_dir, IPython.__file__, old_wd) = oldstuff |
|
90 | (oldenv, os.name, sys.platform, path.get_home_dir, IPython.__file__, old_wd) = oldstuff | |
91 | os.chdir(old_wd) |
|
91 | os.chdir(old_wd) | |
92 | reload(path) |
|
92 | reload(path) | |
93 |
|
93 | |||
94 | for key in list(env): |
|
94 | for key in list(env): | |
95 | if key not in oldenv: |
|
95 | if key not in oldenv: | |
96 | del env[key] |
|
96 | del env[key] | |
97 | env.update(oldenv) |
|
97 | env.update(oldenv) | |
98 | if hasattr(sys, 'frozen'): |
|
98 | if hasattr(sys, 'frozen'): | |
99 | del sys.frozen |
|
99 | del sys.frozen | |
100 |
|
100 | |||
101 | # Build decorator that uses the setup_environment/setup_environment |
|
101 | # Build decorator that uses the setup_environment/setup_environment | |
102 | with_environment = with_setup(setup_environment, teardown_environment) |
|
102 | with_environment = with_setup(setup_environment, teardown_environment) | |
103 |
|
103 | |||
104 | @skip_if_not_win32 |
|
104 | @skip_if_not_win32 | |
105 | @with_environment |
|
105 | @with_environment | |
106 | def test_get_home_dir_1(): |
|
106 | def test_get_home_dir_1(): | |
107 | """Testcase for py2exe logic, un-compressed lib |
|
107 | """Testcase for py2exe logic, un-compressed lib | |
108 | """ |
|
108 | """ | |
109 | unfrozen = path.get_home_dir() |
|
109 | unfrozen = path.get_home_dir() | |
110 | sys.frozen = True |
|
110 | sys.frozen = True | |
111 |
|
111 | |||
112 | #fake filename for IPython.__init__ |
|
112 | #fake filename for IPython.__init__ | |
113 | IPython.__file__ = abspath(join(HOME_TEST_DIR, "Lib/IPython/__init__.py")) |
|
113 | IPython.__file__ = abspath(join(HOME_TEST_DIR, "Lib/IPython/__init__.py")) | |
114 |
|
114 | |||
115 | home_dir = path.get_home_dir() |
|
115 | home_dir = path.get_home_dir() | |
116 | nt.assert_equal(home_dir, unfrozen) |
|
116 | nt.assert_equal(home_dir, unfrozen) | |
117 |
|
117 | |||
118 |
|
118 | |||
119 | @skip_if_not_win32 |
|
119 | @skip_if_not_win32 | |
120 | @with_environment |
|
120 | @with_environment | |
121 | def test_get_home_dir_2(): |
|
121 | def test_get_home_dir_2(): | |
122 | """Testcase for py2exe logic, compressed lib |
|
122 | """Testcase for py2exe logic, compressed lib | |
123 | """ |
|
123 | """ | |
124 | unfrozen = path.get_home_dir() |
|
124 | unfrozen = path.get_home_dir() | |
125 | sys.frozen = True |
|
125 | sys.frozen = True | |
126 | #fake filename for IPython.__init__ |
|
126 | #fake filename for IPython.__init__ | |
127 | IPython.__file__ = abspath(join(HOME_TEST_DIR, "Library.zip/IPython/__init__.py")).lower() |
|
127 | IPython.__file__ = abspath(join(HOME_TEST_DIR, "Library.zip/IPython/__init__.py")).lower() | |
128 |
|
128 | |||
129 | home_dir = path.get_home_dir(True) |
|
129 | home_dir = path.get_home_dir(True) | |
130 | nt.assert_equal(home_dir, unfrozen) |
|
130 | nt.assert_equal(home_dir, unfrozen) | |
131 |
|
131 | |||
132 |
|
132 | |||
133 | @skip_win32_py38 |
|
133 | @skip_win32_py38 | |
134 | @with_environment |
|
134 | @with_environment | |
135 | def test_get_home_dir_3(): |
|
135 | def test_get_home_dir_3(): | |
136 | """get_home_dir() uses $HOME if set""" |
|
136 | """get_home_dir() uses $HOME if set""" | |
137 | env["HOME"] = HOME_TEST_DIR |
|
137 | env["HOME"] = HOME_TEST_DIR | |
138 | home_dir = path.get_home_dir(True) |
|
138 | home_dir = path.get_home_dir(True) | |
139 | # get_home_dir expands symlinks |
|
139 | # get_home_dir expands symlinks | |
140 | nt.assert_equal(home_dir, os.path.realpath(env["HOME"])) |
|
140 | nt.assert_equal(home_dir, os.path.realpath(env["HOME"])) | |
141 |
|
141 | |||
142 |
|
142 | |||
143 | @with_environment |
|
143 | @with_environment | |
144 | def test_get_home_dir_4(): |
|
144 | def test_get_home_dir_4(): | |
145 | """get_home_dir() still works if $HOME is not set""" |
|
145 | """get_home_dir() still works if $HOME is not set""" | |
146 |
|
146 | |||
147 | if 'HOME' in env: del env['HOME'] |
|
147 | if 'HOME' in env: del env['HOME'] | |
148 | # this should still succeed, but we don't care what the answer is |
|
148 | # this should still succeed, but we don't care what the answer is | |
149 | home = path.get_home_dir(False) |
|
149 | home = path.get_home_dir(False) | |
150 |
|
150 | |||
151 | @skip_win32_py38 |
|
151 | @skip_win32_py38 | |
152 | @with_environment |
|
152 | @with_environment | |
153 | def test_get_home_dir_5(): |
|
153 | def test_get_home_dir_5(): | |
154 | """raise HomeDirError if $HOME is specified, but not a writable dir""" |
|
154 | """raise HomeDirError if $HOME is specified, but not a writable dir""" | |
155 | env['HOME'] = abspath(HOME_TEST_DIR+'garbage') |
|
155 | env['HOME'] = abspath(HOME_TEST_DIR+'garbage') | |
156 | # set os.name = posix, to prevent My Documents fallback on Windows |
|
156 | # set os.name = posix, to prevent My Documents fallback on Windows | |
157 | os.name = 'posix' |
|
157 | os.name = 'posix' | |
158 | nt.assert_raises(path.HomeDirError, path.get_home_dir, True) |
|
158 | nt.assert_raises(path.HomeDirError, path.get_home_dir, True) | |
159 |
|
159 | |||
160 | # Should we stub wreg fully so we can run the test on all platforms? |
|
160 | # Should we stub wreg fully so we can run the test on all platforms? | |
161 | @skip_if_not_win32 |
|
161 | @skip_if_not_win32 | |
162 | @with_environment |
|
162 | @with_environment | |
163 | def test_get_home_dir_8(): |
|
163 | def test_get_home_dir_8(): | |
164 | """Using registry hack for 'My Documents', os=='nt' |
|
164 | """Using registry hack for 'My Documents', os=='nt' | |
165 |
|
165 | |||
166 | HOMESHARE, HOMEDRIVE, HOMEPATH, USERPROFILE and others are missing. |
|
166 | HOMESHARE, HOMEDRIVE, HOMEPATH, USERPROFILE and others are missing. | |
167 | """ |
|
167 | """ | |
168 | os.name = 'nt' |
|
168 | os.name = 'nt' | |
169 | # Remove from stub environment all keys that may be set |
|
169 | # Remove from stub environment all keys that may be set | |
170 | for key in ['HOME', 'HOMESHARE', 'HOMEDRIVE', 'HOMEPATH', 'USERPROFILE']: |
|
170 | for key in ['HOME', 'HOMESHARE', 'HOMEDRIVE', 'HOMEPATH', 'USERPROFILE']: | |
171 | env.pop(key, None) |
|
171 | env.pop(key, None) | |
172 |
|
172 | |||
173 | class key: |
|
173 | class key: | |
174 | def __enter__(self): |
|
174 | def __enter__(self): | |
175 | pass |
|
175 | pass | |
176 | def Close(self): |
|
176 | def Close(self): | |
177 | pass |
|
177 | pass | |
178 | def __exit__(*args, **kwargs): |
|
178 | def __exit__(*args, **kwargs): | |
179 | pass |
|
179 | pass | |
180 |
|
180 | |||
181 | with patch.object(wreg, 'OpenKey', return_value=key()), \ |
|
181 | with patch.object(wreg, 'OpenKey', return_value=key()), \ | |
182 | patch.object(wreg, 'QueryValueEx', return_value=[abspath(HOME_TEST_DIR)]): |
|
182 | patch.object(wreg, 'QueryValueEx', return_value=[abspath(HOME_TEST_DIR)]): | |
183 | home_dir = path.get_home_dir() |
|
183 | home_dir = path.get_home_dir() | |
184 | nt.assert_equal(home_dir, abspath(HOME_TEST_DIR)) |
|
184 | nt.assert_equal(home_dir, abspath(HOME_TEST_DIR)) | |
185 |
|
185 | |||
186 | @with_environment |
|
186 | @with_environment | |
187 | def test_get_xdg_dir_0(): |
|
187 | def test_get_xdg_dir_0(): | |
188 | """test_get_xdg_dir_0, check xdg_dir""" |
|
188 | """test_get_xdg_dir_0, check xdg_dir""" | |
189 | reload(path) |
|
189 | reload(path) | |
190 | path._writable_dir = lambda path: True |
|
190 | path._writable_dir = lambda path: True | |
191 | path.get_home_dir = lambda : 'somewhere' |
|
191 | path.get_home_dir = lambda : 'somewhere' | |
192 | os.name = "posix" |
|
192 | os.name = "posix" | |
193 | sys.platform = "linux2" |
|
193 | sys.platform = "linux2" | |
194 | env.pop('IPYTHON_DIR', None) |
|
194 | env.pop('IPYTHON_DIR', None) | |
195 | env.pop('IPYTHONDIR', None) |
|
195 | env.pop('IPYTHONDIR', None) | |
196 | env.pop('XDG_CONFIG_HOME', None) |
|
196 | env.pop('XDG_CONFIG_HOME', None) | |
197 |
|
197 | |||
198 | nt.assert_equal(path.get_xdg_dir(), os.path.join('somewhere', '.config')) |
|
198 | nt.assert_equal(path.get_xdg_dir(), os.path.join('somewhere', '.config')) | |
199 |
|
199 | |||
200 |
|
200 | |||
201 | @with_environment |
|
201 | @with_environment | |
202 | def test_get_xdg_dir_1(): |
|
202 | def test_get_xdg_dir_1(): | |
203 | """test_get_xdg_dir_1, check nonexistent xdg_dir""" |
|
203 | """test_get_xdg_dir_1, check nonexistent xdg_dir""" | |
204 | reload(path) |
|
204 | reload(path) | |
205 | path.get_home_dir = lambda : HOME_TEST_DIR |
|
205 | path.get_home_dir = lambda : HOME_TEST_DIR | |
206 | os.name = "posix" |
|
206 | os.name = "posix" | |
207 | sys.platform = "linux2" |
|
207 | sys.platform = "linux2" | |
208 | env.pop('IPYTHON_DIR', None) |
|
208 | env.pop('IPYTHON_DIR', None) | |
209 | env.pop('IPYTHONDIR', None) |
|
209 | env.pop('IPYTHONDIR', None) | |
210 | env.pop('XDG_CONFIG_HOME', None) |
|
210 | env.pop('XDG_CONFIG_HOME', None) | |
211 | nt.assert_equal(path.get_xdg_dir(), None) |
|
211 | nt.assert_equal(path.get_xdg_dir(), None) | |
212 |
|
212 | |||
213 | @with_environment |
|
213 | @with_environment | |
214 | def test_get_xdg_dir_2(): |
|
214 | def test_get_xdg_dir_2(): | |
215 | """test_get_xdg_dir_2, check xdg_dir default to ~/.config""" |
|
215 | """test_get_xdg_dir_2, check xdg_dir default to ~/.config""" | |
216 | reload(path) |
|
216 | reload(path) | |
217 | path.get_home_dir = lambda : HOME_TEST_DIR |
|
217 | path.get_home_dir = lambda : HOME_TEST_DIR | |
218 | os.name = "posix" |
|
218 | os.name = "posix" | |
219 | sys.platform = "linux2" |
|
219 | sys.platform = "linux2" | |
220 | env.pop('IPYTHON_DIR', None) |
|
220 | env.pop('IPYTHON_DIR', None) | |
221 | env.pop('IPYTHONDIR', None) |
|
221 | env.pop('IPYTHONDIR', None) | |
222 | env.pop('XDG_CONFIG_HOME', None) |
|
222 | env.pop('XDG_CONFIG_HOME', None) | |
223 | cfgdir=os.path.join(path.get_home_dir(), '.config') |
|
223 | cfgdir=os.path.join(path.get_home_dir(), '.config') | |
224 | if not os.path.exists(cfgdir): |
|
224 | if not os.path.exists(cfgdir): | |
225 | os.makedirs(cfgdir) |
|
225 | os.makedirs(cfgdir) | |
226 |
|
226 | |||
227 | nt.assert_equal(path.get_xdg_dir(), cfgdir) |
|
227 | nt.assert_equal(path.get_xdg_dir(), cfgdir) | |
228 |
|
228 | |||
229 | @with_environment |
|
229 | @with_environment | |
230 | def test_get_xdg_dir_3(): |
|
230 | def test_get_xdg_dir_3(): | |
231 | """test_get_xdg_dir_3, check xdg_dir not used on OS X""" |
|
231 | """test_get_xdg_dir_3, check xdg_dir not used on OS X""" | |
232 | reload(path) |
|
232 | reload(path) | |
233 | path.get_home_dir = lambda : HOME_TEST_DIR |
|
233 | path.get_home_dir = lambda : HOME_TEST_DIR | |
234 | os.name = "posix" |
|
234 | os.name = "posix" | |
235 | sys.platform = "darwin" |
|
235 | sys.platform = "darwin" | |
236 | env.pop('IPYTHON_DIR', None) |
|
236 | env.pop('IPYTHON_DIR', None) | |
237 | env.pop('IPYTHONDIR', None) |
|
237 | env.pop('IPYTHONDIR', None) | |
238 | env.pop('XDG_CONFIG_HOME', None) |
|
238 | env.pop('XDG_CONFIG_HOME', None) | |
239 | cfgdir=os.path.join(path.get_home_dir(), '.config') |
|
239 | cfgdir=os.path.join(path.get_home_dir(), '.config') | |
240 | if not os.path.exists(cfgdir): |
|
240 | if not os.path.exists(cfgdir): | |
241 | os.makedirs(cfgdir) |
|
241 | os.makedirs(cfgdir) | |
242 |
|
242 | |||
243 | nt.assert_equal(path.get_xdg_dir(), None) |
|
243 | nt.assert_equal(path.get_xdg_dir(), None) | |
244 |
|
244 | |||
245 | def test_filefind(): |
|
245 | def test_filefind(): | |
246 | """Various tests for filefind""" |
|
246 | """Various tests for filefind""" | |
247 | f = tempfile.NamedTemporaryFile() |
|
247 | f = tempfile.NamedTemporaryFile() | |
248 | # print 'fname:',f.name |
|
248 | # print 'fname:',f.name | |
249 | alt_dirs = paths.get_ipython_dir() |
|
249 | alt_dirs = paths.get_ipython_dir() | |
250 | t = path.filefind(f.name, alt_dirs) |
|
250 | t = path.filefind(f.name, alt_dirs) | |
251 | # print 'found:',t |
|
251 | # print 'found:',t | |
252 |
|
252 | |||
253 |
|
253 | |||
254 | @dec.skip_if_not_win32 |
|
254 | @dec.skip_if_not_win32 | |
255 | def test_get_long_path_name_win32(): |
|
255 | def test_get_long_path_name_win32(): | |
256 | with TemporaryDirectory() as tmpdir: |
|
256 | with TemporaryDirectory() as tmpdir: | |
257 |
|
257 | |||
258 | # Make a long path. Expands the path of tmpdir prematurely as it may already have a long |
|
258 | # Make a long path. Expands the path of tmpdir prematurely as it may already have a long | |
259 | # path component, so ensure we include the long form of it |
|
259 | # path component, so ensure we include the long form of it | |
260 | long_path = os.path.join(path.get_long_path_name(tmpdir), 'this is my long path name') |
|
260 | long_path = os.path.join(path.get_long_path_name(tmpdir), 'this is my long path name') | |
261 | os.makedirs(long_path) |
|
261 | os.makedirs(long_path) | |
262 |
|
262 | |||
263 | # Test to see if the short path evaluates correctly. |
|
263 | # Test to see if the short path evaluates correctly. | |
264 | short_path = os.path.join(tmpdir, 'THISIS~1') |
|
264 | short_path = os.path.join(tmpdir, 'THISIS~1') | |
265 | evaluated_path = path.get_long_path_name(short_path) |
|
265 | evaluated_path = path.get_long_path_name(short_path) | |
266 | nt.assert_equal(evaluated_path.lower(), long_path.lower()) |
|
266 | nt.assert_equal(evaluated_path.lower(), long_path.lower()) | |
267 |
|
267 | |||
268 |
|
268 | |||
269 | @dec.skip_win32 |
|
269 | @dec.skip_win32 | |
270 | def test_get_long_path_name(): |
|
270 | def test_get_long_path_name(): | |
271 | p = path.get_long_path_name('/usr/local') |
|
271 | p = path.get_long_path_name('/usr/local') | |
272 | nt.assert_equal(p,'/usr/local') |
|
272 | nt.assert_equal(p,'/usr/local') | |
273 |
|
273 | |||
274 |
|
274 | |||
275 | class TestRaiseDeprecation(unittest.TestCase): |
|
275 | class TestRaiseDeprecation(unittest.TestCase): | |
276 |
|
276 | |||
277 | @dec.skip_win32 # can't create not-user-writable dir on win |
|
277 | @dec.skip_win32 # can't create not-user-writable dir on win | |
278 | @with_environment |
|
278 | @with_environment | |
279 | def test_not_writable_ipdir(self): |
|
279 | def test_not_writable_ipdir(self): | |
280 | tmpdir = tempfile.mkdtemp() |
|
280 | tmpdir = tempfile.mkdtemp() | |
281 | os.name = "posix" |
|
281 | os.name = "posix" | |
282 | env.pop('IPYTHON_DIR', None) |
|
282 | env.pop('IPYTHON_DIR', None) | |
283 | env.pop('IPYTHONDIR', None) |
|
283 | env.pop('IPYTHONDIR', None) | |
284 | env.pop('XDG_CONFIG_HOME', None) |
|
284 | env.pop('XDG_CONFIG_HOME', None) | |
285 | env['HOME'] = tmpdir |
|
285 | env['HOME'] = tmpdir | |
286 | ipdir = os.path.join(tmpdir, '.ipython') |
|
286 | ipdir = os.path.join(tmpdir, '.ipython') | |
287 | os.mkdir(ipdir, 0o555) |
|
287 | os.mkdir(ipdir, 0o555) | |
288 | try: |
|
288 | try: | |
289 | open(os.path.join(ipdir, "_foo_"), 'w').close() |
|
289 | open(os.path.join(ipdir, "_foo_"), 'w').close() | |
290 | except IOError: |
|
290 | except IOError: | |
291 | pass |
|
291 | pass | |
292 | else: |
|
292 | else: | |
293 | # I can still write to an unwritable dir, |
|
293 | # I can still write to an unwritable dir, | |
294 | # assume I'm root and skip the test |
|
294 | # assume I'm root and skip the test | |
295 | raise SkipTest("I can't create directories that I can't write to") |
|
295 | raise SkipTest("I can't create directories that I can't write to") | |
296 | with self.assertWarnsRegex(UserWarning, 'is not a writable location'): |
|
296 | with self.assertWarnsRegex(UserWarning, 'is not a writable location'): | |
297 | ipdir = paths.get_ipython_dir() |
|
297 | ipdir = paths.get_ipython_dir() | |
298 | env.pop('IPYTHON_DIR', None) |
|
298 | env.pop('IPYTHON_DIR', None) | |
299 |
|
299 | |||
300 | @with_environment |
|
300 | @with_environment | |
301 | def test_get_py_filename(): |
|
301 | def test_get_py_filename(): | |
302 | os.chdir(TMP_TEST_DIR) |
|
302 | os.chdir(TMP_TEST_DIR) | |
303 | with make_tempfile('foo.py'): |
|
303 | with make_tempfile('foo.py'): | |
304 | nt.assert_equal(path.get_py_filename('foo.py'), 'foo.py') |
|
304 | nt.assert_equal(path.get_py_filename('foo.py'), 'foo.py') | |
305 | nt.assert_equal(path.get_py_filename('foo'), 'foo.py') |
|
305 | nt.assert_equal(path.get_py_filename('foo'), 'foo.py') | |
306 | with make_tempfile('foo'): |
|
306 | with make_tempfile('foo'): | |
307 | nt.assert_equal(path.get_py_filename('foo'), 'foo') |
|
307 | nt.assert_equal(path.get_py_filename('foo'), 'foo') | |
308 | nt.assert_raises(IOError, path.get_py_filename, 'foo.py') |
|
308 | nt.assert_raises(IOError, path.get_py_filename, 'foo.py') | |
309 | nt.assert_raises(IOError, path.get_py_filename, 'foo') |
|
309 | nt.assert_raises(IOError, path.get_py_filename, 'foo') | |
310 | nt.assert_raises(IOError, path.get_py_filename, 'foo.py') |
|
310 | nt.assert_raises(IOError, path.get_py_filename, 'foo.py') | |
311 | true_fn = 'foo with spaces.py' |
|
311 | true_fn = 'foo with spaces.py' | |
312 | with make_tempfile(true_fn): |
|
312 | with make_tempfile(true_fn): | |
313 | nt.assert_equal(path.get_py_filename('foo with spaces'), true_fn) |
|
313 | nt.assert_equal(path.get_py_filename('foo with spaces'), true_fn) | |
314 | nt.assert_equal(path.get_py_filename('foo with spaces.py'), true_fn) |
|
314 | nt.assert_equal(path.get_py_filename('foo with spaces.py'), true_fn) | |
315 | nt.assert_raises(IOError, path.get_py_filename, '"foo with spaces.py"') |
|
315 | nt.assert_raises(IOError, path.get_py_filename, '"foo with spaces.py"') | |
316 | nt.assert_raises(IOError, path.get_py_filename, "'foo with spaces.py'") |
|
316 | nt.assert_raises(IOError, path.get_py_filename, "'foo with spaces.py'") | |
317 |
|
317 | |||
318 | @onlyif_unicode_paths |
|
318 | @onlyif_unicode_paths | |
319 | def test_unicode_in_filename(): |
|
319 | def test_unicode_in_filename(): | |
320 | """When a file doesn't exist, the exception raised should be safe to call |
|
320 | """When a file doesn't exist, the exception raised should be safe to call | |
321 | str() on - i.e. in Python 2 it must only have ASCII characters. |
|
321 | str() on - i.e. in Python 2 it must only have ASCII characters. | |
322 |
|
322 | |||
323 | https://github.com/ipython/ipython/issues/875 |
|
323 | https://github.com/ipython/ipython/issues/875 | |
324 | """ |
|
324 | """ | |
325 | try: |
|
325 | try: | |
326 | # these calls should not throw unicode encode exceptions |
|
326 | # these calls should not throw unicode encode exceptions | |
327 | path.get_py_filename('fooéè.py') |
|
327 | path.get_py_filename('fooéè.py') | |
328 | except IOError as ex: |
|
328 | except IOError as ex: | |
329 | str(ex) |
|
329 | str(ex) | |
330 |
|
330 | |||
331 |
|
331 | |||
332 | class TestShellGlob(unittest.TestCase): |
|
332 | class TestShellGlob(unittest.TestCase): | |
333 |
|
333 | |||
334 | @classmethod |
|
334 | @classmethod | |
335 | def setUpClass(cls): |
|
335 | def setUpClass(cls): | |
336 | cls.filenames_start_with_a = ['a0', 'a1', 'a2'] |
|
336 | cls.filenames_start_with_a = ['a0', 'a1', 'a2'] | |
337 | cls.filenames_end_with_b = ['0b', '1b', '2b'] |
|
337 | cls.filenames_end_with_b = ['0b', '1b', '2b'] | |
338 | cls.filenames = cls.filenames_start_with_a + cls.filenames_end_with_b |
|
338 | cls.filenames = cls.filenames_start_with_a + cls.filenames_end_with_b | |
339 | cls.tempdir = TemporaryDirectory() |
|
339 | cls.tempdir = TemporaryDirectory() | |
340 | td = cls.tempdir.name |
|
340 | td = cls.tempdir.name | |
341 |
|
341 | |||
342 | with cls.in_tempdir(): |
|
342 | with cls.in_tempdir(): | |
343 | # Create empty files |
|
343 | # Create empty files | |
344 | for fname in cls.filenames: |
|
344 | for fname in cls.filenames: | |
345 | open(os.path.join(td, fname), 'w').close() |
|
345 | open(os.path.join(td, fname), 'w').close() | |
346 |
|
346 | |||
347 | @classmethod |
|
347 | @classmethod | |
348 | def tearDownClass(cls): |
|
348 | def tearDownClass(cls): | |
349 | cls.tempdir.cleanup() |
|
349 | cls.tempdir.cleanup() | |
350 |
|
350 | |||
351 | @classmethod |
|
351 | @classmethod | |
352 | @contextmanager |
|
352 | @contextmanager | |
353 | def in_tempdir(cls): |
|
353 | def in_tempdir(cls): | |
354 | save = os.getcwd() |
|
354 | save = os.getcwd() | |
355 | try: |
|
355 | try: | |
356 | os.chdir(cls.tempdir.name) |
|
356 | os.chdir(cls.tempdir.name) | |
357 | yield |
|
357 | yield | |
358 | finally: |
|
358 | finally: | |
359 | os.chdir(save) |
|
359 | os.chdir(save) | |
360 |
|
360 | |||
361 | def check_match(self, patterns, matches): |
|
361 | def check_match(self, patterns, matches): | |
362 | with self.in_tempdir(): |
|
362 | with self.in_tempdir(): | |
363 | # glob returns unordered list. that's why sorted is required. |
|
363 | # glob returns unordered list. that's why sorted is required. | |
364 | nt.assert_equal(sorted(path.shellglob(patterns)), |
|
364 | nt.assert_equal(sorted(path.shellglob(patterns)), | |
365 | sorted(matches)) |
|
365 | sorted(matches)) | |
366 |
|
366 | |||
367 | def common_cases(self): |
|
367 | def common_cases(self): | |
368 | return [ |
|
368 | return [ | |
369 | (['*'], self.filenames), |
|
369 | (['*'], self.filenames), | |
370 | (['a*'], self.filenames_start_with_a), |
|
370 | (['a*'], self.filenames_start_with_a), | |
371 | (['*c'], ['*c']), |
|
371 | (['*c'], ['*c']), | |
372 | (['*', 'a*', '*b', '*c'], self.filenames |
|
372 | (['*', 'a*', '*b', '*c'], self.filenames | |
373 | + self.filenames_start_with_a |
|
373 | + self.filenames_start_with_a | |
374 | + self.filenames_end_with_b |
|
374 | + self.filenames_end_with_b | |
375 | + ['*c']), |
|
375 | + ['*c']), | |
376 | (['a[012]'], self.filenames_start_with_a), |
|
376 | (['a[012]'], self.filenames_start_with_a), | |
377 | ] |
|
377 | ] | |
378 |
|
378 | |||
379 | @skip_win32 |
|
379 | @skip_win32 | |
380 | def test_match_posix(self): |
|
380 | def test_match_posix(self): | |
381 | for (patterns, matches) in self.common_cases() + [ |
|
381 | for (patterns, matches) in self.common_cases() + [ | |
382 | ([r'\*'], ['*']), |
|
382 | ([r'\*'], ['*']), | |
383 | ([r'a\*', 'a*'], ['a*'] + self.filenames_start_with_a), |
|
383 | ([r'a\*', 'a*'], ['a*'] + self.filenames_start_with_a), | |
384 | ([r'a\[012]'], ['a[012]']), |
|
384 | ([r'a\[012]'], ['a[012]']), | |
385 | ]: |
|
385 | ]: | |
386 | yield (self.check_match, patterns, matches) |
|
386 | yield (self.check_match, patterns, matches) | |
387 |
|
387 | |||
388 | @skip_if_not_win32 |
|
388 | @skip_if_not_win32 | |
389 | def test_match_windows(self): |
|
389 | def test_match_windows(self): | |
390 | for (patterns, matches) in self.common_cases() + [ |
|
390 | for (patterns, matches) in self.common_cases() + [ | |
391 | # In windows, backslash is interpreted as path |
|
391 | # In windows, backslash is interpreted as path | |
392 | # separator. Therefore, you can't escape glob |
|
392 | # separator. Therefore, you can't escape glob | |
393 | # using it. |
|
393 | # using it. | |
394 | ([r'a\*', 'a*'], [r'a\*'] + self.filenames_start_with_a), |
|
394 | ([r'a\*', 'a*'], [r'a\*'] + self.filenames_start_with_a), | |
395 | ([r'a\[012]'], [r'a\[012]']), |
|
395 | ([r'a\[012]'], [r'a\[012]']), | |
396 | ]: |
|
396 | ]: | |
397 | yield (self.check_match, patterns, matches) |
|
397 | yield (self.check_match, patterns, matches) | |
398 |
|
398 | |||
399 |
|
399 | |||
400 | def test_unescape_glob(): |
|
400 | def test_unescape_glob(): | |
401 | nt.assert_equal(path.unescape_glob(r'\*\[\!\]\?'), '*[!]?') |
|
401 | nt.assert_equal(path.unescape_glob(r'\*\[\!\]\?'), '*[!]?') | |
402 | nt.assert_equal(path.unescape_glob(r'\\*'), r'\*') |
|
402 | nt.assert_equal(path.unescape_glob(r'\\*'), r'\*') | |
403 | nt.assert_equal(path.unescape_glob(r'\\\*'), r'\*') |
|
403 | nt.assert_equal(path.unescape_glob(r'\\\*'), r'\*') | |
404 | nt.assert_equal(path.unescape_glob(r'\\a'), r'\a') |
|
404 | nt.assert_equal(path.unescape_glob(r'\\a'), r'\a') | |
405 | nt.assert_equal(path.unescape_glob(r'\a'), r'\a') |
|
405 | nt.assert_equal(path.unescape_glob(r'\a'), r'\a') | |
406 |
|
406 | |||
407 |
|
407 | |||
408 | @onlyif_unicode_paths |
|
408 | @onlyif_unicode_paths | |
409 | def test_ensure_dir_exists(): |
|
409 | def test_ensure_dir_exists(): | |
410 | with TemporaryDirectory() as td: |
|
410 | with TemporaryDirectory() as td: | |
411 | d = os.path.join(td, 'βir') |
|
411 | d = os.path.join(td, 'βir') | |
412 | path.ensure_dir_exists(d) # create it |
|
412 | path.ensure_dir_exists(d) # create it | |
413 | assert os.path.isdir(d) |
|
413 | assert os.path.isdir(d) | |
414 | path.ensure_dir_exists(d) # no-op |
|
414 | path.ensure_dir_exists(d) # no-op | |
415 | f = os.path.join(td, 'Ζile') |
|
415 | f = os.path.join(td, 'Ζile') | |
416 | open(f, 'w').close() # touch |
|
416 | open(f, 'w').close() # touch | |
417 | with nt.assert_raises(IOError): |
|
417 | with nt.assert_raises(IOError): | |
418 | path.ensure_dir_exists(f) |
|
418 | path.ensure_dir_exists(f) | |
419 |
|
419 | |||
420 | class TestLinkOrCopy(unittest.TestCase): |
|
420 | class TestLinkOrCopy(unittest.TestCase): | |
421 | def setUp(self): |
|
421 | def setUp(self): | |
422 | self.tempdir = TemporaryDirectory() |
|
422 | self.tempdir = TemporaryDirectory() | |
423 | self.src = self.dst("src") |
|
423 | self.src = self.dst("src") | |
424 | with open(self.src, "w") as f: |
|
424 | with open(self.src, "w") as f: | |
425 | f.write("Hello, world!") |
|
425 | f.write("Hello, world!") | |
426 |
|
426 | |||
427 | def tearDown(self): |
|
427 | def tearDown(self): | |
428 | self.tempdir.cleanup() |
|
428 | self.tempdir.cleanup() | |
429 |
|
429 | |||
430 | def dst(self, *args): |
|
430 | def dst(self, *args): | |
431 | return os.path.join(self.tempdir.name, *args) |
|
431 | return os.path.join(self.tempdir.name, *args) | |
432 |
|
432 | |||
433 | def assert_inode_not_equal(self, a, b): |
|
433 | def assert_inode_not_equal(self, a, b): | |
434 | nt.assert_not_equal(os.stat(a).st_ino, os.stat(b).st_ino, |
|
434 | nt.assert_not_equal(os.stat(a).st_ino, os.stat(b).st_ino, | |
435 | "%r and %r do reference the same indoes" %(a, b)) |
|
435 | "%r and %r do reference the same indoes" %(a, b)) | |
436 |
|
436 | |||
437 | def assert_inode_equal(self, a, b): |
|
437 | def assert_inode_equal(self, a, b): | |
438 | nt.assert_equal(os.stat(a).st_ino, os.stat(b).st_ino, |
|
438 | nt.assert_equal(os.stat(a).st_ino, os.stat(b).st_ino, | |
439 | "%r and %r do not reference the same indoes" %(a, b)) |
|
439 | "%r and %r do not reference the same indoes" %(a, b)) | |
440 |
|
440 | |||
441 | def assert_content_equal(self, a, b): |
|
441 | def assert_content_equal(self, a, b): | |
442 | with open(a) as a_f: |
|
442 | with open(a) as a_f: | |
443 | with open(b) as b_f: |
|
443 | with open(b) as b_f: | |
444 | nt.assert_equal(a_f.read(), b_f.read()) |
|
444 | nt.assert_equal(a_f.read(), b_f.read()) | |
445 |
|
445 | |||
446 | @skip_win32 |
|
446 | @skip_win32 | |
447 | def test_link_successful(self): |
|
447 | def test_link_successful(self): | |
448 | dst = self.dst("target") |
|
448 | dst = self.dst("target") | |
449 | path.link_or_copy(self.src, dst) |
|
449 | path.link_or_copy(self.src, dst) | |
450 | self.assert_inode_equal(self.src, dst) |
|
450 | self.assert_inode_equal(self.src, dst) | |
451 |
|
451 | |||
452 | @skip_win32 |
|
452 | @skip_win32 | |
453 | def test_link_into_dir(self): |
|
453 | def test_link_into_dir(self): | |
454 | dst = self.dst("some_dir") |
|
454 | dst = self.dst("some_dir") | |
455 | os.mkdir(dst) |
|
455 | os.mkdir(dst) | |
456 | path.link_or_copy(self.src, dst) |
|
456 | path.link_or_copy(self.src, dst) | |
457 | expected_dst = self.dst("some_dir", os.path.basename(self.src)) |
|
457 | expected_dst = self.dst("some_dir", os.path.basename(self.src)) | |
458 | self.assert_inode_equal(self.src, expected_dst) |
|
458 | self.assert_inode_equal(self.src, expected_dst) | |
459 |
|
459 | |||
460 | @skip_win32 |
|
460 | @skip_win32 | |
461 | def test_target_exists(self): |
|
461 | def test_target_exists(self): | |
462 | dst = self.dst("target") |
|
462 | dst = self.dst("target") | |
463 | open(dst, "w").close() |
|
463 | open(dst, "w").close() | |
464 | path.link_or_copy(self.src, dst) |
|
464 | path.link_or_copy(self.src, dst) | |
465 | self.assert_inode_equal(self.src, dst) |
|
465 | self.assert_inode_equal(self.src, dst) | |
466 |
|
466 | |||
467 | @skip_win32 |
|
467 | @skip_win32 | |
468 | def test_no_link(self): |
|
468 | def test_no_link(self): | |
469 | real_link = os.link |
|
469 | real_link = os.link | |
470 | try: |
|
470 | try: | |
471 | del os.link |
|
471 | del os.link | |
472 | dst = self.dst("target") |
|
472 | dst = self.dst("target") | |
473 | path.link_or_copy(self.src, dst) |
|
473 | path.link_or_copy(self.src, dst) | |
474 | self.assert_content_equal(self.src, dst) |
|
474 | self.assert_content_equal(self.src, dst) | |
475 | self.assert_inode_not_equal(self.src, dst) |
|
475 | self.assert_inode_not_equal(self.src, dst) | |
476 | finally: |
|
476 | finally: | |
477 | os.link = real_link |
|
477 | os.link = real_link | |
478 |
|
478 | |||
479 | @skip_if_not_win32 |
|
479 | @skip_if_not_win32 | |
480 | def test_windows(self): |
|
480 | def test_windows(self): | |
481 | dst = self.dst("target") |
|
481 | dst = self.dst("target") | |
482 | path.link_or_copy(self.src, dst) |
|
482 | path.link_or_copy(self.src, dst) | |
483 | self.assert_content_equal(self.src, dst) |
|
483 | self.assert_content_equal(self.src, dst) | |
484 |
|
484 | |||
485 | def test_link_twice(self): |
|
485 | def test_link_twice(self): | |
486 | # Linking the same file twice shouldn't leave duplicates around. |
|
486 | # Linking the same file twice shouldn't leave duplicates around. | |
487 | # See https://github.com/ipython/ipython/issues/6450 |
|
487 | # See https://github.com/ipython/ipython/issues/6450 | |
488 | dst = self.dst('target') |
|
488 | dst = self.dst('target') | |
489 | path.link_or_copy(self.src, dst) |
|
489 | path.link_or_copy(self.src, dst) | |
490 | path.link_or_copy(self.src, dst) |
|
490 | path.link_or_copy(self.src, dst) | |
491 | self.assert_inode_equal(self.src, dst) |
|
491 | self.assert_inode_equal(self.src, dst) | |
492 | nt.assert_equal(sorted(os.listdir(self.tempdir.name)), ['src', 'target']) |
|
492 | nt.assert_equal(sorted(os.listdir(self.tempdir.name)), ['src', 'target']) |
@@ -1,145 +1,144 b'' | |||||
1 | # encoding: utf-8 |
|
1 | # encoding: utf-8 | |
2 | """ |
|
2 | """ | |
3 | Tests for platutils.py |
|
3 | Tests for platutils.py | |
4 | """ |
|
4 | """ | |
5 |
|
5 | |||
6 | #----------------------------------------------------------------------------- |
|
6 | #----------------------------------------------------------------------------- | |
7 | # Copyright (C) 2008-2011 The IPython Development Team |
|
7 | # Copyright (C) 2008-2011 The IPython Development Team | |
8 | # |
|
8 | # | |
9 | # Distributed under the terms of the BSD License. The full license is in |
|
9 | # Distributed under the terms of the BSD License. The full license is in | |
10 | # the file COPYING, distributed as part of this software. |
|
10 | # the file COPYING, distributed as part of this software. | |
11 | #----------------------------------------------------------------------------- |
|
11 | #----------------------------------------------------------------------------- | |
12 |
|
12 | |||
13 | #----------------------------------------------------------------------------- |
|
13 | #----------------------------------------------------------------------------- | |
14 | # Imports |
|
14 | # Imports | |
15 | #----------------------------------------------------------------------------- |
|
15 | #----------------------------------------------------------------------------- | |
16 |
|
16 | |||
17 | import sys |
|
17 | import sys | |
18 | import os |
|
18 | import os | |
19 | from unittest import TestCase |
|
|||
20 |
|
19 | |||
21 | import nose.tools as nt |
|
20 | import nose.tools as nt | |
22 |
|
21 | |||
23 | from IPython.utils.process import (find_cmd, FindCmdError, arg_split, |
|
22 | from IPython.utils.process import (find_cmd, FindCmdError, arg_split, | |
24 | system, getoutput, getoutputerror, |
|
23 | system, getoutput, getoutputerror, | |
25 | get_output_error_code) |
|
24 | get_output_error_code) | |
26 | from IPython.testing import decorators as dec |
|
25 | from IPython.testing import decorators as dec | |
27 | from IPython.testing import tools as tt |
|
26 | from IPython.testing import tools as tt | |
28 |
|
27 | |||
29 | python = os.path.basename(sys.executable) |
|
28 | python = os.path.basename(sys.executable) | |
30 |
|
29 | |||
31 | #----------------------------------------------------------------------------- |
|
30 | #----------------------------------------------------------------------------- | |
32 | # Tests |
|
31 | # Tests | |
33 | #----------------------------------------------------------------------------- |
|
32 | #----------------------------------------------------------------------------- | |
34 |
|
33 | |||
35 |
|
34 | |||
36 | @dec.skip_win32 |
|
35 | @dec.skip_win32 | |
37 | def test_find_cmd_ls(): |
|
36 | def test_find_cmd_ls(): | |
38 | """Make sure we can find the full path to ls.""" |
|
37 | """Make sure we can find the full path to ls.""" | |
39 | path = find_cmd('ls') |
|
38 | path = find_cmd('ls') | |
40 | nt.assert_true(path.endswith('ls')) |
|
39 | nt.assert_true(path.endswith('ls')) | |
41 |
|
40 | |||
42 |
|
41 | |||
43 | def has_pywin32(): |
|
42 | def has_pywin32(): | |
44 | try: |
|
43 | try: | |
45 | import win32api |
|
44 | import win32api | |
46 | except ImportError: |
|
45 | except ImportError: | |
47 | return False |
|
46 | return False | |
48 | return True |
|
47 | return True | |
49 |
|
48 | |||
50 |
|
49 | |||
51 | @dec.onlyif(has_pywin32, "This test requires win32api to run") |
|
50 | @dec.onlyif(has_pywin32, "This test requires win32api to run") | |
52 | def test_find_cmd_pythonw(): |
|
51 | def test_find_cmd_pythonw(): | |
53 | """Try to find pythonw on Windows.""" |
|
52 | """Try to find pythonw on Windows.""" | |
54 | path = find_cmd('pythonw') |
|
53 | path = find_cmd('pythonw') | |
55 | assert path.lower().endswith('pythonw.exe'), path |
|
54 | assert path.lower().endswith('pythonw.exe'), path | |
56 |
|
55 | |||
57 |
|
56 | |||
58 | @dec.onlyif(lambda : sys.platform != 'win32' or has_pywin32(), |
|
57 | @dec.onlyif(lambda : sys.platform != 'win32' or has_pywin32(), | |
59 | "This test runs on posix or in win32 with win32api installed") |
|
58 | "This test runs on posix or in win32 with win32api installed") | |
60 | def test_find_cmd_fail(): |
|
59 | def test_find_cmd_fail(): | |
61 | """Make sure that FindCmdError is raised if we can't find the cmd.""" |
|
60 | """Make sure that FindCmdError is raised if we can't find the cmd.""" | |
62 | nt.assert_raises(FindCmdError,find_cmd,'asdfasdf') |
|
61 | nt.assert_raises(FindCmdError,find_cmd,'asdfasdf') | |
63 |
|
62 | |||
64 |
|
63 | |||
65 | @dec.skip_win32 |
|
64 | @dec.skip_win32 | |
66 | def test_arg_split(): |
|
65 | def test_arg_split(): | |
67 | """Ensure that argument lines are correctly split like in a shell.""" |
|
66 | """Ensure that argument lines are correctly split like in a shell.""" | |
68 | tests = [['hi', ['hi']], |
|
67 | tests = [['hi', ['hi']], | |
69 | [u'hi', [u'hi']], |
|
68 | [u'hi', [u'hi']], | |
70 | ['hello there', ['hello', 'there']], |
|
69 | ['hello there', ['hello', 'there']], | |
71 | # \u01ce == \N{LATIN SMALL LETTER A WITH CARON} |
|
70 | # \u01ce == \N{LATIN SMALL LETTER A WITH CARON} | |
72 | # Do not use \N because the tests crash with syntax error in |
|
71 | # Do not use \N because the tests crash with syntax error in | |
73 | # some cases, for example windows python2.6. |
|
72 | # some cases, for example windows python2.6. | |
74 | [u'h\u01cello', [u'h\u01cello']], |
|
73 | [u'h\u01cello', [u'h\u01cello']], | |
75 | ['something "with quotes"', ['something', '"with quotes"']], |
|
74 | ['something "with quotes"', ['something', '"with quotes"']], | |
76 | ] |
|
75 | ] | |
77 | for argstr, argv in tests: |
|
76 | for argstr, argv in tests: | |
78 | nt.assert_equal(arg_split(argstr), argv) |
|
77 | nt.assert_equal(arg_split(argstr), argv) | |
79 |
|
78 | |||
80 | @dec.skip_if_not_win32 |
|
79 | @dec.skip_if_not_win32 | |
81 | def test_arg_split_win32(): |
|
80 | def test_arg_split_win32(): | |
82 | """Ensure that argument lines are correctly split like in a shell.""" |
|
81 | """Ensure that argument lines are correctly split like in a shell.""" | |
83 | tests = [['hi', ['hi']], |
|
82 | tests = [['hi', ['hi']], | |
84 | [u'hi', [u'hi']], |
|
83 | [u'hi', [u'hi']], | |
85 | ['hello there', ['hello', 'there']], |
|
84 | ['hello there', ['hello', 'there']], | |
86 | [u'h\u01cello', [u'h\u01cello']], |
|
85 | [u'h\u01cello', [u'h\u01cello']], | |
87 | ['something "with quotes"', ['something', 'with quotes']], |
|
86 | ['something "with quotes"', ['something', 'with quotes']], | |
88 | ] |
|
87 | ] | |
89 | for argstr, argv in tests: |
|
88 | for argstr, argv in tests: | |
90 | nt.assert_equal(arg_split(argstr), argv) |
|
89 | nt.assert_equal(arg_split(argstr), argv) | |
91 |
|
90 | |||
92 |
|
91 | |||
93 | class SubProcessTestCase(tt.TempFileMixin): |
|
92 | class SubProcessTestCase(tt.TempFileMixin): | |
94 | def setUp(self): |
|
93 | def setUp(self): | |
95 | """Make a valid python temp file.""" |
|
94 | """Make a valid python temp file.""" | |
96 | lines = [ "import sys", |
|
95 | lines = [ "import sys", | |
97 | "print('on stdout', end='', file=sys.stdout)", |
|
96 | "print('on stdout', end='', file=sys.stdout)", | |
98 | "print('on stderr', end='', file=sys.stderr)", |
|
97 | "print('on stderr', end='', file=sys.stderr)", | |
99 | "sys.stdout.flush()", |
|
98 | "sys.stdout.flush()", | |
100 | "sys.stderr.flush()"] |
|
99 | "sys.stderr.flush()"] | |
101 | self.mktmp('\n'.join(lines)) |
|
100 | self.mktmp('\n'.join(lines)) | |
102 |
|
101 | |||
103 | def test_system(self): |
|
102 | def test_system(self): | |
104 | status = system('%s "%s"' % (python, self.fname)) |
|
103 | status = system('%s "%s"' % (python, self.fname)) | |
105 | self.assertEqual(status, 0) |
|
104 | self.assertEqual(status, 0) | |
106 |
|
105 | |||
107 | def test_system_quotes(self): |
|
106 | def test_system_quotes(self): | |
108 | status = system('%s -c "import sys"' % python) |
|
107 | status = system('%s -c "import sys"' % python) | |
109 | self.assertEqual(status, 0) |
|
108 | self.assertEqual(status, 0) | |
110 |
|
109 | |||
111 | def test_getoutput(self): |
|
110 | def test_getoutput(self): | |
112 | out = getoutput('%s "%s"' % (python, self.fname)) |
|
111 | out = getoutput('%s "%s"' % (python, self.fname)) | |
113 | # we can't rely on the order the line buffered streams are flushed |
|
112 | # we can't rely on the order the line buffered streams are flushed | |
114 | try: |
|
113 | try: | |
115 | self.assertEqual(out, 'on stderron stdout') |
|
114 | self.assertEqual(out, 'on stderron stdout') | |
116 | except AssertionError: |
|
115 | except AssertionError: | |
117 | self.assertEqual(out, 'on stdouton stderr') |
|
116 | self.assertEqual(out, 'on stdouton stderr') | |
118 |
|
117 | |||
119 | def test_getoutput_quoted(self): |
|
118 | def test_getoutput_quoted(self): | |
120 | out = getoutput('%s -c "print (1)"' % python) |
|
119 | out = getoutput('%s -c "print (1)"' % python) | |
121 | self.assertEqual(out.strip(), '1') |
|
120 | self.assertEqual(out.strip(), '1') | |
122 |
|
121 | |||
123 | #Invalid quoting on windows |
|
122 | #Invalid quoting on windows | |
124 | @dec.skip_win32 |
|
123 | @dec.skip_win32 | |
125 | def test_getoutput_quoted2(self): |
|
124 | def test_getoutput_quoted2(self): | |
126 | out = getoutput("%s -c 'print (1)'" % python) |
|
125 | out = getoutput("%s -c 'print (1)'" % python) | |
127 | self.assertEqual(out.strip(), '1') |
|
126 | self.assertEqual(out.strip(), '1') | |
128 | out = getoutput("%s -c 'print (\"1\")'" % python) |
|
127 | out = getoutput("%s -c 'print (\"1\")'" % python) | |
129 | self.assertEqual(out.strip(), '1') |
|
128 | self.assertEqual(out.strip(), '1') | |
130 |
|
129 | |||
131 | def test_getoutput_error(self): |
|
130 | def test_getoutput_error(self): | |
132 | out, err = getoutputerror('%s "%s"' % (python, self.fname)) |
|
131 | out, err = getoutputerror('%s "%s"' % (python, self.fname)) | |
133 | self.assertEqual(out, 'on stdout') |
|
132 | self.assertEqual(out, 'on stdout') | |
134 | self.assertEqual(err, 'on stderr') |
|
133 | self.assertEqual(err, 'on stderr') | |
135 |
|
134 | |||
136 | def test_get_output_error_code(self): |
|
135 | def test_get_output_error_code(self): | |
137 | quiet_exit = '%s -c "import sys; sys.exit(1)"' % python |
|
136 | quiet_exit = '%s -c "import sys; sys.exit(1)"' % python | |
138 | out, err, code = get_output_error_code(quiet_exit) |
|
137 | out, err, code = get_output_error_code(quiet_exit) | |
139 | self.assertEqual(out, '') |
|
138 | self.assertEqual(out, '') | |
140 | self.assertEqual(err, '') |
|
139 | self.assertEqual(err, '') | |
141 | self.assertEqual(code, 1) |
|
140 | self.assertEqual(code, 1) | |
142 | out, err, code = get_output_error_code('%s "%s"' % (python, self.fname)) |
|
141 | out, err, code = get_output_error_code('%s "%s"' % (python, self.fname)) | |
143 | self.assertEqual(out, 'on stdout') |
|
142 | self.assertEqual(out, 'on stdout') | |
144 | self.assertEqual(err, 'on stderr') |
|
143 | self.assertEqual(err, 'on stderr') | |
145 | self.assertEqual(code, 0) |
|
144 | self.assertEqual(code, 0) |
General Comments 0
You need to be logged in to leave comments.
Login now