ipython 9.9.0__tar.gz → 9.10.1__tar.gz

{ipython-9.9.0 → ipython-9.10.1}/IPython/core/application.py

@@ -33,10 +33,11 @@ from traitlets import (
 )
 
 if os.name == "nt":
+    # %PROGRAMDATA% is not safe by default, require opt-in to trust it
     programdata = os.environ.get("PROGRAMDATA", None)
-    if programdata is not None:
+    if os.environ.get("IPYTHON_USE_PROGRAMDATA") == "1" and programdata is not None:
         SYSTEM_CONFIG_DIRS = [str(Path(programdata) / "ipython")]
-    else:  # PROGRAMDATA is not defined by default on XP.
+    else:
         SYSTEM_CONFIG_DIRS = []
 else:
     SYSTEM_CONFIG_DIRS = [

{ipython-9.9.0 → ipython-9.10.1}/IPython/core/history.py

@@ -8,6 +8,7 @@ from __future__ import annotations
 
 import atexit
 import datetime
+import os
 import re
 
 
@@ -689,6 +690,7 @@ class HistoryManager(HistoryAccessor):
             )
             self.hist_file = ":memory:"
 
+        self.using_thread = False
         if self.enabled and self.hist_file != ":memory:":
             self.save_thread = HistorySavingThread(self)
             try:
@@ -699,6 +701,8 @@ class HistoryManager(HistoryAccessor):
                     exc_info=True,
                 )
                 self.hist_file = ":memory:"
