From e95f266d2a3e48e62015220588a4fd73d5d5a5cb Mon Sep 17 00:00:00 2001 From: AlexSm Date: Tue, 9 Jan 2024 18:56:40 +0100 Subject: Library import 6 (#888) --- contrib/python/ipython/py3/IPython/core/completer.py | 2 +- contrib/python/ipython/py3/IPython/core/interactiveshell.py | 5 ++++- contrib/python/ipython/py3/IPython/core/oinspect.py | 5 +---- contrib/python/ipython/py3/IPython/core/release.py | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'contrib/python/ipython/py3/IPython/core') diff --git a/contrib/python/ipython/py3/IPython/core/completer.py b/contrib/python/ipython/py3/IPython/core/completer.py index cc5f6c4270c..8e2bb7f8103 100644 --- a/contrib/python/ipython/py3/IPython/core/completer.py +++ b/contrib/python/ipython/py3/IPython/core/completer.py @@ -2237,7 +2237,7 @@ class IPCompleter(Completer): self, cursor_column: int, cursor_line: int, text: str ) -> Iterator[_JediCompletionLike]: """ - Return a list of :any:`jedi.api.Completion`s object from a ``text`` and + Return a list of :any:`jedi.api.Completion`\\s object from a ``text`` and cursor position. Parameters diff --git a/contrib/python/ipython/py3/IPython/core/interactiveshell.py b/contrib/python/ipython/py3/IPython/core/interactiveshell.py index 67727404f9d..1a73571f788 100644 --- a/contrib/python/ipython/py3/IPython/core/interactiveshell.py +++ b/contrib/python/ipython/py3/IPython/core/interactiveshell.py @@ -2639,7 +2639,10 @@ class InteractiveShell(SingletonConfigurable): """ cmd = self.var_expand(cmd, depth=1) # warn if there is an IPython magic alternative. - main_cmd = cmd.split()[0] + if cmd == "": + main_cmd = "" + else: + main_cmd = cmd.split()[0] has_magic_alternatives = ("pip", "conda", "cd") if main_cmd in has_magic_alternatives: diff --git a/contrib/python/ipython/py3/IPython/core/oinspect.py b/contrib/python/ipython/py3/IPython/core/oinspect.py index d77a732267b..a8be2819752 100644 --- a/contrib/python/ipython/py3/IPython/core/oinspect.py +++ b/contrib/python/ipython/py3/IPython/core/oinspect.py @@ -28,10 +28,7 @@ import warnings from typing import Any, Optional, Dict, Union, List, Tuple -if sys.version_info <= (3, 10): - from typing_extensions import TypeAlias -else: - from typing import TypeAlias +from typing import TypeAlias # IPython's own from IPython.core import page diff --git a/contrib/python/ipython/py3/IPython/core/release.py b/contrib/python/ipython/py3/IPython/core/release.py index d012ec426bb..70d5a675a35 100644 --- a/contrib/python/ipython/py3/IPython/core/release.py +++ b/contrib/python/ipython/py3/IPython/core/release.py @@ -16,8 +16,8 @@ # release. 'dev' as a _version_extra string means this is a development # version _version_major = 8 -_version_minor = 18 -_version_patch = 1 +_version_minor = 19 +_version_patch = 0 _version_extra = ".dev" # _version_extra = "rc1" _version_extra = "" # Uncomment this for full releases -- cgit v1.3