upstream/ipython Commit - r28892:b7cc43d2

Merge branch 'main' into tc

M Bussonnier -

r28892:b7cc43d2

parent child

IPython/core/completer.py

0 +2 -2

             their priority. Matchers can request to suppress results from subsequent
             matchers by setting ``suppress`` to ``True`` in the ``MatcherResult``.
-            When multiple matchers simultaneously request surpression, the results from of
+            When multiple matchers simultaneously request suppression, the results from of
             the matcher with higher priority will be returned.
             Sometimes it is desirable to suppress most but not all other matchers;
                     )
                     can_close_quote = can_close_quote and self.auto_close_dict_keys
-                    # fast path if closing qoute should be appended but not suffix is allowed
+                    # fast path if closing quote should be appended but not suffix is allowed
                     if not can_close_quote and not can_close_bracket and closing_quote:
                         return [leading + k for k in matches]

IPython/core/completerlib.py

0 +1 -1

                 try:
                     obj = getattr(module, attr)
                 except AttributeError:
-                    # Is possilby an unimported submodule
+                    # Is possibly an unimported submodule
                     return True
                 except TypeError:
                     # https://github.com/ipython/ipython/issues/9678

IPython/core/debugger.py

0 +2 -2

             --------------------
             The IPython debugger will by read the global ``~/.pdbrc`` file.
-            That is to say you can list all comands supported by ipdb in your `~/.pdbrc`
+            That is to say you can list all commands supported by ipdb in your `~/.pdbrc`
             configuration file, to globally configure pdb.
             Example::
                 parameter.
                 """
                 raise ValueError(
-                    "`BdbQuit_excepthook` is deprecated since version 5.1. It is still arround only because it is still imported by ipdb.",
+                    "`BdbQuit_excepthook` is deprecated since version 5.1. It is still around only because it is still imported by ipdb.",
                 )

IPython/core/guarded_eval.py

0 +4 -4

                 Raises:
                 * `KeyError` if module is removed not found, and
-                * `AttributeError` if acess path does not match an exported object
+                * `AttributeError` if access path does not match an exported object
                 """
                 member_type = sys.modules[module_name]
                 for attr in access_path:
                         accept = has_original_attr and has_original_attribute
                     if accept:
-                        # We still need to check for overriden properties.
+                        # We still need to check for overridden properties.
                         value_class = type(value)
                         if not hasattr(value_class, attr):
                 evaluation: Literal[
                     "forbidden", "minimal", "limited", "unsafe", "dangerous"
                 ] = "forbidden"
-                #: Whether the evalution of code takes place inside of a subscript.
+                #: Whether the evaluation of code takes place inside of a subscript.
                 #: Useful for evaluating ``:-1, 'col'`` in ``df[:-1, 'col']``.
                 in_subscript: bool = False
                 # getitem at all, for example it fails on simple `[0][1]`
                 if context.in_subscript:
-                    # syntatic sugar for ellipsis (:) is only available in susbcripts
+                    # syntactic sugar for ellipsis (:) is only available in subscripts
                     # so we need to trick the ast parser into thinking that we have
                     # a subscript, but we need to be able to later recognise that we did
                     # it so we can ignore the actual __getitem__ operation

IPython/core/inputsplitter.py

