From 457271e202ef3564c1b5f32f9092068635d17681 Mon Sep 17 00:00:00 2001 From: robot-piglet Date: Fri, 23 Jan 2026 15:36:45 +0300 Subject: Intermediate changes commit_hash:4e961772d0d109f17c22072dec466765b78a707a --- .../python/ipython/py3/IPython/core/debugger.py | 42 ++++++---------------- contrib/python/ipython/py3/IPython/core/release.py | 2 +- .../python/ipython/py3/IPython/utils/_sysinfo.py | 2 +- 3 files changed, 12 insertions(+), 34 deletions(-) (limited to 'contrib/python/ipython/py3/IPython') diff --git a/contrib/python/ipython/py3/IPython/core/debugger.py b/contrib/python/ipython/py3/IPython/core/debugger.py index e06bd56318e..26b88fd9e2e 100644 --- a/contrib/python/ipython/py3/IPython/core/debugger.py +++ b/contrib/python/ipython/py3/IPython/core/debugger.py @@ -248,13 +248,7 @@ class Pdb(OldPdb): docs for more info. """ - # Parent constructor: - try: - self.context = int(context) - if self.context <= 0: - raise ValueError("Context must be a positive integer") - except (TypeError, ValueError) as e: - raise ValueError("Context must be a positive integer") from e + self.context = int(context) # `kwargs` ensures full compatibility with stdlib's `pdb.Pdb`. OldPdb.__init__(self, completekey, stdin, stdout, **kwargs) @@ -490,14 +484,9 @@ class Pdb(OldPdb): ColorsNormal = Colors.Normal if context is None: context = self.context - try: - context = int(context) - if context <= 0: - raise ValueError("Context must be a positive integer") - except (TypeError, ValueError) as e: - raise ValueError("Context must be a positive integer") from e try: skipped = 0 + to_print = "" for hidden, frame_lineno in zip(self.hidden_frames(self.stack), self.stack): if hidden and self.skip_hidden: skipped += 1 @@ -507,31 +496,21 @@ class Pdb(OldPdb): f"{Colors.excName} [... skipping {skipped} hidden frame(s)]{ColorsNormal}\n" ) skipped = 0 - self.print_stack_entry(frame_lineno, context=context) + to_print += self.format_stack_entry(frame_lineno) if skipped: - print( + to_print += ( f"{Colors.excName} [... skipping {skipped} hidden frame(s)]{ColorsNormal}\n" ) + print(to_print, file=self.stdout) except KeyboardInterrupt: pass - def print_stack_entry(self, frame_lineno, prompt_prefix='\n-> ', - context=None): - if context is None: - context = self.context - try: - context = int(context) - if context <= 0: - raise ValueError("Context must be a positive integer") - except (TypeError, ValueError) as e: - raise ValueError("Context must be a positive integer") from e - print(self.format_stack_entry(frame_lineno, '', context), file=self.stdout) + def print_stack_entry(self, frame_lineno, prompt_prefix='\n-> '): + print(self.format_stack_entry(frame_lineno, ''), file=self.stdout) - # vds: >> frame, lineno = frame_lineno filename = frame.f_code.co_filename self.shell.hooks.synchronize_with_editor(filename, lineno, 0) - # vds: << def _get_frame_locals(self, frame): """ " @@ -555,15 +534,14 @@ class Pdb(OldPdb): else: return frame.f_locals - def format_stack_entry(self, frame_lineno, lprefix=': ', context=None): - if context is None: - context = self.context + def format_stack_entry(self, frame_lineno, lprefix=': '): + context = self.context try: context = int(context) if context <= 0: print("Context must be a positive integer", file=self.stdout) except (TypeError, ValueError): - print("Context must be a positive integer", file=self.stdout) + print("Context must be a positive integer", file=self.stdout) import reprlib diff --git a/contrib/python/ipython/py3/IPython/core/release.py b/contrib/python/ipython/py3/IPython/core/release.py index fc51e4f7a26..11f7cb31694 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 = 37 +_version_minor = 38 _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 fe913822d8b..cd18a50469a 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 = "86a50d33a" +commit = "f014fa10d" -- cgit v1.3