Update package versions and improve error handling in download module

cxzhong · cxzhong · commit b5b3ac2354b2 · 2025-10-13T15:21:21.000+08:00
- Update flit_core version to 3.12.0 and adjust checksums
- Update Python version requirements to &lt;3.15 in pyproject.toml
- Enhance error handling in transfer.py for HTTP errors
- Modify SpecialJordanAlgebra to handle infinite sets correctly
- Improve atexit callback error messages for version detection
- Clean up unnecessary code in external.py and forker.py
- Update error messages in DiGraph class for clarity
- Refactor SageArgSpecVisitor to use new Constant node representation
diff --git a/build/pkgs/flit_core/checksums.ini b/build/pkgs/flit_core/checksums.ini
@@ -1,4 +1,4 @@
 tarball=flit_core-VERSION-py3-none-any.whl
-sha1=cf044db53e986d0735ad708cce9eba0b71684168
-sha256=7aada352fb0c7f5538c4fafeddf314d3a6a92ee8e2b1de70482329e42de70301
+sha1=9c5a446c78248128451f107c5ec857f6c1d005fb
+sha256=e7a0304069ea895172e3c7bb703292e992c5d1555dd1233ab7b5621b5b69e62c
 upstream_url=https://files.pythonhosted.org/packages/py3/f/flit_core/flit_core-VERSION-py3-none-any.whl