0 +1 -1

                 """
                 warnings.warn(
                     "`num_ini_spaces` is Pending Deprecation since IPython 8.17."
-                    "It is considered fro removal in in future version. "
+                    "It is considered for removal in in future version. "
                     "Please open an issue if you believe it should be kept.",
                     stacklevel=2,
                     category=PendingDeprecationWarning,

IPython/core/interactiveshell.py

0 +1 -1

                     Returns
                     -------
                     parts_ok: bool
-                        wether we were properly able to parse parts.
+                        whether we were properly able to parse parts.
                     parts: list of str
                         extracted parts

IPython/core/magics/ast_mod.py

0 +1 -1

             IPython has pre-code and post-code hooks, but are ran from within the IPython
-            machinery so may be inappropriate, for example for performance mesurement.
+            machinery so may be inappropriate, for example for performance measurement.
             This module give you tools to simplify this, and expose 2 classes:

IPython/core/oinspect.py

0 +1 -1

                 mime_hooks = traitlets.Dict(
                     config=True,
-                    help="dictionary of mime to callable to add informations into help mimebundle dict",
+                    help="dictionary of mime to callable to add information into help mimebundle dict",
                 ).tag(config=True)
                 def __init__(

IPython/core/pylabtools.py

0 +1 -1

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

IPython/core/tests/test_completer.py

0 +1 -1

                 # was at the end of part1.  So an empty part2 represents someone hitting
                 # tab at the end of the line, the most common case.
                 t = [
-                    ("run some/scrip", "", "some/scrip"),
+                    ("run some/script", "", "some/script"),
                     ("run scripts/er", "ror.py foo", "scripts/er"),
                     ("echo $HOM", "", "HOM"),
                     ("print sys.pa", "", "sys.pa"),

IPython/core/tests/test_display.py

0 +1 -1

                     format="badformat",
                     embed=True,
                 )
-                # check boths paths to allow packages to test at build and install time
+                # check both paths to allow packages to test at build and install time
                 imgfile = os.path.join(tpath, 'core/tests/2x2.png')
                 img = display.Image(filename=imgfile)
                 assert "png" == img.format

IPython/core/tests/test_interactiveshell.py

0 +1 -1

                 @mock.patch('os.system', side_effect=KeyboardInterrupt)
                 def test_control_c(self, *mocks):
                     try:
-                        self.system("sleep 1 # wont happen")
+                        self.system("sleep 1 # won't happen")
                     except KeyboardInterrupt:  # pragma: no cove
                         self.fail(
                             "system call should intercept "

IPython/core/tests/test_run.py

0 +1 -1

             def test_multiprocessing_run():
                 """Set we can run mutiprocesgin without messing up up main namespace
-                Note that import `nose.tools as nt` mdify the value s
+                Note that import `nose.tools as nt` modify the values
                 sys.module['__mp_main__'] so we need to temporarily set it to None to test
                 the issue.
                 """

IPython/core/tests/test_ultratb.py

0 +3 -3

             indentationerror_file = """if True:
-            zoon()
+            zoom()
             """
             class IndentationErrorTest(unittest.TestCase):
                 def test_indentationerror_shows_line(self):
                     # See issue gh-2398
                     with tt.AssertPrints("IndentationError"):
-                        with tt.AssertPrints("zoon()", suppress=False):
+                        with tt.AssertPrints("zoom()", suppress=False):
                             ip.run_cell(indentationerror_file)
                     with TemporaryDirectory() as td:
                             f.write(indentationerror_file)
                         with tt.AssertPrints("IndentationError"):
-                            with tt.AssertPrints("zoon()", suppress=False):
+                            with tt.AssertPrints("zoom()", suppress=False):
                                 ip.magic('run %s' % fname)
             @skip_without("pandas")

IPython/lib/pretty.py

0 +2 -2

             class CallExpression:
                 """ Object which emits a line-wrapped call expression in the form `__name(*args, **kwargs)` """
                 def __init__(__self, __name, *args, **kwargs):
-                    # dunders are to avoid clashes with kwargs, as python's name manging
+                    # dunders are to avoid clashes with kwargs, as python's name managing
                     # will kick in.
                     self = __self
                     self.name = __name
                     return inner
                 def _repr_pretty_(self, p, cycle):
-                    # dunders are to avoid clashes with kwargs, as python's name manging
+                    # dunders are to avoid clashes with kwargs, as python's name managing
                     # will kick in.
                     started = False

IPython/terminal/shortcuts/auto_suggest.py

0 +1 -1

                 def connect(self, pt_app: PromptSession):
                     self._connected_apps.append(pt_app)
                     # note: `on_text_changed` could be used for a bit different behaviour
-                    # on character deletion (i.e. reseting history position on backspace)
+                    # on character deletion (i.e. resetting history position on backspace)
                     pt_app.default_buffer.on_text_insert.add_handler(self.reset_history_position)
                     pt_app.default_buffer.on_cursor_position_changed.add_handler(self._dismiss)

IPython/terminal/shortcuts/filters.py

0 +1 -1

             pass_through = PassThrough()
             # these one is callable and re-used multiple times hence needs to be
-            # only defined once beforhand so that transforming back to human-readable
+            # only defined once beforehand so that transforming back to human-readable
             # names works well in the documentation.
             default_buffer_focused = has_focus(DEFAULT_BUFFER)

IPython/utils/text.py

0 +4 -4

                 """Return the number of initial spaces in a string"""
                 warnings.warn(
                     "`num_ini_spaces` is Pending Deprecation since IPython 8.17."
-                    "It is considered fro removal in in future version. "
+                    "It is considered for removal in in future version. "
                     "Please open an issue if you believe it should be kept.",
                     stacklevel=2,
                     category=PendingDeprecationWarning,
                 """
                 warnings.warn(
                     "`wrap_paragraphs` is Pending Deprecation since IPython 8.17."
-                    "It is considered fro removal in in future version. "
+                    "It is considered for removal in in future version. "
                     "Please open an issue if you believe it should be kept.",
                     stacklevel=2,
                     category=PendingDeprecationWarning,
                 """
                 warnings.warn(
                     "`strip_ansi` is Pending Deprecation since IPython 8.17."
-                    "It is considered fro removal in in future version. "
+                    "It is considered for removal in in future version. "
                     "Please open an issue if you believe it should be kept.",
                     stacklevel=2,
                     category=PendingDeprecationWarning,
                 """
                 warnings.warn(
                     "`compute_item_matrix` is Pending Deprecation since IPython 8.17."
-                    "It is considered fro removal in in future version. "
+                    "It is considered for removal in in future version. "
                     "Please open an issue if you believe it should be kept.",
                     stacklevel=2,
                     category=PendingDeprecationWarning,

docs/source/conf.py

0 +1 -1

                 )
             except ModuleNotFoundError:
-                # In case intersphinx_registry is not yet packages on current plaform
+                # In case intersphinx_registry is not yet packages on current platform
                 # as it is quite recent.
                 print("/!\\ intersphinx_registry not installed, relying on local mapping.")
                 intersphinx_mapping = config["intersphinx_mapping"]

docs/source/whatsnew/version0.9.rst

0 +1 -1

             * Gather/scatter are now implemented in the client to reduce the work load
               of the controller and improve performance.
-            * Complete rewrite of the IPython docuementation.  All of the documentation
+            * Complete rewrite of the IPython documentation.  All of the documentation
               from the IPython website has been moved into docs/source as restructured
               text documents.  PDF and HTML documentation are being generated using
               Sphinx.

docs/source/whatsnew/version7.rst

0 +7 -7

              - init_virtualenv now uses Pathlib :ghpull:`12548`
              - Fix Improper path comparison of virtualenv directories :ghpull:`13140`
-             - Fix virtual environment user warning for lower case pathes :ghpull:`13094`
+             - Fix virtual environment user warning for lower case paths :ghpull:`13094`
              - Adapt to all sorts of drive names for cygwin :ghpull:`13153`
             New Features:
             Here are thus some of the changes for IPython 7.20.
               - Support for PyQt5 >= 5.11 :ghpull:`12715`
-              - ``%reset`` remove imports more agressively :ghpull:`12718`
+              - ``%reset`` remove imports more aggressively :ghpull:`12718`
               - fix the ``%conda`` magic :ghpull:`12739`
               - compatibility with Jedi 0.18, and bump minimum Jedi version. :ghpull:`12793`
             Increase Tab Completion Menu Height
             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-            In terminal IPython it is possible to increase the hight of the tab-completion
+            In terminal IPython it is possible to increase the height of the tab-completion
             menu. To do so set the value of
             :configtrait:`TerminalInteractiveShell.space_for_menu`, this will reserve more
             space at the bottom of the screen for various kind of menus in IPython including
             policy as to which version of (C)Python and NumPy are supported.
             We thus dropped support for Python 3.5, and cleaned up a number of code path
-            that were Python-version dependant. If you are on 3.5 or earlier pip should
+            that were Python-version dependent. If you are on 3.5 or earlier pip should
             automatically give you the latest compatible version of IPython so you do not
             need to pin to a given version.
             contribution is welcomed.
             We welcome any feedback on the API. See :ref:`shell_mimerenderer` for more
-            informations.
+            information.
             This is originally based on work form in :ghpull:`10610` from @stephanh42
             started over two years ago, and still a lot need to be done.
             IPython 7.3.0 bring several bug fixes and small improvements that you will
-            described bellow.
+            described below.
             The biggest change to this release is the implementation of the ``%conda`` and
             ``%pip`` magics, that will attempt to install packages in the **current
             New Core Dev:
-             - We welcome Jonathan Slenders to the commiters. Jonathan has done a fantastic
+             - We welcome Jonathan Slenders to the committers. Jonathan has done a fantastic
                work on prompt_toolkit, and we'd like to recognise his impact by giving him
                commit rights. :ghissue:`11397`

docs/source/whatsnew/version8.rst

0 +5 -5

             New release of IPython after a month off (not enough changes). We can see a few
             important changes for this release.
-             - autocall was beeing  call getitem, :ghpull:`14486`
+             - autocall was being  call getitem, :ghpull:`14486`
              - Only copy files in startup dir if we just created it. :ghpull:`14497`
              - Fix some tests on Python 3.13 RC1 :ghpull:`14504`; this one I guess make this
                the first IPython release officially compatible with Python 3.13; you will
             This is a great new feature and performance improvement in Python 3.12.
             Unfortunately this means the new tokenizer does not support incomplete or invalid Python which will
-            break many features of IPython. Thus compatibility of IPython with Python 3.12 is not guarantied.
+            break many features of IPython. Thus compatibility of IPython with Python 3.12 is not guaranteed.
             It is unclear to which extent IPython is affected, and whether we can/should try to still support magics, shell
             escape (``! ....``), ...,  as well as how to do it if we can.
               whitelisted by ``%aimport`` statements.
             - ``%autoreload all`` (also ``%autoreload 2``) - turn on autoreload for all modules except those
               blacklisted by ``%aimport`` statements.
-            - ``%autoreload complete`` (also ``%autoreload 3``) - all the fatures of ``all`` but also adding new
+            - ``%autoreload complete`` (also ``%autoreload 3``) - all the features of ``all`` but also adding new
               objects from the imported modules (see
               IPython/extensions/tests/test_autoreload.py::test_autoload_newly_added_objects).
             Almost all version of IPython looks for configuration and profiles in current
             working directory. Since IPython was developed before pip and environments
             existed it was used a convenient way to load code/packages in a project
-            dependant way.
+            dependent way.
             In 2022, it is not necessary anymore, and can lead to confusing behavior where
             for example cloning a repository and starting IPython or loading a notebook from
             ------
-            .. [1] If this make you incomfortable feel free to not use IPython 8.23.
+            .. [1] If this make you uncomfortable feel free to not use IPython 8.23.

examples/IPython Kernel/Third Party Rich Output.ipynb

0 +1 -1

                "cell_type": "markdown",
                "metadata": {},
                "source": [
-                "A number of third party libraries defined their own custom display logic. This gives their objcts rich output by default when used in the Notebook."
+                "A number of third party libraries defined their own custom display logic. This gives their objects rich output by default when used in the Notebook."
                ]
               },
               {

tools/gh_api.py

0 +1 -1

                     return token
                 print(
-                    "Get a token fom https://github.com/settings/tokens with public repo and gist."
+                    "Get a token from https://github.com/settings/tokens with public repo and gist."
                 )
                 token = getpass.getpass("Token: ", stream=sys.stderr)

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages