Skip to content

Commit 1ff80c7

Browse files
authored
Merge branch '3.14' into gh-158973-reset-warnings-lock-3.14
2 parents 9ab0c5c + 3beccbe commit 1ff80c7

40 files changed

Lines changed: 1102 additions & 146 deletions

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
# GitHub
88
.github/** @ezio-melotti @hugovk @AA-Turner @webknjaz @StanFromIreland
9-
.github/workflows/jit.yml @savannahostrowski
109
Tools/build/compute-changes.py @AA-Turner @hugovk @webknjaz @StanFromIreland
1110
Lib/test/test_tools/test_compute_changes.py @AA-Turner @hugovk @webknjaz @StanFromIreland
1211

@@ -33,7 +32,7 @@ Lib/test/test_build_details.py @FFY00
3332
**/*context* @1st1
3433
**/*genobject* @markshannon
3534
**/*hamt* @1st1
36-
**/*jit* @brandtbucher @savannahostrowski
35+
**/*jit* @brandtbucher
3736
Python/perf_jit_trampoline.c # Exclude the owners of "**/*jit*", above.
3837
Objects/set* @rhettinger
3938
Objects/dict* @methane @markshannon

‎Doc/library/calendar.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,10 +166,10 @@ interpreted as prescribed by the ISO 8601 standard. Year 0 is 1 BC, year -1 is
166166
the specified width, representing an empty day. The *weekday* parameter
167167
is unused.
168168

169-
.. method:: formatweek(theweek, w=0)
169+
.. method:: formatweek(theweek, width)
170170

171-
Return a single week in a string with no newline. If *w* is provided, it
172-
specifies the width of the date columns, which are centered. Depends
171+
Return a single week in a string with no newline. *width* specifies
172+
the width of the date columns, which are centered. Depends
173173
on the first weekday as specified in the constructor or set by the
174174
:meth:`setfirstweekday` method.
175175

@@ -197,7 +197,7 @@ interpreted as prescribed by the ISO 8601 standard. Year 0 is 1 BC, year -1 is
197197
:meth:`setfirstweekday` method.
198198

199199

200-
.. method:: formatmonthname(theyear, themonth, width=0, withyear=True)
200+
.. method:: formatmonthname(theyear, themonth, width, withyear=True)
201201

202202
Return a string representing the month's name centered within the
203203
specified *width*. If *withyear* is ``True``, include the year in the

0 commit comments

Comments
 (0)