forked from pool/python310
- Reapply patches
- bpo-31046_ensurepip_honours_prefix.patch - fix_configure_rst.patch - no-skipif-doctests.patch - skip-test_pyobject_freed_is_freed.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python310?expand=0&rev=50
This commit is contained in:
parent
204d863a88
commit
a525b95311
@ -55,7 +55,7 @@ Co-Authored-By: Xavier de Gaye <xdegaye@gmail.com>
|
||||
.. note::
|
||||
--- a/Lib/ensurepip/__init__.py
|
||||
+++ b/Lib/ensurepip/__init__.py
|
||||
@@ -113,27 +113,27 @@ def _disable_pip_configuration_settings(
|
||||
@@ -123,27 +123,27 @@ def _disable_pip_configuration_settings(
|
||||
os.environ['PIP_CONFIG_FILE'] = os.devnull
|
||||
|
||||
|
||||
@ -88,7 +88,7 @@ Co-Authored-By: Xavier de Gaye <xdegaye@gmail.com>
|
||||
|
||||
Note that calling this function will alter both sys.path and os.environ.
|
||||
"""
|
||||
@@ -183,6 +183,8 @@ def _bootstrap(*, root=None, upgrade=Fal
|
||||
@@ -193,6 +193,8 @@ def _bootstrap(*, root=None, upgrade=Fal
|
||||
args = ["install", "--no-cache-dir", "--no-index", "--find-links", tmpdir]
|
||||
if root:
|
||||
args += ["--root", root]
|
||||
@ -97,7 +97,7 @@ Co-Authored-By: Xavier de Gaye <xdegaye@gmail.com>
|
||||
if upgrade:
|
||||
args += ["--upgrade"]
|
||||
if user:
|
||||
@@ -258,6 +260,11 @@ def _main(argv=None):
|
||||
@@ -268,6 +270,11 @@ def _main(argv=None):
|
||||
help="Install everything relative to this alternate root directory.",
|
||||
)
|
||||
parser.add_argument(
|
||||
@ -109,7 +109,7 @@ Co-Authored-By: Xavier de Gaye <xdegaye@gmail.com>
|
||||
"--altinstall",
|
||||
action="store_true",
|
||||
default=False,
|
||||
@@ -276,6 +283,7 @@ def _main(argv=None):
|
||||
@@ -286,6 +293,7 @@ def _main(argv=None):
|
||||
|
||||
return _bootstrap(
|
||||
root=args.root,
|
||||
|
@ -29,7 +29,7 @@
|
||||
Create a Python.framework rather than a traditional Unix install. Optional
|
||||
--- a/Misc/NEWS
|
||||
+++ b/Misc/NEWS
|
||||
@@ -2370,7 +2370,7 @@ C API
|
||||
@@ -2683,7 +2683,7 @@ C API
|
||||
-----
|
||||
|
||||
- bpo-43795: The list in :ref:`stable-abi-list` now shows the public name
|
||||
|
@ -1,16 +1,9 @@
|
||||
only in patch2:
|
||||
unchanged:
|
||||
--- a/Doc/conf.py
|
||||
+++ b/Doc/conf.py
|
||||
@@ -46,7 +46,7 @@ today_fmt = '%B %d, %Y'
|
||||
highlight_language = 'python3'
|
||||
|
||||
# Minimum version of sphinx required
|
||||
-needs_sphinx = '1.8'
|
||||
+needs_sphinx = '1.7.6'
|
||||
|
||||
# Ignore any .rst files in the venv/ directory.
|
||||
exclude_patterns = ['venv/*', 'README.rst']
|
||||
---
|
||||
Doc/library/turtle.rst | 82 -------------------------------------------------
|
||||
1 file changed, 82 deletions(-)
|
||||
|
||||
--- a/Doc/library/turtle.rst
|
||||
+++ b/Doc/library/turtle.rst
|
||||
@@ -250,7 +250,6 @@ Turtle motion
|
||||
@ -314,7 +307,7 @@ unchanged:
|
||||
|
||||
>>> turtle.color("black", "red")
|
||||
>>> turtle.begin_fill()
|
||||
@@ -1075,7 +1036,6 @@ More drawing control
|
||||
@@ -1074,7 +1035,6 @@ More drawing control
|
||||
variables to the default values.
|
||||
|
||||
.. doctest::
|
||||
@ -322,7 +315,7 @@ unchanged:
|
||||
|
||||
>>> turtle.goto(0,-22)
|
||||
>>> turtle.left(100)
|
||||
@@ -1127,7 +1087,6 @@ Visibility
|
||||
@@ -1125,7 +1085,6 @@ Visibility
|
||||
drawing observably.
|
||||
|
||||
.. doctest::
|
||||
@ -330,7 +323,7 @@ unchanged:
|
||||
|
||||
>>> turtle.hideturtle()
|
||||
|
||||
@@ -1138,7 +1097,6 @@ Visibility
|
||||
@@ -1136,7 +1095,6 @@ Visibility
|
||||
Make the turtle visible.
|
||||
|
||||
.. doctest::
|
||||
@ -338,7 +331,7 @@ unchanged:
|
||||
|
||||
>>> turtle.showturtle()
|
||||
|
||||
@@ -1169,7 +1127,6 @@ Appearance
|
||||
@@ -1167,7 +1125,6 @@ Appearance
|
||||
deal with shapes see Screen method :func:`register_shape`.
|
||||
|
||||
.. doctest::
|
||||
@ -346,7 +339,7 @@ unchanged:
|
||||
|
||||
>>> turtle.shape()
|
||||
'classic'
|
||||
@@ -1195,7 +1152,6 @@ Appearance
|
||||
@@ -1193,7 +1150,6 @@ Appearance
|
||||
``resizemode("user")`` is called by :func:`shapesize` when used with arguments.
|
||||
|
||||
.. doctest::
|
||||
@ -354,7 +347,7 @@ unchanged:
|
||||
|
||||
>>> turtle.resizemode()
|
||||
'noresize'
|
||||
@@ -1219,7 +1175,6 @@ Appearance
|
||||
@@ -1217,7 +1173,6 @@ Appearance
|
||||
of the shapes's outline.
|
||||
|
||||
.. doctest::
|
||||
@ -362,7 +355,7 @@ unchanged:
|
||||
|
||||
>>> turtle.shapesize()
|
||||
(1.0, 1.0, 1)
|
||||
@@ -1244,7 +1199,6 @@ Appearance
|
||||
@@ -1242,7 +1197,6 @@ Appearance
|
||||
heading of the turtle are sheared.
|
||||
|
||||
.. doctest::
|
||||
@ -370,7 +363,7 @@ unchanged:
|
||||
|
||||
>>> turtle.shape("circle")
|
||||
>>> turtle.shapesize(5,2)
|
||||
@@ -1261,7 +1215,6 @@ Appearance
|
||||
@@ -1259,7 +1213,6 @@ Appearance
|
||||
change the turtle's heading (direction of movement).
|
||||
|
||||
.. doctest::
|
||||
@ -378,7 +371,7 @@ unchanged:
|
||||
|
||||
>>> turtle.reset()
|
||||
>>> turtle.shape("circle")
|
||||
@@ -1281,7 +1234,6 @@ Appearance
|
||||
@@ -1279,7 +1232,6 @@ Appearance
|
||||
(direction of movement).
|
||||
|
||||
.. doctest::
|
||||
@ -386,7 +379,7 @@ unchanged:
|
||||
|
||||
>>> turtle.reset()
|
||||
>>> turtle.shape("circle")
|
||||
@@ -1307,7 +1259,6 @@ Appearance
|
||||
@@ -1305,7 +1257,6 @@ Appearance
|
||||
turtle (its direction of movement).
|
||||
|
||||
.. doctest::
|
||||
@ -394,7 +387,7 @@ unchanged:
|
||||
|
||||
>>> turtle.reset()
|
||||
>>> turtle.shape("circle")
|
||||
@@ -1336,7 +1287,6 @@ Appearance
|
||||
@@ -1334,7 +1285,6 @@ Appearance
|
||||
given matrix.
|
||||
|
||||
.. doctest::
|
||||
@ -402,7 +395,7 @@ unchanged:
|
||||
|
||||
>>> turtle = Turtle()
|
||||
>>> turtle.shape("square")
|
||||
@@ -1352,7 +1302,6 @@ Appearance
|
||||
@@ -1350,7 +1300,6 @@ Appearance
|
||||
can be used to define a new shape or components of a compound shape.
|
||||
|
||||
.. doctest::
|
||||
@ -410,7 +403,7 @@ unchanged:
|
||||
|
||||
>>> turtle.shape("square")
|
||||
>>> turtle.shapetransform(4, -1, 0, 2)
|
||||
@@ -1377,7 +1326,6 @@ Using events
|
||||
@@ -1375,7 +1324,6 @@ Using events
|
||||
procedural way:
|
||||
|
||||
.. doctest::
|
||||
@ -418,7 +411,7 @@ unchanged:
|
||||
|
||||
>>> def turn(x, y):
|
||||
... left(180)
|
||||
@@ -1398,7 +1346,6 @@ Using events
|
||||
@@ -1396,7 +1344,6 @@ Using events
|
||||
``None``, existing bindings are removed.
|
||||
|
||||
.. doctest::
|
||||
@ -426,7 +419,7 @@ unchanged:
|
||||
|
||||
>>> class MyTurtle(Turtle):
|
||||
... def glow(self,x,y):
|
||||
@@ -1426,7 +1373,6 @@ Using events
|
||||
@@ -1424,7 +1371,6 @@ Using events
|
||||
mouse-click event on that turtle.
|
||||
|
||||
.. doctest::
|
||||
@ -434,7 +427,7 @@ unchanged:
|
||||
|
||||
>>> turtle.ondrag(turtle.goto)
|
||||
|
||||
@@ -1454,7 +1400,6 @@ Special Turtle methods
|
||||
@@ -1452,7 +1398,6 @@ Special Turtle methods
|
||||
Return the last recorded polygon.
|
||||
|
||||
.. doctest::
|
||||
@ -442,7 +435,7 @@ unchanged:
|
||||
|
||||
>>> turtle.home()
|
||||
>>> turtle.begin_poly()
|
||||
@@ -1474,7 +1419,6 @@ Special Turtle methods
|
||||
@@ -1472,7 +1417,6 @@ Special Turtle methods
|
||||
turtle properties.
|
||||
|
||||
.. doctest::
|
||||
@ -450,7 +443,7 @@ unchanged:
|
||||
|
||||
>>> mick = Turtle()
|
||||
>>> joe = mick.clone()
|
||||
@@ -1487,7 +1431,6 @@ Special Turtle methods
|
||||
@@ -1485,7 +1429,6 @@ Special Turtle methods
|
||||
return the "anonymous turtle":
|
||||
|
||||
.. doctest::
|
||||
@ -458,7 +451,7 @@ unchanged:
|
||||
|
||||
>>> pet = getturtle()
|
||||
>>> pet.fd(50)
|
||||
@@ -1501,7 +1444,6 @@ Special Turtle methods
|
||||
@@ -1499,7 +1442,6 @@ Special Turtle methods
|
||||
TurtleScreen methods can then be called for that object.
|
||||
|
||||
.. doctest::
|
||||
@ -466,7 +459,7 @@ unchanged:
|
||||
|
||||
>>> ts = turtle.getscreen()
|
||||
>>> ts
|
||||
@@ -1519,7 +1461,6 @@ Special Turtle methods
|
||||
@@ -1517,7 +1459,6 @@ Special Turtle methods
|
||||
``None``, the undobuffer is disabled.
|
||||
|
||||
.. doctest::
|
||||
@ -474,7 +467,7 @@ unchanged:
|
||||
|
||||
>>> turtle.setundobuffer(42)
|
||||
|
||||
@@ -1529,7 +1470,6 @@ Special Turtle methods
|
||||
@@ -1527,7 +1468,6 @@ Special Turtle methods
|
||||
Return number of entries in the undobuffer.
|
||||
|
||||
.. doctest::
|
||||
@ -482,7 +475,7 @@ unchanged:
|
||||
|
||||
>>> while undobufferentries():
|
||||
... undo()
|
||||
@@ -1552,7 +1492,6 @@ below:
|
||||
@@ -1550,7 +1490,6 @@ below:
|
||||
For example:
|
||||
|
||||
.. doctest::
|
||||
@ -490,7 +483,7 @@ unchanged:
|
||||
|
||||
>>> s = Shape("compound")
|
||||
>>> poly1 = ((0,0),(10,-5),(0,10),(-10,-5))
|
||||
@@ -1563,7 +1502,6 @@ below:
|
||||
@@ -1561,7 +1500,6 @@ below:
|
||||
3. Now add the Shape to the Screen's shapelist and use it:
|
||||
|
||||
.. doctest::
|
||||
@ -498,7 +491,7 @@ unchanged:
|
||||
|
||||
>>> register_shape("myshape", s)
|
||||
>>> shape("myshape")
|
||||
@@ -1583,7 +1521,6 @@ Most of the examples in this section ref
|
||||
@@ -1581,7 +1519,6 @@ Most of the examples in this section ref
|
||||
``screen``.
|
||||
|
||||
.. doctest::
|
||||
@ -506,7 +499,7 @@ unchanged:
|
||||
:hide:
|
||||
|
||||
>>> screen = Screen()
|
||||
@@ -1600,7 +1537,6 @@ Window control
|
||||
@@ -1598,7 +1535,6 @@ Window control
|
||||
Set or return background color of the TurtleScreen.
|
||||
|
||||
.. doctest::
|
||||
@ -514,7 +507,7 @@ unchanged:
|
||||
|
||||
>>> screen.bgcolor("orange")
|
||||
>>> screen.bgcolor()
|
||||
@@ -1686,7 +1622,6 @@ Window control
|
||||
@@ -1690,7 +1626,6 @@ Window control
|
||||
distorted.
|
||||
|
||||
.. doctest::
|
||||
@ -522,7 +515,7 @@ unchanged:
|
||||
|
||||
>>> screen.reset()
|
||||
>>> screen.setworldcoordinates(-50,-7.5,50,7.5)
|
||||
@@ -1697,7 +1632,6 @@ Window control
|
||||
@@ -1701,7 +1636,6 @@ Window control
|
||||
... left(45); fd(2) # a regular octagon
|
||||
|
||||
.. doctest::
|
||||
@ -530,7 +523,7 @@ unchanged:
|
||||
:hide:
|
||||
|
||||
>>> screen.reset()
|
||||
@@ -1719,7 +1653,6 @@ Animation control
|
||||
@@ -1723,7 +1657,6 @@ Animation control
|
||||
Optional argument:
|
||||
|
||||
.. doctest::
|
||||
@ -538,7 +531,7 @@ unchanged:
|
||||
|
||||
>>> screen.delay()
|
||||
10
|
||||
@@ -1741,7 +1674,6 @@ Animation control
|
||||
@@ -1745,7 +1678,6 @@ Animation control
|
||||
:func:`delay`).
|
||||
|
||||
.. doctest::
|
||||
@ -546,7 +539,7 @@ unchanged:
|
||||
|
||||
>>> screen.tracer(8, 25)
|
||||
>>> dist = 2
|
||||
@@ -1778,7 +1710,6 @@ Using screen events
|
||||
@@ -1782,7 +1714,6 @@ Using screen events
|
||||
must have the focus. (See method :func:`listen`.)
|
||||
|
||||
.. doctest::
|
||||
@ -554,7 +547,7 @@ unchanged:
|
||||
|
||||
>>> def f():
|
||||
... fd(50)
|
||||
@@ -1799,7 +1730,6 @@ Using screen events
|
||||
@@ -1803,7 +1734,6 @@ Using screen events
|
||||
must have focus. (See method :func:`listen`.)
|
||||
|
||||
.. doctest::
|
||||
@ -562,7 +555,7 @@ unchanged:
|
||||
|
||||
>>> def f():
|
||||
... fd(50)
|
||||
@@ -1824,7 +1754,6 @@ Using screen events
|
||||
@@ -1828,7 +1758,6 @@ Using screen events
|
||||
named ``turtle``:
|
||||
|
||||
.. doctest::
|
||||
@ -570,7 +563,7 @@ unchanged:
|
||||
|
||||
>>> screen.onclick(turtle.goto) # Subsequently clicking into the TurtleScreen will
|
||||
>>> # make the turtle move to the clicked point.
|
||||
@@ -1844,7 +1773,6 @@ Using screen events
|
||||
@@ -1848,7 +1777,6 @@ Using screen events
|
||||
Install a timer that calls *fun* after *t* milliseconds.
|
||||
|
||||
.. doctest::
|
||||
@ -578,7 +571,7 @@ unchanged:
|
||||
|
||||
>>> running = True
|
||||
>>> def f():
|
||||
@@ -1926,7 +1854,6 @@ Settings and special methods
|
||||
@@ -1930,7 +1858,6 @@ Settings and special methods
|
||||
============ ========================= ===================
|
||||
|
||||
.. doctest::
|
||||
@ -586,7 +579,7 @@ unchanged:
|
||||
|
||||
>>> mode("logo") # resets turtle heading to north
|
||||
>>> mode()
|
||||
@@ -1941,7 +1868,6 @@ Settings and special methods
|
||||
@@ -1945,7 +1872,6 @@ Settings and special methods
|
||||
values of color triples have to be in the range 0..\ *cmode*.
|
||||
|
||||
.. doctest::
|
||||
@ -594,7 +587,7 @@ unchanged:
|
||||
|
||||
>>> screen.colormode(1)
|
||||
>>> turtle.pencolor(240, 160, 80)
|
||||
@@ -1962,7 +1888,6 @@ Settings and special methods
|
||||
@@ -1966,7 +1892,6 @@ Settings and special methods
|
||||
do with a Tkinter Canvas.
|
||||
|
||||
.. doctest::
|
||||
@ -602,7 +595,7 @@ unchanged:
|
||||
|
||||
>>> cv = screen.getcanvas()
|
||||
>>> cv
|
||||
@@ -1974,7 +1899,6 @@ Settings and special methods
|
||||
@@ -1978,7 +1903,6 @@ Settings and special methods
|
||||
Return a list of names of all currently available turtle shapes.
|
||||
|
||||
.. doctest::
|
||||
@ -610,7 +603,7 @@ unchanged:
|
||||
|
||||
>>> screen.getshapes()
|
||||
['arrow', 'blank', 'circle', ..., 'turtle']
|
||||
@@ -1998,7 +1922,6 @@ Settings and special methods
|
||||
@@ -2002,7 +1926,6 @@ Settings and special methods
|
||||
coordinates: Install the corresponding polygon shape.
|
||||
|
||||
.. doctest::
|
||||
@ -618,7 +611,7 @@ unchanged:
|
||||
|
||||
>>> screen.register_shape("triangle", ((5,-3), (0,5), (-5,-3)))
|
||||
|
||||
@@ -2014,7 +1937,6 @@ Settings and special methods
|
||||
@@ -2018,7 +1941,6 @@ Settings and special methods
|
||||
Return the list of turtles on the screen.
|
||||
|
||||
.. doctest::
|
||||
@ -626,7 +619,7 @@ unchanged:
|
||||
|
||||
>>> for turtle in screen.turtles():
|
||||
... turtle.color("red")
|
||||
@@ -2076,7 +1998,6 @@ Methods specific to Screen, not inherite
|
||||
@@ -2080,7 +2002,6 @@ Methods specific to Screen, not inherite
|
||||
center window vertically
|
||||
|
||||
.. doctest::
|
||||
@ -634,7 +627,7 @@ unchanged:
|
||||
|
||||
>>> screen.setup (width=200, height=200, startx=0, starty=0)
|
||||
>>> # sets window to 200x200 pixels, in upper left of screen
|
||||
@@ -2092,7 +2013,6 @@ Methods specific to Screen, not inherite
|
||||
@@ -2096,7 +2017,6 @@ Methods specific to Screen, not inherite
|
||||
Set title of turtle window to *titlestring*.
|
||||
|
||||
.. doctest::
|
||||
@ -642,7 +635,7 @@ unchanged:
|
||||
|
||||
>>> screen.title("Welcome to the turtle zoo!")
|
||||
|
||||
@@ -2163,7 +2083,6 @@ Public classes
|
||||
@@ -2167,7 +2087,6 @@ Public classes
|
||||
Example:
|
||||
|
||||
.. doctest::
|
||||
@ -650,7 +643,7 @@ unchanged:
|
||||
|
||||
>>> poly = ((0,0),(10,-5),(0,10),(-10,-5))
|
||||
>>> s = Shape("compound")
|
||||
@@ -2510,7 +2429,6 @@ Changes since Python 3.0
|
||||
@@ -2514,7 +2433,6 @@ Changes since Python 3.0
|
||||
|
||||
|
||||
.. doctest::
|
||||
|
@ -194,6 +194,11 @@ Tue Aug 2 17:13:37 UTC 2022 - Matej Cepl <mcepl@suse.com>
|
||||
- gh-94864: Fix PyArg_Parse* with deprecated format units “u”
|
||||
and “Z”. It returned 1 (success) when warnings are turned
|
||||
into exceptions.
|
||||
- Reapply patches
|
||||
- bpo-31046_ensurepip_honours_prefix.patch
|
||||
- fix_configure_rst.patch
|
||||
- no-skipif-doctests.patch
|
||||
- skip-test_pyobject_freed_is_freed.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 21 14:19:52 UTC 2022 - Matej Cepl <mcepl@suse.com>
|
||||
|
@ -4,7 +4,7 @@
|
||||
|
||||
--- a/Lib/test/test_capi.py
|
||||
+++ b/Lib/test/test_capi.py
|
||||
@@ -794,6 +794,7 @@ class PyMemDebugTests(unittest.TestCase)
|
||||
@@ -941,6 +941,7 @@ class PyMemDebugTests(unittest.TestCase)
|
||||
def test_pyobject_forbidden_bytes_is_freed(self):
|
||||
self.check_pyobject_is_freed('check_pyobject_forbidden_bytes_is_freed')
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user