diff options
| author | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-05-31 21:49:01 +0300 |
|---|---|---|
| committer | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-05-31 21:49:01 +0300 |
| commit | ceb13dcc40dd5e11c8e3189b3c15b3bd5897d4ac (patch) | |
| tree | eda501e07fcaba4f64bc3d29725472162f2e4227 /contrib/python/ipython | |
| parent | 5b69557e440e6ac18399a29076fef25602859f17 (diff) | |
| download | ydb-ceb13dcc40dd5e11c8e3189b3c15b3bd5897d4ac.tar.gz | |
intermediate changes
ref:85306a27df0004d13faf777131d0b092370e6b90
Diffstat (limited to 'contrib/python/ipython')
6 files changed, 10 insertions, 7 deletions
diff --git a/contrib/python/ipython/py2/patches/02-fix-ya.make.patch b/contrib/python/ipython/py2/patches/02-fix-ya.make.patch index 998b6f0cfb..1317ceea2d 100644 --- a/contrib/python/ipython/py2/patches/02-fix-ya.make.patch +++ b/contrib/python/ipython/py2/patches/02-fix-ya.make.patch @@ -9,7 +9,7 @@ +IF (OS_WINDOWS) + PEERDIR( + contrib/python/colorama -+ contrib/python/win-unicode-console ++ contrib/deprecated/python/win-unicode-console + ) +ELSE () + PEERDIR( diff --git a/contrib/python/ipython/py3/.dist-info/METADATA b/contrib/python/ipython/py3/.dist-info/METADATA index b2118bad26..756a7c91f9 100644 --- a/contrib/python/ipython/py3/.dist-info/METADATA +++ b/contrib/python/ipython/py3/.dist-info/METADATA @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: ipython -Version: 8.3.0 +Version: 8.4.0 Summary: IPython: Productive Interactive Computing Home-page: https://ipython.org Author: The IPython Development Team @@ -127,5 +127,3 @@ The enhanced interactive Python shells have the following main features: The latest development version is always available from IPython's `GitHub site <http://github.com/ipython>`_. - - diff --git a/contrib/python/ipython/py3/IPython/core/debugger.py b/contrib/python/ipython/py3/IPython/core/debugger.py index 8e3dd9678c..ba12e3eac3 100644 --- a/contrib/python/ipython/py3/IPython/core/debugger.py +++ b/contrib/python/ipython/py3/IPython/core/debugger.py @@ -101,7 +101,6 @@ All the changes since then are under the same license as IPython. # #***************************************************************************** -import bdb import inspect import linecache import sys diff --git a/contrib/python/ipython/py3/IPython/core/interactiveshell.py b/contrib/python/ipython/py3/IPython/core/interactiveshell.py index ea9f6310ba..371a3dad77 100644 --- a/contrib/python/ipython/py3/IPython/core/interactiveshell.py +++ b/contrib/python/ipython/py3/IPython/core/interactiveshell.py @@ -14,6 +14,7 @@ import abc import ast import atexit +import bdb import builtins as builtin_mod import dis import functools @@ -3403,6 +3404,11 @@ class InteractiveShell(SingletonConfigurable): result.error_in_exec = e self.showtraceback(exception_only=True) warn("To exit: use 'exit', 'quit', or Ctrl-D.", stacklevel=1) + except bdb.BdbQuit: + etype, value, tb = sys.exc_info() + if result is not None: + result.error_in_exec = value + # the BdbQuit stops here except self.custom_exceptions: etype, value, tb = sys.exc_info() if result is not None: diff --git a/contrib/python/ipython/py3/IPython/core/release.py b/contrib/python/ipython/py3/IPython/core/release.py index 4e8c82cdb7..cda5c32d44 100644 --- a/contrib/python/ipython/py3/IPython/core/release.py +++ b/contrib/python/ipython/py3/IPython/core/release.py @@ -16,7 +16,7 @@ # release. 'dev' as a _version_extra string means this is a development # version _version_major = 8 -_version_minor = 3 +_version_minor = 4 _version_patch = 0 _version_extra = ".dev" # _version_extra = "rc1" diff --git a/contrib/python/ipython/py3/IPython/utils/_sysinfo.py b/contrib/python/ipython/py3/IPython/utils/_sysinfo.py index 65cb32d0d5..4b2609959f 100644 --- a/contrib/python/ipython/py3/IPython/utils/_sysinfo.py +++ b/contrib/python/ipython/py3/IPython/utils/_sysinfo.py @@ -1,2 +1,2 @@ # GENERATED BY setup.py -commit = u"55e81b920" +commit = u"4396dd620" |