diff options
| author | AlexSm <alex@ydb.tech> | 2024-01-26 16:00:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-26 16:00:50 +0100 |
| commit | 7ebcfd058d924bcc8c23da70e034f7415687885c (patch) | |
| tree | e4f00d163c77528c1855f2d7af54a8be83fc1ccb /contrib/python/ipython/py3/IPython/core | |
| parent | 64ca2dcd06312b9eef624054ceb5f787e11be79a (diff) | |
| parent | 6d79e7793c2c462134f4b4a7d911abc7b9b0766f (diff) | |
| download | ydb-7ebcfd058d924bcc8c23da70e034f7415687885c.tar.gz | |
Merge pull request #1260 from ydb-platform/mergelibs10
mergelibs10
Diffstat (limited to 'contrib/python/ipython/py3/IPython/core')
4 files changed, 4 insertions, 4 deletions
diff --git a/contrib/python/ipython/py3/IPython/core/debugger.py b/contrib/python/ipython/py3/IPython/core/debugger.py index 389592d066..f370070140 100644 --- a/contrib/python/ipython/py3/IPython/core/debugger.py +++ b/contrib/python/ipython/py3/IPython/core/debugger.py @@ -454,7 +454,7 @@ class Pdb(OldPdb): with self._hold_exceptions(_chained_exceptions): OldPdb.interaction(self, frame, tb) else: - OldPdb.interaction(self, frame, traceback) + OldPdb.interaction(self, frame, tb_or_exc) except KeyboardInterrupt: self.stdout.write("\n" + self.shell.get_exception_only()) diff --git a/contrib/python/ipython/py3/IPython/core/interactiveshell.py b/contrib/python/ipython/py3/IPython/core/interactiveshell.py index 1a73571f78..fef5ddc949 100644 --- a/contrib/python/ipython/py3/IPython/core/interactiveshell.py +++ b/contrib/python/ipython/py3/IPython/core/interactiveshell.py @@ -3604,7 +3604,7 @@ class InteractiveShell(SingletonConfigurable): # Things related to GUI support and pylab #------------------------------------------------------------------------- - active_eventloop = None + active_eventloop: Optional[str] = None def enable_gui(self, gui=None): raise NotImplementedError('Implement enable_gui in a subclass') diff --git a/contrib/python/ipython/py3/IPython/core/magics/basic.py b/contrib/python/ipython/py3/IPython/core/magics/basic.py index 865e760eb1..3ac4049614 100644 --- a/contrib/python/ipython/py3/IPython/core/magics/basic.py +++ b/contrib/python/ipython/py3/IPython/core/magics/basic.py @@ -124,7 +124,7 @@ class BasicMagics(Magics): In [6]: %whereami Out[6]: '/home/testuser' - In [7]: %alias_magic h history "-p -l 30" --line + In [7]: %alias_magic h history -p "-l 30" --line Created `%h` as an alias for `%history -l 30`. """ diff --git a/contrib/python/ipython/py3/IPython/core/release.py b/contrib/python/ipython/py3/IPython/core/release.py index 70d5a675a3..ec50c45721 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 = 19 +_version_minor = 20 _version_patch = 0 _version_extra = ".dev" # _version_extra = "rc1" |