Skip to content

Commit b7cc43d

Browse files
authored
Merge branch 'main' into tc
2 parents 4a28a2d + 03646ad commit b7cc43d

24 files changed

+45
-45
lines changed

IPython/core/completer.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@
159159
their priority. Matchers can request to suppress results from subsequent
160160
matchers by setting ``suppress`` to ``True`` in the ``MatcherResult``.
161161
162-
When multiple matchers simultaneously request surpression, the results from of
162+
When multiple matchers simultaneously request suppression, the results from of
163163
the matcher with higher priority will be returned.
164164
165165
Sometimes it is desirable to suppress most but not all other matchers;
@@ -2651,7 +2651,7 @@ def dict_key_matches(self, text: str) -> List[str]:
26512651
)
26522652
can_close_quote = can_close_quote and self.auto_close_dict_keys
26532653

2654-
# fast path if closing qoute should be appended but not suffix is allowed
2654+
# fast path if closing quote should be appended but not suffix is allowed
26552655
if not can_close_quote and not can_close_bracket and closing_quote:
26562656
return [leading + k for k in matches]
26572657

IPython/core/completerlib.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ def is_possible_submodule(module, attr):
167167
try:
168168
obj = getattr(module, attr)
169169
except AttributeError:
170-
# Is possilby an unimported submodule
170+
# Is possibly an unimported submodule
171171
return True
172172
except TypeError:
173173
# https://github.com/ipython/ipython/issues/9678

IPython/core/debugger.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
--------------------
2020
2121
The IPython debugger will by read the global ``~/.pdbrc`` file.
22-
That is to say you can list all comands supported by ipdb in your `~/.pdbrc`
22+
That is to say you can list all commands supported by ipdb in your `~/.pdbrc`
2323
configuration file, to globally configure pdb.
2424
2525
Example::
@@ -177,7 +177,7 @@ def BdbQuit_excepthook(et, ev, tb, excepthook=None):
177177
parameter.
178178
"""
179179
raise ValueError(
180-
"`BdbQuit_excepthook` is deprecated since version 5.1. It is still arround only because it is still imported by ipdb.",
180+
"`BdbQuit_excepthook` is deprecated since version 5.1. It is still around only because it is still imported by ipdb.",
181181
)
182182

183183

IPython/core/guarded_eval.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ def _get_external(module_name: str, access_path: Sequence[str]):
132132
133133
Raises:
134134
* `KeyError` if module is removed not found, and
135-
* `AttributeError` if acess path does not match an exported object
135+
* `AttributeError` if access path does not match an exported object
136136
"""
137137
member_type = sys.modules[module_name]
138138
for attr in access_path:
@@ -235,7 +235,7 @@ def can_get_attr(self, value, attr):
235235
accept = has_original_attr and has_original_attribute
236236

237237
if accept:
238-
# We still need to check for overriden properties.
238+
# We still need to check for overridden properties.
239239

240240
value_class = type(value)
241241
if not hasattr(value_class, attr):
@@ -332,7 +332,7 @@ class EvaluationContext(NamedTuple):
332332
evaluation: Literal[
333333
"forbidden", "minimal", "limited", "unsafe", "dangerous"
334334
] = "forbidden"
335-
#: Whether the evalution of code takes place inside of a subscript.
335+
#: Whether the evaluation of code takes place inside of a subscript.
336336
#: Useful for evaluating ``:-1, 'col'`` in ``df[:-1, 'col']``.
337337
in_subscript: bool = False
338338

@@ -373,7 +373,7 @@ def guarded_eval(code: str, context: EvaluationContext):
373373
# getitem at all, for example it fails on simple `[0][1]`
374374

375375
if context.in_subscript:
376-
# syntatic sugar for ellipsis (:) is only available in susbcripts
376+
# syntactic sugar for ellipsis (:) is only available in subscripts
377377
# so we need to trick the ast parser into thinking that we have
378378
# a subscript, but we need to be able to later recognise that we did
379379
# it so we can ignore the actual __getitem__ operation

IPython/core/inputsplitter.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ def num_ini_spaces(s):
9797
"""
9898
warnings.warn(
9999
"`num_ini_spaces` is Pending Deprecation since IPython 8.17."
100-
"It is considered fro removal in in future version. "
100+
"It is considered for removal in in future version. "
101101
"Please open an issue if you believe it should be kept.",
102102
stacklevel=2,
103103
category=PendingDeprecationWarning,

IPython/core/interactiveshell.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1627,7 +1627,7 @@ def _find_parts(oname: str) -> Tuple[bool, ListType[str]]:
16271627
Returns
16281628
-------
16291629
parts_ok: bool
1630-
wether we were properly able to parse parts.
1630+
whether we were properly able to parse parts.
16311631
parts: list of str
16321632
extracted parts
16331633

IPython/core/magics/ast_mod.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
66
77
IPython has pre-code and post-code hooks, but are ran from within the IPython
8-
machinery so may be inappropriate, for example for performance mesurement.
8+
machinery so may be inappropriate, for example for performance measurement.
99
1010
This module give you tools to simplify this, and expose 2 classes:
1111

IPython/core/oinspect.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ class Inspector(Colorable):
460460

461461
mime_hooks = traitlets.Dict(
462462
config=True,
463-
help="dictionary of mime to callable to add informations into help mimebundle dict",
463+
help="dictionary of mime to callable to add information into help mimebundle dict",
464464
).tag(config=True)
465465

466466
def __init__(

IPython/core/pylabtools.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ def _list_matplotlib_backends_and_gui_loops() -> list[str]:
528528

529529

530530
# Matplotlib and IPython do not always use the same gui framework name.
531-
# Always use the approprate one of these conversion functions when passing a
531+
# Always use the appropriate one of these conversion functions when passing a
532532
# gui framework name to/from Matplotlib.
533533
def _convert_gui_to_matplotlib(gui: str | None) -> str | None:
534534
if gui and gui.lower() == "osx":

IPython/core/tests/test_completer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ def test_line_split():
204204
# was at the end of part1. So an empty part2 represents someone hitting
205205
# tab at the end of the line, the most common case.
206206
t = [
207-
("run some/scrip", "", "some/scrip"),
207+
("run some/script", "", "some/script"),
208208
("run scripts/er", "ror.py foo", "scripts/er"),
209209
("echo $HOM", "", "HOM"),
210210
("print sys.pa", "", "sys.pa"),

0 commit comments

Comments
 (0)