diff --git a/build/pkgs/flit_core/package-version.txt b/build/pkgs/flit_core/package-version.txt
@@ -1 +1 @@
-3.9.0
+3.12.0
diff --git a/build/pkgs/python3/spkg-configure.m4 b/build/pkgs/python3/spkg-configure.m4
@@ -1,8 +1,8 @@
 SAGE_SPKG_CONFIGURE([python3], [
    m4_pushdef([MIN_VERSION],               [3.11.0])
    m4_pushdef([MIN_NONDEPRECATED_VERSION], [3.11.0])
-   m4_pushdef([LT_STABLE_VERSION],         [3.14.0])
-   m4_pushdef([LT_VERSION],                [3.14.0])
+   m4_pushdef([LT_STABLE_VERSION],         [3.15.0])
+   m4_pushdef([LT_VERSION],                [3.15.0])
    AC_ARG_WITH([python],
                [AS_HELP_STRING([--with-python=PYTHON3],
                                [Python 3 executable to use for the Sage venv; default: python3])])
diff --git a/build/sage_bootstrap/download/transfer.py b/build/sage_bootstrap/download/transfer.py
@@ -21,6 +21,8 @@
 
 from sage_bootstrap.stdio import flush
 from sage_bootstrap.compat import urllib
+import urllib.request
+import urllib.error
 
 
 class ProgressBar(object):
@@ -99,13 +101,6 @@ def __init__(self, url, destination=None, progress=True, ignore_errors=False):
         self.progress_stream = sys.stderr if isinstance(progress, bool) else progress
         self.ignore_errors = ignore_errors
 
-    def http_error_default(self, url, fp, errcode, errmsg, headers):
-        """
-        Callback for the URLopener to raise an exception on HTTP errors
-        """
-        fp.close()
-        raise DownloadError(errcode, errmsg, url)
-
     def start_progress_bar(self):
         if self.progress:
             self.progress_bar = ProgressBar(self.progress_stream)
@@ -120,19 +115,22 @@ def error_progress_bar(self):
             self.progress_bar.error_stop()
     
     def run(self):
-        opener = urllib.FancyURLopener()
-        opener.http_error_default = self.http_error_default
         self.start_progress_bar()
         try:
             if self.progress:
-                filename, info = opener.retrieve(
+                filename, info = urllib.request.urlretrieve(
                     self.url, self.destination, self.progress_bar)
             else:
-                filename, info = opener.retrieve(
+                filename, info = urllib.request.urlretrieve(
                     self.url, self.destination)
         except IOError as error:
             self.error_progress_bar()
             log.error(error)
             if not self.ignore_errors:
                 raise error
+        except urllib.error.HTTPError as error:
+            self.error_progress_bar()
+            log.error(error)
+            if not self.ignore_errors:
+                raise DownloadError(error.code, error.reason, self.url)
         self.success_progress_bar()
diff --git a/pkgs/sage-setup/pyproject.toml b/pkgs/sage-setup/pyproject.toml
@@ -23,7 +23,7 @@ classifiers = [
     "Topic :: Scientific/Engineering :: Mathematics",
 ]
 urls = {Homepage = "https://www.sagemath.org"}
-requires-python = ">=3.9, <3.14"
+requires-python = ">=3.9, <3.15"
 dependencies = []
 dynamic = ["version"]
 
diff --git a/pyproject.toml b/pyproject.toml
@@ -82,7 +82,7 @@ description = "Sage: Open Source Mathematics Software: Standard Python Library"
 dynamic = ["version"]
 license = { text = "GNU General Public License (GPL) v2 or later" }
 name = "sagemath"
-requires-python = ">=3.11, <3.14"
+requires-python = ">=3.11, <3.15"
 urls = { Homepage = "https://www.sagemath.org" }
 
 [project.optional-dependencies]
diff --git a/src/sage/algebras/jordan_algebra.py b/src/sage/algebras/jordan_algebra.py
@@ -325,7 +325,14 @@ def basis(self):
         B = self._A.basis()
         return Family(B.keys(), lambda x: self.element_class(self, B[x]), name="Term map")
 
-    algebra_generators = basis
+    def algebra_generators(self):
+        B = self._A.basis()
+        K = B.keys()
+        try:
+            len(K)
+        except NotImplementedError:
+            raise NotImplementedError("infinite set")
+        return Family(K, lambda x: self.element_class(self, B[x]), name="Term map")
 
     # TODO: Keep this until we can better handle R.<...> shorthand
     def gens(self) -> tuple:
@@ -347,7 +354,13 @@ def gens(self) -> tuple:
             ...
             NotImplementedError: infinite set
         """
-        return tuple(self.algebra_generators())
+        G = self.algebra_generators()
+        # If G is infinite, len(G) will raise NotImplementedError('infinite set')
+        try:
+            len(G)
+        except NotImplementedError:
+            raise
+        return tuple(G)
 
     @cached_method
     def zero(self):
diff --git a/src/sage/cpython/atexit.pyx b/src/sage/cpython/atexit.pyx
@@ -171,8 +171,11 @@ cdef extern from *:
         return state.callbacks;
     }
     
-    // Dummy function for Python 3.14+ (never called)
+    // Dummy function for Python 3.14+ (should never be called)
     static atexit_callback_struct** get_atexit_callbacks_array(PyObject *self) {
+        PyErr_SetString(PyExc_RuntimeError, 
+            "get_atexit_callbacks_array() called on Python 3.14+. "
+            "This is a bug in sage.cpython.atexit version detection.");
         return NULL;
     }
     #else
@@ -188,8 +191,11 @@ cdef extern from *:
         return (atexit_callback_struct**)state.callbacks;
     }
     
-    // Dummy function for Python < 3.14 (never called)
+    // Dummy function for Python < 3.14 (should never be called)
     static PyObject* get_atexit_callbacks_list(PyObject *self) {
+        PyErr_SetString(PyExc_RuntimeError, 
+            "get_atexit_callbacks_list() called on Python < 3.14. "
+            "This is a bug in sage.cpython.atexit version detection.");
         return NULL;
     }
     #endif
@@ -216,7 +222,8 @@ def _get_exithandlers():
     if sys.version_info >= (3, 14):
         callbacks_list = <object>get_atexit_callbacks_list(atexit)
         if callbacks_list is None:
-            return exithandlers
+            # An error occurred (shouldn't happen unless there's a version detection bug)
+            raise RuntimeError("Failed to get atexit callbacks list")
         # callbacks is a list of tuples: [(func, args, kwargs), ...]
         # Normalize kwargs to ensure it's always a dict (not None)
         # Note: In Python 3.14+, atexit stores callbacks in LIFO order
@@ -230,6 +237,9 @@ def _get_exithandlers():
     else:
         # Python < 3.14 uses C array
         callbacks = get_atexit_callbacks_array(atexit)
+        if callbacks is NULL:
+            # An error occurred (shouldn't happen unless there's a version detection bug)
+            raise RuntimeError("Failed to get atexit callbacks array")
         for idx in range(atexit._ncallbacks()):
             callback = callbacks[idx][0]
             if callback.kwargs:
diff --git a/src/sage/doctest/external.py b/src/sage/doctest/external.py
@@ -37,8 +37,7 @@
 # With OS X, Python 3.8 defaults to use 'spawn' instead of 'fork' in
 # multiprocessing, and Sage doctesting doesn't work with 'spawn'. See
 # trac #27754.
-if platform.system() == 'Darwin':
-    multiprocessing.set_start_method('fork', force=True)
+multiprocessing.set_start_method('fork', force=True)
 Array = multiprocessing.Array
 
 # Functions in this module whose name is of the form 'has_xxx' tests if the
diff --git a/src/sage/doctest/forker.py b/src/sage/doctest/forker.py
@@ -91,8 +91,7 @@
 # With OS X, Python 3.8 defaults to use 'spawn' instead of 'fork' in
 # multiprocessing, and Sage doctesting doesn't work with 'spawn'. See
 # trac #27754.
-if platform.system() == 'Darwin':
-    multiprocessing.set_start_method('fork', force=True)
+multiprocessing.set_start_method('fork', force=True)
 
 
 def _sorted_dict_pprinter_factory(start, end):
diff --git a/src/sage/graphs/digraph.py b/src/sage/graphs/digraph.py
@@ -493,8 +493,7 @@ class DiGraph(GenericGraph):
         sage: {G_imm:1}[G]
         Traceback (most recent call last):
         ...
-        TypeError: This graph is mutable, and thus not hashable. Create an
-        immutable copy by `g.copy(immutable=True)`
+        TypeError: ...This graph is mutable, and thus not hashable. Create an immutable copy by `g.copy(immutable=True)`...
 
     The error message states that one can also create immutable graphs by
     specifying the ``immutable`` optional argument (not only by
@@ -593,7 +592,7 @@ def __init__(self, data=None, pos=None, loops=None, format=None,
             sage: {g:1}[g]
             Traceback (most recent call last):
             ...
-            TypeError: This graph is mutable, and thus not hashable. Create an immutable copy by `g.copy(immutable=True)`
+            TypeError: ...This graph is mutable, and thus not hashable. Create an immutable copy by `g.copy(immutable=True)`...
             sage: copy(g) is g
             False
             sage: {g.copy(immutable=True):1}[g.copy(immutable=True)]
diff --git a/src/sage/misc/sageinspect.py b/src/sage/misc/sageinspect.py
@@ -460,8 +460,9 @@ class SageArgSpecVisitor(ast.NodeVisitor):
         sage: v = visitor.visit(ast.parse("{'a':('e',2,[None,({False:True},'pi')]), 37.0:'temp'}").body[0].value)
         sage: sorted(v.items(), key=lambda x: str(x[0]))
         [(37.0, 'temp'), ('a', ('e', 2, [None, ({False: True}, 'pi')]))]
-        sage: v = ast.parse("jc = ['veni', 'vidi', 'vici']").body[0]; v
-        <...ast.Assign object at ...>
+        sage: v = ast.parse("jc = ['veni', 'vidi', 'vici']").body[0]
+        sage: isinstance(v, ast.Assign)
+        True
         sage: attrs = [x for x in dir(v) if not x.startswith('__')]
         sage: '_attributes' in attrs and '_fields' in attrs and 'col_offset' in attrs
         True
@@ -492,31 +493,6 @@ def visit_Name(self, node):
         """
         return node.id
 
-    def visit_NameConstant(self, node):
-        """
-        Visit a Python AST :class:`ast.NameConstant` node.
-
-        This is an optimization added in Python 3.4 for the special cases
-        of True, False, and None.
-
-        INPUT:
-
-        - ``node`` -- the node instance to visit
-
-        OUTPUT: ``None``, ``True``, ``False``
-
-        EXAMPLES::
-
-            sage: import ast, sage.misc.sageinspect as sms
-            sage: visitor = sms.SageArgSpecVisitor()
-            sage: vis = lambda x: visitor.visit_NameConstant(ast.parse(x).body[0].value)
-            sage: [vis(n) for n in ['True', 'False', 'None']]
-            [True, False, None]
-            sage: [type(vis(n)) for n in ['True', 'False', 'None']]
-            [<class 'bool'>, <class 'bool'>, <class 'NoneType'>]
-        """
-        return node.value
-
     def visit_arg(self, node):
         r"""
         Visit a Python AST :class:`ast.arg` node.
@@ -544,51 +520,6 @@ def visit_arg(self, node):
         """
         return node.arg
 
-    def visit_Num(self, node):
-        """
-        Visit a Python AST :class:`ast.Num` node.
-
-        INPUT:
-
-        - ``node`` -- the node instance to visit
-
-        OUTPUT: the number the ``node`` represents
-
-        EXAMPLES::
-
-            sage: import ast, sage.misc.sageinspect as sms
-            sage: visitor = sms.SageArgSpecVisitor()
-            sage: vis = lambda x: visitor.visit_Num(ast.parse(x).body[0].value)
-            sage: [vis(n) for n in ['123', '0.0']]
-            [123, 0.0]
-
-        .. NOTE::
-
-            On Python 3 negative numbers are parsed first, for some reason, as
-            a UnaryOp node.
-        """
-        return node.value
-
-    def visit_Str(self, node):
-        r"""
-        Visit a Python AST :class:`ast.Str` node.
-
-        INPUT:
-
-        - ``node`` -- the node instance to visit
-
-        OUTPUT: the string the ``node`` represents
-
-        EXAMPLES::
-
-            sage: import ast, sage.misc.sageinspect as sms
-            sage: visitor = sms.SageArgSpecVisitor()
-            sage: vis = lambda x: visitor.visit_Str(ast.parse(x).body[0].value)
-            sage: [vis(s) for s in ['"abstract"', "'syntax'", r'''r"tr\ee"''']]
-            ['abstract', 'syntax', 'tr\\ee']
-        """
-        return node.value
-
     def visit_List(self, node):
         """
         Visit a Python AST :class:`ast.List` node.
@@ -820,6 +751,32 @@ def visit_UnaryOp(self, node):
         if op == 'USub':
             return -self.visit(node.operand)
 
+    def visit_Constant(self, node):
+        """
+        Visit a Python AST :class:`ast.Constant` node.
+
+        Starting from Python 3.8, constants like numbers, strings, booleans,
+        None, and ellipsis are all represented as Constant nodes instead of
+        separate node types (Num, Str, NameConstant, etc.).
+
+        INPUT:
+
+        - ``node`` -- the node instance to visit
+
+        OUTPUT: the constant value the ``node`` represents
+
+        EXAMPLES::
+
+            sage: import ast, sage.misc.sageinspect as sms
+            sage: visitor = sms.SageArgSpecVisitor()
+            sage: vis = lambda x: visitor.visit_Constant(ast.parse(x).body[0].value)
+            sage: [vis(n) for n in ['123', '0', '3.14', '"hello"', 'True', 'False', 'None']]
+            [123, 0, 3.14, 'hello', True, False, None]
+            sage: [type(vis(n)) for n in ['123', '0', '3.14', '"hello"', 'True', 'False', 'None']]
+            [<class 'int'>, <class 'int'>, <class 'float'>, <class 'str'>, <class 'bool'>, <class 'bool'>, <class 'NoneType'>]
+        """
+        return node.value
+
 
 def _grep_first_pair_of_parentheses(s):
     r"""

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ classifiers = [`
`23`	`23`	`"Topic :: Scientific/Engineering :: Mathematics",`
`24`	`24`	`]`
`25`	`25`	`urls = {Homepage = "https://www.sagemath.org"}`
`26`		`-requires-python = ">=3.9, <3.14"`
	`26`	`+requires-python = ">=3.9, <3.15"`
`27`	`27`	`dependencies = []`
`28`	`28`	`dynamic = ["version"]`
`29`	`29`