+            else:
+                self.using_thread = True
         self._instances.add(self)
         assert len(HistoryManager._instances) <= HistoryManager._max_inst, (
             len(HistoryManager._instances),
@@ -709,6 +713,20 @@ class HistoryManager(HistoryAccessor):
         if self.save_thread is not None:
             self.save_thread.stop()
 
+    @classmethod
+    def _stop_thread(cls) -> None:
+        # Used before forking so the thread isn't running at fork
+        for inst in cls._instances:
+            if inst.save_thread is not None:
+                inst.save_thread.stop()
+                inst.save_thread = None
+
+    def _restart_thread_if_stopped(self) -> None:
+        # Start the thread again after it was stopped for forking
+        if self.save_thread is None and self.using_thread:
+            self.save_thread = HistorySavingThread(self)
+            self.save_thread.start()
+
     def _get_hist_file_name(self, profile: Optional[str] = None) -> Path:
         """Get default history file name based on the Shell's profile.
 
@@ -970,8 +988,10 @@ class HistoryManager(HistoryAccessor):
             self.db_input_cache.append((line_num, source, source_raw))
             # Trigger to flush cache and write to DB.
             if len(self.db_input_cache) >= self.db_cache_size:
-                if self.save_flag:
-                    self.save_flag.set()
+                if self.using_thread:
+                    self._restart_thread_if_stopped()
+                    if self.save_flag is not None:
+                        self.save_flag.set()
 
         # update the auto _i variables
         self._iii = self._ii
@@ -1003,8 +1023,10 @@ class HistoryManager(HistoryAccessor):
 
         with self.db_output_cache_lock:
             self.db_output_cache.append((line_num, output))
-        if self.db_cache_size <= 1 and self.save_flag is not None:
-            self.save_flag.set()
+        if self.db_cache_size <= 1 and self.using_thread:
+            self._restart_thread_if_stopped()
+            if self.save_flag is not None:
+                self.save_flag.set()
 
     def _writeout_input_cache(self, conn: sqlite3.Connection) -> None:
         with conn:
@@ -1059,6 +1081,10 @@ class HistoryManager(HistoryAccessor):
                 self.db_output_cache = []
 
 
+if hasattr(os, "register_at_fork"):
+    os.register_at_fork(before=HistoryManager._stop_thread)
+
+
 from collections.abc import Callable, Iterator
 from weakref import ReferenceType
 

{ipython-9.9.0 → ipython-9.10.1}/IPython/core/inputtransformer2.py

@@ -67,9 +67,47 @@ class PromptStripper:
     If any prompt is found on the first two lines,
     prompts will be stripped from the rest of the block.
     """
-    def __init__(self, prompt_re, initial_re=None):
+    def __init__(self, prompt_re, initial_re=None, *, doctest=False):
         self.prompt_re = prompt_re
         self.initial_re = initial_re or prompt_re
+        self.doctest = doctest
+        if doctest:
+            # Doctest/xdoctest prompts may be indented (e.g. "    >>>").
+            # We only treat "..." as a continuation prompt when the same pasted
+            # block contains at least one ">>>" line, to avoid ambiguity with the
+            # Python Ellipsis literal.
+            self._doctest_initial_re = re.compile(r'^\s*>>>')
+            self._doctest_ps1_re = re.compile(r'^\s*>>>\s?')
+            self._doctest_ps2_re = re.compile(r'^\s*\.\.\.\s?')
+
+            # Very small state machine to detect triple-quoted strings in the
+            # *same* input block (e.g. user typed """ then pasted doctest).
+            # We preserve literal >>> / ... inside triple-quoted strings.
+            self._triple_quote_re = re.compile(r"(?<!\\)(\"\"\"|''')")
+
+
+    def _triple_quote_mask(self, lines: List[str]) -> List[bool]:
+        """
+        Return a boolean mask: True if the corresponding line is considered
+        inside a triple-quoted string literal.
+
+        This is intentionally heuristic (fast + good enough for paste handling).
+        """
+        mask: List[bool] = []
+        in_triple: str | None = None  # either ''' or """
+        for line in lines:
+            mask.append(in_triple is not None)
+            # Toggle state for each occurrence of """ or ''' in the line.
+            for m in self._triple_quote_re.finditer(line):
+                q = m.group(1)
+                if in_triple is None:
+                    in_triple = q
+                    mask[-1] = True  # current line is inside triple quotes
+                elif in_triple == q:
+                    in_triple = None
+                # else: ignore mismatched triple quote while inside
+        return mask
+
 
     def _strip(self, lines):
         return [self.prompt_re.sub('', l, count=1) for l in lines]
@@ -77,6 +115,57 @@ class PromptStripper:
     def __call__(self, lines):
         if not lines:
             return lines
+
+        if self.doctest:
+            triple_mask = self._triple_quote_mask(lines)
+
+            # Detect doctest prompts only outside triple-quoted strings.
+            has_doctest_outside = any(
+                (not in_triple) and self._doctest_initial_re.match(l)
+                for l, in_triple in zip(lines, triple_mask)
+            )
+            if not has_doctest_outside:
+                return lines
+
+            out_lines: List[str] = []
+            stripped_mask: List[bool] = []
+
+            for l, in_triple in zip(lines, triple_mask):
+                if in_triple:
+                    out_lines.append(l)
+                    stripped_mask.append(False)
+                    continue
+
+                if self._doctest_ps1_re.match(l):
+                    new_l = self._doctest_ps1_re.sub('', l, count=1)
+                elif self._doctest_ps2_re.match(l):
+                    new_l = self._doctest_ps2_re.sub('', l, count=1)
+                else:
+                    new_l = l
+                out_lines.append(new_l)
+                stripped_mask.append(new_l != l)
+
+            # Dedent only the non-triple-quoted segments where stripping occurred.
+            dedented: List[str] = []
+            i = 0
+            while i < len(out_lines):
+                j = i
+                in_triple = triple_mask[i]
+                while j < len(out_lines) and triple_mask[j] == in_triple:
+                    j += 1
+
+                segment = out_lines[i:j]
+                seg_stripped = any(stripped_mask[i:j])
+
+                if (not in_triple) and seg_stripped:
+                    dedented.extend(dedent(''.join(segment)).splitlines(keepends=True))
+                else:
+                    dedented.extend(segment)
+
+                i = j
+
+            return dedented
+
         if self.initial_re.match(lines[0]) or \
                 (len(lines) > 1 and self.prompt_re.match(lines[1])):
             return self._strip(lines)
@@ -84,7 +173,8 @@ class PromptStripper:
 
 classic_prompt = PromptStripper(
     prompt_re=re.compile(r'^(>>>|\.\.\.)( |$)'),
-    initial_re=re.compile(r'^>>>( |$)')
+    initial_re=re.compile(r'^>>>( |$)'),
+    doctest=True,
 )
 
 ipython_prompt = PromptStripper(

{ipython-9.9.0 → ipython-9.10.1}/IPython/core/release.py

@@ -16,8 +16,8 @@
 # release.  'dev' as a _version_extra string means this is a development
 # version
 _version_major = 9
-_version_minor = 9
-_version_patch = 0
+_version_minor = 10
+_version_patch = 1
 _version_extra = ".dev"
 # _version_extra = "b2"
 _version_extra = ""  # Uncomment this for full releases

{ipython-9.9.0 → ipython-9.10.1}/IPython/extensions/autoreload.py

@@ -327,6 +327,10 @@ class ModuleReloader:
                         del self.failed[py_filename]
                 except:
                     if not self.hide_errors:
+                        logger = logging.getLogger("autoreload")
+                        logger.exception(
+                            f"Failed to reload module '{modname}' from file '{py_filename}'"
+                        )
                         print(
                             "[autoreload of {} failed: {}]".format(
                                 modname, traceback.format_exc(10)

{ipython-9.9.0 → ipython-9.10.1}/IPython/extensions/deduperreload/deduperreload.py

@@ -3,6 +3,7 @@ import ast
 import builtins
 import contextlib
 import itertools
+import logging
 import os
 import pickle
 import platform
@@ -209,11 +210,19 @@ class DeduperReloader(DeduperReloaderPatchingMixin):
             ):
                 self.source_by_modname[new_modname] = ""
                 continue
-            with open(fname, "r") as f:
-                try:
+            # Skip binary files (e.g., .so, .pyd, .pyo)
+            if not fname.endswith(".py"):
+                self.source_by_modname[new_modname] = ""
+                continue
+            try:
+                with open(fname, "r", encoding="utf8") as f:
                     self.source_by_modname[new_modname] = f.read()
-                except Exception:
-                    self.source_by_modname[new_modname] = ""
+            except Exception as e:
+                logger = logging.getLogger("autoreload")
+                logger.exception(
+                    f"Failed to read module file '{fname}' for module '{new_modname}': {type(e).__name__}"
+                )
+                self.source_by_modname[new_modname] = ""
 
     constexpr_detector = ConstexprDetector()
 
@@ -542,8 +551,15 @@ class DeduperReloader(DeduperReloaderPatchingMixin):
             return False
         if (fname := get_module_file_name(module)) is None:
             return False
-        with open(fname, "r") as f:
-            new_source_code = f.read()
+        try:
+            with open(fname, "r", encoding="utf8") as f:
+                new_source_code = f.read()
+        except Exception as e:
+            logger = logging.getLogger("autoreload")
+            logger.exception(
+                f"Failed to read module file '{fname}' for module '{modname}': {type(e).__name__}"
+            )
+            return False
         patched_flag = False
         if old_source_code := self.source_by_modname.get(modname):
             # get old/new module ast

{ipython-9.9.0 → ipython-9.10.1}/IPython/utils/_sysinfo.py

@@ -1,2 +1,2 @@
 # GENERATED BY setup.py
-commit = "0c28fe5"
+commit = "b97293b"

{ipython-9.9.0/ipython.egg-info → ipython-9.10.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ipython
-Version: 9.9.0
+Version: 9.10.1
 Summary: IPython: Productive Interactive Computing
 Author: The IPython Development Team
 Author-email: ipython-dev@python.org

{ipython-9.9.0 → ipython-9.10.1}/docs/source/whatsnew/version9.rst

@@ -3,12 +3,44 @@
 ============
 
 
+.. _version 9.10:
+
+IPython 9.10
+============
+
+This release includes improvements to history management during forking and formatting fixes.
+
+- :ghpull:`15110` Fix Removing leading indentation when stripping prompt
+- :ghpull:`15115` Stop HistorySavingThread before fork
+- :ghpull:`15118` Add debug info for autoreload
+
+
+History Thread Management Improvements
+---------------------------------------
+
+The `HistorySavingThread` is now properly stopped before process forking,
+preventing threading issues in child processes. This ensures that history
+operations work correctly when IPython is used in applications that perform
+process forking.
+
+
+Thanks
+------
+
+Thanks as well to the `D. E. Shaw group <https://deshaw.com/>`_ for sponsoring
+work on IPython.
+
+As usual, you can find the full list of PRs on GitHub under `the 9.10
+<https://github.com/ipython/ipython/milestone/159?closed=1>`__ milestone.
+
+
 .. _version 9.9:
 
 IPython 9.9
 ===========
 
-This release includes several bug fixes and improvements across completions, type annotations, and developer experience.
+This release includes several bug fixes and improvements across completions,
+type annotations, and developer experience.
 
 - :ghpull:`15092` Fix formatting for completion suggestions section
 - :ghpull:`15057` Reduce types in splitinput.py
@@ -27,19 +59,25 @@ This release includes several bug fixes and improvements across completions, typ
 Improvements to PEP-649 Support
 -------------------------------
 
-IPython now properly pretty-prints functions with PEP-649 style annotations. This improves the display of functions in interactive sessions when using Python 3.14+ annotation semantics.
+IPython now properly pretty-prints functions with PEP-649 style annotations.
+This improves the display of functions in interactive sessions when using Python
+3.14+ annotation semantics.
 
 
 Shell Shortcuts Enhancement
 -----------------------------
 
-The ``unix_word_rubout`` command from prompt_toolkit is now available as an assignable command for terminal shortcuts, giving users more flexibility in customizing their keybindings.
+The ``unix_word_rubout`` command from prompt_toolkit is now available as an
+assignable command for terminal shortcuts, giving users more flexibility in
+customizing their keybindings.
 
 
 Type Annotation Improvements
 ----------------------------
 
-Various type annotation improvements have been made throughout the codebase for better static analysis support, including fixes for tracebacks and improved type inference in the completion engine.
+Various type annotation improvements have been made throughout the codebase for
+better static analysis support, including fixes for tracebacks and improved type
+inference in the completion engine.
 
 
 Thanks
@@ -57,7 +95,8 @@ As usual, you can find the full list of PRs on GitHub under `the 9.9
 IPython 9.8
 ===========
 
-This release brings improvements to concurrent execution, history commands, tab completion, and debugger performance.
+This release brings improvements to concurrent execution, history commands, tab
+completion, and debugger performance.
 
 
 - :ghpull:`15037` Fix some ruff issues with import

{ipython-9.9.0 → ipython-9.10.1/ipython.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ipython
-Version: 9.9.0
+Version: 9.10.1
 Summary: IPython: Productive Interactive Computing
 Author: The IPython Development Team
 Author-email: ipython-dev@python.org

{ipython-9.9.0 → ipython-9.10.1}/tests/test_inputtransformer2_line.py

@@ -45,15 +45,70 @@ for a in range(5):
 ...     print(a ** 2)
 """,
     """\
+for a in range(5):
+...     print(a)
+...     print(a ** 2)
+""",
+)
+
+CLASSIC_PROMPT_L3 = (
+    """\
+>>> \"\"\"
+... This code is inside a triple-quoted string.
+... >>> for a in range(5):
+... ...     print(a)
+... \"\"\"
+>>> for a in range(5):
+...     print(a)
+""",
+    """\
+>>> \"\"\"
+... This code is inside a triple-quoted string.
+... >>> for a in range(5):
+... ...     print(a)
+... \"\"\"
 for a in range(5):
     print(a)
-    print(a ** 2)
 """,
 )
 
+CLASSIC_PROMPT_DEDENT_SINGLE_LINE = (
+    ">>>     print(1)\n",
+    "print(1)\n",
+)
+
+CLASSIC_PROMPT_DEDENT_LEADING_WS = (
+    "    >>>     print(1)\n",
+    "print(1)\n",
+)
+
+CLASSIC_PROMPT_MULTILINE_DOCTEST = (
+    """\
+>>> for i in range(2):
+...     print(i)
+""",
+    """\
+for i in range(2):
+    print(i)
+""",
+)
+
+CLASSIC_PROMPT_STANDALONE_CONTINUATION = (
+    "...     print(1)\n",
+    "...     print(1)\n",
+)
+
 
 def test_classic_prompt():
-    for sample, expected in [CLASSIC_PROMPT, CLASSIC_PROMPT_L2]:
+    for sample, expected in [
+        CLASSIC_PROMPT,
+        CLASSIC_PROMPT_L2,
+        CLASSIC_PROMPT_L3,
+        CLASSIC_PROMPT_DEDENT_SINGLE_LINE,
+        CLASSIC_PROMPT_DEDENT_LEADING_WS,
+        CLASSIC_PROMPT_MULTILINE_DOCTEST,
+        CLASSIC_PROMPT_STANDALONE_CONTINUATION,
+    ]:
         assert ipt2.classic_prompt(
             sample.splitlines(keepends=True)
         ) == expected.splitlines(keepends=True)