diff -up src/sage/cpython/debugimpl.c.orig src/sage/cpython/debugimpl.c --- src/sage/cpython/debugimpl.c.orig 2023-02-11 06:25:15.000000000 -0700 +++ src/sage/cpython/debugimpl.c 2023-03-13 09:38:55.609800668 -0600 @@ -148,6 +148,7 @@ static void _type_debug(PyTypeObject* tp printf(" tp_basicsize: %ld\n", (long)tp->tp_basicsize); printf(" tp_itemsize: %ld\n", (long)tp->tp_itemsize); printf(" tp_dictoffset: %ld\n", (long)tp->tp_dictoffset); + printf(" tp_vectorcall_offset: %ld\n", (long)tp->tp_vectorcall_offset); if HAVE_WEAKREFS(tp) { printf(" tp_weaklistoffset: %ld\n", (long)tp->tp_weaklistoffset); @@ -178,7 +179,6 @@ static void _type_debug(PyTypeObject* tp attr_pointer(tp_free); attr_pointer_meth(tp_repr, "__repr__"); - attr_pointer(tp_print); attr_pointer_meth(tp_hash, "__hash__"); attr_pointer_meth(tp_call, "__call__"); attr_pointer_meth(tp_str, "__str__"); diff -up src/sage/cpython/debug.pyx.orig src/sage/cpython/debug.pyx --- src/sage/cpython/debug.pyx.orig 2023-02-11 06:25:15.000000000 -0700 +++ src/sage/cpython/debug.pyx 2023-03-13 09:38:55.610800649 -0600 @@ -231,6 +231,7 @@ def type_debug(cls): tp_basicsize: 16 tp_itemsize: 0 tp_dictoffset: 0 + tp_vectorcall_offset: 0 tp_weaklistoffset: 0 tp_base (__base__): NULL tp_bases (__bases__): tuple: @@ -258,7 +259,6 @@ def type_debug(cls): tp_dealloc (__dealloc__): 0x7fc57d757010 tp_free: PyObject_Del tp_repr (__repr__): 0x7fc57d75b990 - tp_print: NULL tp_hash (__hash__): _Py_HashPointer tp_call (__call__): NULL tp_str (__str__): 0x7fc57d757020 diff -up src/sage/geometry/triangulation/point_configuration.py.orig src/sage/geometry/triangulation/point_configuration.py --- src/sage/geometry/triangulation/point_configuration.py.orig 2023-02-11 06:25:15.000000000 -0700 +++ src/sage/geometry/triangulation/point_configuration.py 2023-03-13 09:38:55.610800649 -0600 @@ -617,11 +617,11 @@ class PointConfiguration(UniqueRepresent ['{{0,1,2,4},{1,2,3,4}}'] """ timeout = 600 - proc = pexpect.spawn(executable, timeout=timeout) + proc = pexpect.spawn(executable, timeout=timeout, encoding='utf-8') proc.expect(r'Evaluating Commandline Options \.\.\.') proc.expect(r'\.\.\. done\.') proc.setecho(0) - assert proc.readline().strip() == b'' + assert proc.readline().strip() == '' if verbose: print("#### TOPCOM input ####") diff -up src/sage/interfaces/frobby.py.orig src/sage/interfaces/frobby.py --- src/sage/interfaces/frobby.py.orig 2023-02-11 06:25:15.000000000 -0700 +++ src/sage/interfaces/frobby.py 2023-03-13 09:38:55.610800649 -0600 @@ -78,7 +78,7 @@ class Frobby: print("Frobby command: ", repr(command)) print("Frobby input:\n", input) - process = Popen(command, stdin=PIPE, stdout=PIPE, stderr=PIPE) + process = Popen(command, stdin=PIPE, stdout=PIPE, stderr=PIPE, encoding='utf-8') if input: frinput = str_to_bytes(input) else: diff -up src/sage/interfaces/gfan.py.orig src/sage/interfaces/gfan.py --- src/sage/interfaces/gfan.py.orig 2023-02-11 06:25:15.000000000 -0700 +++ src/sage/interfaces/gfan.py 2023-03-13 09:38:55.611800631 -0600 @@ -109,7 +109,7 @@ class Gfan(): print("gfan input:\n%s" % input) gfan_processes = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE, - encoding='latin-1') + encoding='utf-8') ans, err = gfan_processes.communicate(input=input) # sometimes, gfan outputs stuff to stderr even though everything is fine diff -up src/sage/interfaces/latte.py.orig src/sage/interfaces/latte.py --- src/sage/interfaces/latte.py.orig 2023-02-11 06:25:15.000000000 -0700 +++ src/sage/interfaces/latte.py 2023-03-13 09:38:55.611800631 -0600 @@ -161,6 +161,7 @@ def count(arg, ehrhart_polynomial=False, latte_proc = Popen(args, stdin=PIPE, stdout=PIPE, stderr=(None if verbose else PIPE), + encoding='utf-8', cwd=tempd.name) ans, err = latte_proc.communicate(arg) @@ -393,6 +394,7 @@ def integrate(arg, polynomial=None, algo latte_proc = Popen(args, stdin=PIPE, stdout=PIPE, stderr=(None if verbose else PIPE), + encoding='utf-8', cwd=tempd.name) ans, err = latte_proc.communicate(arg) diff -up src/sage/interfaces/sagespawn.pyx.orig src/sage/interfaces/sagespawn.pyx --- src/sage/interfaces/sagespawn.pyx.orig 2023-02-11 06:25:15.000000000 -0700 +++ src/sage/interfaces/sagespawn.pyx 2023-03-13 09:38:55.611800631 -0600 @@ -1,6 +1,6 @@ """ Sage wrapper around pexpect's ``spawn`` class and -the ptyprocess's ``PtyProcess`` class. +the ptyprocess's ``PtyProcessUnicode`` class. AUTHOR: @@ -21,7 +21,7 @@ AUTHOR: #***************************************************************************** from pexpect import * -from ptyprocess import PtyProcess +from ptyprocess import PtyProcessUnicode from cpython.ref cimport Py_INCREF from libc.signal cimport * @@ -30,7 +30,6 @@ from posix.unistd cimport getpid, getpgi from time import sleep -from sage.cpython.string cimport str_to_bytes from sage.interfaces.process cimport ContainChildren @@ -173,7 +172,7 @@ class SageSpawn(spawn): return ret -class SagePtyProcess(PtyProcess): +class SagePtyProcess(PtyProcessUnicode): def close(self, force=None): """ Quit the child process: send the quit string, close the @@ -194,11 +193,7 @@ class SagePtyProcess(PtyProcess): if self.quit_string is not None: try: # This can fail if the process already exited - # PtyProcess.write takes bytes; ideally we would use - # an encoding picked specifically for the target process - # but the default (UTF-8) will do now, since I don't - # think we have any non-ASCII quit_strings anyways. - self.write(str_to_bytes(self.quit_string)) + self.write(self.quit_string) except (OSError, IOError): pass self.fileobj.close() diff -up src/sage/libs/coxeter3/coxeter.pyx.orig src/sage/libs/coxeter3/coxeter.pyx --- src/sage/libs/coxeter3/coxeter.pyx.orig 2023-02-11 06:25:15.000000000 -0700 +++ src/sage/libs/coxeter3/coxeter.pyx 2023-03-13 09:38:55.611800631 -0600 @@ -37,7 +37,7 @@ cdef class String: EXAMPLES:: sage: from sage.libs.coxeter3.coxeter import String # optional - coxeter3 - sage: s = String("hello"); s # optional - coxeter3 + sage: s = String(b"hello"); s # optional - coxeter3 hello sage: del s # optional - coxeter3 """ @@ -48,11 +48,11 @@ cdef class String: EXAMPLES:: sage: from sage.libs.coxeter3.coxeter import String # optional - coxeter3 - sage: s = String('Hi') # optional - coxeter3 + sage: s = String(b'Hi') # optional - coxeter3 sage: s # optional - coxeter3 Hi """ - return bytes_to_str(self.x.ptr()) + return self.x.ptr().decode('utf-8') def __hash__(self): """ @@ -64,7 +64,7 @@ cdef class String: EXAMPLES:: sage: from sage.libs.coxeter3.coxeter import String # optional - coxeter3 - sage: s = String('hello') # optional - coxeter3 + sage: s = String(b'hello') # optional - coxeter3 sage: hash(s) == hash('hello') # optional - coxeter3 True """ @@ -75,9 +75,9 @@ cdef class String: EXAMPLES:: sage: from sage.libs.coxeter3.coxeter import String # optional - coxeter3 - sage: ta1 = String('A') # optional - coxeter3 - sage: ta2 = String('A') # optional - coxeter3 - sage: tb = String('b') # optional - coxeter3 + sage: ta1 = String(b'A') # optional - coxeter3 + sage: ta2 = String(b'A') # optional - coxeter3 + sage: tb = String(b'b') # optional - coxeter3 sage: ta1 == ta2 # optional - coxeter3 True sage: tb != ta1 # optional - coxeter3 @@ -113,7 +113,7 @@ cdef class String: EXAMPLES:: sage: from sage.libs.coxeter3.coxeter import String # optional - coxeter3 - sage: s = String('Hi') # optional - coxeter3 + sage: s = String(b'Hi') # optional - coxeter3 sage: len(s) # optional - coxeter3 2 """ @@ -124,7 +124,7 @@ cdef class String: EXAMPLES:: sage: from sage.libs.coxeter3.coxeter import String # optional - coxeter3 - sage: s = String('Hi') # optional - coxeter3 + sage: s = String(b'Hi') # optional - coxeter3 sage: TestSuite(s).run() # optional - coxeter3 """ return (String, (repr(self),) ) @@ -138,7 +138,7 @@ cdef class Type: EXAMPLES:: sage: from sage.libs.coxeter3.coxeter import Type # optional - coxeter3 - sage: t = Type('A'); t # optional - coxeter3 + sage: t = Type(b'A'); t # optional - coxeter3 A sage: del t # optional - coxeter3 """ @@ -149,7 +149,7 @@ cdef class Type: EXAMPLES:: sage: from sage.libs.coxeter3.coxeter import Type # optional - coxeter3 - sage: t = Type('A'); t # optional - coxeter3 + sage: t = Type(b'A'); t # optional - coxeter3 A """ return bytes_to_str(self.x.name().ptr()) @@ -159,7 +159,7 @@ cdef class Type: EXAMPLES:: sage: from sage.libs.coxeter3.coxeter import Type # optional - coxeter3 - sage: t = Type('A') # optional - coxeter3 + sage: t = Type(b'A') # optional - coxeter3 sage: t.name() # optional - coxeter3 A """ @@ -175,8 +175,8 @@ cdef class Type: EXAMPLES:: sage: from sage.libs.coxeter3.coxeter import Type # optional - coxeter3 - sage: a = Type('A') # optional - coxeter3 - sage: b = Type('B') # optional - coxeter3 + sage: a = Type(b'A') # optional - coxeter3 + sage: b = Type(b'B') # optional - coxeter3 sage: hash(a) == hash(b) # optional - coxeter3 False sage: d = {a: 1, b: 2} # optional - coxeter3 @@ -188,9 +188,9 @@ cdef class Type: EXAMPLES:: sage: from sage.libs.coxeter3.coxeter import Type # optional - coxeter3 - sage: ta1 = Type('A') # optional - coxeter3 - sage: ta2 = Type('A') # optional - coxeter3 - sage: tb = Type('b') # optional - coxeter3 + sage: ta1 = Type(b'A') # optional - coxeter3 + sage: ta2 = Type(b'A') # optional - coxeter3 + sage: tb = Type(b'b') # optional - coxeter3 sage: ta1 == ta2 # optional - coxeter3 True sage: tb != ta1 # optional - coxeter3 @@ -224,7 +224,7 @@ cdef class Type: EXAMPLES:: sage: from sage.libs.coxeter3.coxeter import Type # optional - coxeter3 - sage: t = Type('A') # optional - coxeter3 + sage: t = Type(b'A') # optional - coxeter3 sage: TestSuite(t).run() # optional - coxeter3 """ return (Type, (repr(self), )) @@ -268,7 +268,7 @@ cdef class CoxGroup(SageObject): pass type = type.lower() - type = 'B' if type == 'C' else type + type = b'B' if type == 'C' else type.encode('utf-8') if rank == 0: raise NotImplementedError("Coxeter group of type ['A',0] using Coxeter 3 not yet implemented") diff -up src/sage/misc/sageinspect.py.orig src/sage/misc/sageinspect.py --- src/sage/misc/sageinspect.py.orig 2023-03-13 08:43:39.551431643 -0600 +++ src/sage/misc/sageinspect.py 2023-03-13 09:38:55.612800613 -0600 @@ -516,12 +516,9 @@ class SageArgSpecVisitor(ast.NodeVisitor """ 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. + def visit_Constant(self, node): + r""" + Visit a Python AST :class:`ast.Constant` node. INPUT: @@ -535,7 +532,7 @@ class SageArgSpecVisitor(ast.NodeVisitor 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 = lambda x: visitor.visit_Constant(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']] diff -up src/sage/plot/plot3d/plot3d.py.orig src/sage/plot/plot3d/plot3d.py --- src/sage/plot/plot3d/plot3d.py.orig 2023-02-11 06:25:15.000000000 -0700 +++ src/sage/plot/plot3d/plot3d.py 2023-03-13 09:38:55.612800613 -0600 @@ -219,6 +219,7 @@ from .shapes import arrow3d from .base import Graphics3dGroup from sage.plot.colors import rainbow from .texture import Texture +import inspect from sage.functions.trig import cos, sin from sage.misc.sageinspect import sage_getargspec, is_function_or_cython_function @@ -255,7 +256,7 @@ class _Coordinates(): sage: arb((x+z,y*z,z), z, (x,y)) Arbitrary Coordinates coordinate transform (z in terms of x, y) """ - all_vars = sage_getargspec(self.transform).args[1:] + all_vars = inspect.getfullargspec(self.transform)[0][1:] if set(all_vars) != set(indep_vars + [dep_var]): raise ValueError('variables were specified incorrectly for this coordinate system; incorrect variables were %s'%list(set(all_vars).symmetric_difference(set(indep_vars+[dep_var])))) self.dep_var = dep_var diff -up src/sage/rings/polynomial/pbori/pbori.pyx.orig src/sage/rings/polynomial/pbori/pbori.pyx --- src/sage/rings/polynomial/pbori/pbori.pyx.orig 2023-02-11 06:25:15.000000000 -0700 +++ src/sage/rings/polynomial/pbori/pbori.pyx 2023-03-13 11:29:13.157592229 -0600 @@ -4722,8 +4722,7 @@ cdef class PolynomialConstruct: # So, it is just a conversion. [Simon King] return (ring)._element_constructor_(x) - raise TypeError("cannot generate Boolean polynomial from %s , %s" % - (type(x), type(ring))) + raise TypeError(f"cannot generate Boolean polynomial from {type(x)}, {type(ring)}") cdef class MonomialConstruct: diff -up src/sage/structure/sage_object.pyx.orig src/sage/structure/sage_object.pyx --- src/sage/structure/sage_object.pyx.orig 2023-02-11 06:25:15.000000000 -0700 +++ src/sage/structure/sage_object.pyx 2023-03-13 09:38:55.613800594 -0600 @@ -694,7 +694,7 @@ cdef class SageObject: try: s = self._interface_init_(I) except Exception: - raise NotImplementedError("coercion of object %s to %s not implemented:\n%s\n%s" % (repr(self), I)) + raise NotImplementedError(f"coercion of object {repr(self)} to {I} not implemented") X = I(s) if c: try: