Skip to content

Commit 0049e2b

Browse files
miss-islingtonuatachserhiy-storchakaJelleZijlstraerlend-aasland
authored
[3.12] gh-85453: Adapt datetime.rst to devguide recommendations for code snippets and variables (GH-118068) (#118244)
Also remove formatting from numeric literals. (cherry picked from commit 809aa9a) Co-authored-by: edson duarte <[email protected]> Co-authored-by: Serhiy Storchaka <[email protected]> Co-authored-by: Jelle Zijlstra <[email protected]> Co-authored-by: Erlend E. Aasland <[email protected]>
1 parent 0691bd8 commit 0049e2b

File tree

1 file changed

+45
-45
lines changed

1 file changed

+45
-45
lines changed

Diff for: Doc/library/datetime.rst

+45-45
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ The :mod:`!datetime` module exports the following constants:
8585
.. data:: MINYEAR
8686

8787
The smallest year number allowed in a :class:`date` or :class:`.datetime` object.
88-
:const:`MINYEAR` is ``1``.
88+
:const:`MINYEAR` is 1.
8989

9090

9191
.. data:: MAXYEAR
@@ -207,7 +207,7 @@ A :class:`timedelta` object represents a duration, the difference between two
207207

208208
.. class:: timedelta(days=0, seconds=0, microseconds=0, milliseconds=0, minutes=0, hours=0, weeks=0)
209209

210-
All arguments are optional and default to ``0``. Arguments may be integers
210+
All arguments are optional and default to 0. Arguments may be integers
211211
or floats, and may be positive or negative.
212212

213213
Only *days*, *seconds* and *microseconds* are stored internally.
@@ -280,7 +280,7 @@ Class attributes:
280280
The smallest possible difference between non-equal :class:`timedelta` objects,
281281
``timedelta(microseconds=1)``.
282282

283-
Note that, because of normalization, ``timedelta.max`` > ``-timedelta.min``.
283+
Note that, because of normalization, ``timedelta.max`` is greater than ``-timedelta.min``.
284284
``-timedelta.max`` is not representable as a :class:`timedelta` object.
285285

286286
Instance attributes (read-only):
@@ -302,26 +302,27 @@ Supported operations:
302302
+--------------------------------+-----------------------------------------------+
303303
| Operation | Result |
304304
+================================+===============================================+
305-
| ``t1 = t2 + t3`` | Sum of *t2* and *t3*. Afterwards *t1*-*t2* == |
306-
| | *t3* and *t1*-*t3* == *t2* are true. (1) |
305+
| ``t1 = t2 + t3`` | Sum of ``t2`` and ``t3``. |
306+
| | Afterwards ``t1 - t2 == t3`` and |
307+
| | ``t1 - t3 == t2`` are true. (1) |
307308
+--------------------------------+-----------------------------------------------+
308-
| ``t1 = t2 - t3`` | Difference of *t2* and *t3*. Afterwards *t1* |
309-
| | == *t2* - *t3* and *t2* == *t1* + *t3* are |
309+
| ``t1 = t2 - t3`` | Difference of ``t2`` and ``t3``. Afterwards |
310+
| | ``t1 == t2 - t3`` and ``t2 == t1 + t3`` are |
310311
| | true. (1)(6) |
311312
+--------------------------------+-----------------------------------------------+
312313
| ``t1 = t2 * i or t1 = i * t2`` | Delta multiplied by an integer. |
313-
| | Afterwards *t1* // i == *t2* is true, |
314+
| | Afterwards ``t1 // i == t2`` is true, |
314315
| | provided ``i != 0``. |
315316
+--------------------------------+-----------------------------------------------+
316-
| | In general, *t1* \* i == *t1* \* (i-1) + *t1* |
317+
| | In general, ``t1 * i == t1 * (i-1) + t1`` |
317318
| | is true. (1) |
318319
+--------------------------------+-----------------------------------------------+
319320
| ``t1 = t2 * f or t1 = f * t2`` | Delta multiplied by a float. The result is |
320321
| | rounded to the nearest multiple of |
321322
| | timedelta.resolution using round-half-to-even.|
322323
+--------------------------------+-----------------------------------------------+
323-
| ``f = t2 / t3`` | Division (3) of overall duration *t2* by |
324-
| | interval unit *t3*. Returns a :class:`float` |
324+
| ``f = t2 / t3`` | Division (3) of overall duration ``t2`` by |
325+
| | interval unit ``t3``. Returns a :class:`float`|
325326
| | object. |
326327
+--------------------------------+-----------------------------------------------+
327328
| ``t1 = t2 / f or t1 = t2 / i`` | Delta divided by a float or an int. The result|
@@ -343,13 +344,12 @@ Supported operations:
343344
| ``+t1`` | Returns a :class:`timedelta` object with the |
344345
| | same value. (2) |
345346
+--------------------------------+-----------------------------------------------+
346-
| ``-t1`` | equivalent to |
347-
| | :class:`timedelta`\ (-*t1.days*, |
348-
| | -*t1.seconds*, -*t1.microseconds*), |
349-
| | and to *t1*\* -1. (1)(4) |
347+
| ``-t1`` | Equivalent to ``timedelta(-t1.days, |
348+
| | -t1.seconds*, -t1.microseconds)``, |
349+
| | and to ``t1 * -1``. (1)(4) |
350350
+--------------------------------+-----------------------------------------------+
351-
| ``abs(t)`` | equivalent to +\ *t* when ``t.days >= 0``, |
352-
| | and to -*t* when ``t.days < 0``. (2) |
351+
| ``abs(t)`` | Equivalent to ``+t`` when ``t.days >= 0``, |
352+
| | and to ``-t`` when ``t.days < 0``. (2) |
353353
+--------------------------------+-----------------------------------------------+
354354
| ``str(t)`` | Returns a string in the form |
355355
| | ``[D day[s], ][H]H:MM:SS[.UUUUUU]``, where D |
@@ -370,10 +370,10 @@ Notes:
370370
This is exact and cannot overflow.
371371

372372
(3)
373-
Division by 0 raises :exc:`ZeroDivisionError`.
373+
Division by zero raises :exc:`ZeroDivisionError`.
374374

375375
(4)
376-
-*timedelta.max* is not representable as a :class:`timedelta` object.
376+
``-timedelta.max`` is not representable as a :class:`timedelta` object.
377377

378378
(5)
379379
String representations of :class:`timedelta` objects are normalized
@@ -583,10 +583,10 @@ Supported operations:
583583
+-------------------------------+----------------------------------------------+
584584
| Operation | Result |
585585
+===============================+==============================================+
586-
| ``date2 = date1 + timedelta`` | *date2* will be ``timedelta.days`` days |
587-
| | after *date1*. (1) |
586+
| ``date2 = date1 + timedelta`` | ``date2`` will be ``timedelta.days`` days |
587+
| | after ``date1``. (1) |
588588
+-------------------------------+----------------------------------------------+
589-
| ``date2 = date1 - timedelta`` | Computes *date2* such that ``date2 + |
589+
| ``date2 = date1 - timedelta`` | Computes ``date2`` such that ``date2 + |
590590
| | timedelta == date1``. (2) |
591591
+-------------------------------+----------------------------------------------+
592592
| ``timedelta = date1 - date2`` | \(3) |
@@ -613,8 +613,8 @@ Notes:
613613
``timedelta.seconds`` and ``timedelta.microseconds`` are ignored.
614614

615615
(3)
616-
This is exact, and cannot overflow. timedelta.seconds and
617-
timedelta.microseconds are 0, and date2 + timedelta == date1 after.
616+
This is exact, and cannot overflow. ``timedelta.seconds`` and
617+
``timedelta.microseconds`` are 0, and ``date2 + timedelta == date1`` after.
618618

619619
(4)
620620
:class:`date` objects are equal if they represent the same date.
@@ -652,7 +652,7 @@ Instance methods:
652652
time.struct_time((d.year, d.month, d.day, 0, 0, 0, d.weekday(), yday, -1))
653653

654654
where ``yday = d.toordinal() - date(d.year, 1, 1).toordinal() + 1``
655-
is the day number within the current year starting with ``1`` for January 1st.
655+
is the day number within the current year starting with 1 for January 1st.
656656

657657

658658
.. method:: date.toordinal()
@@ -972,8 +972,8 @@ Other constructors, all class methods:
972972
.. classmethod:: datetime.fromordinal(ordinal)
973973

974974
Return the :class:`.datetime` corresponding to the proleptic Gregorian ordinal,
975-
where January 1 of year 1 has ordinal 1. :exc:`ValueError` is raised unless ``1
976-
<= ordinal <= datetime.max.toordinal()``. The hour, minute, second and
975+
where January 1 of year 1 has ordinal 1. :exc:`ValueError` is raised unless
976+
``1 <= ordinal <= datetime.max.toordinal()``. The hour, minute, second and
977977
microsecond of the result are all 0, and :attr:`.tzinfo` is ``None``.
978978

979979

@@ -1130,8 +1130,8 @@ Instance attributes (read-only):
11301130
In ``[0, 1]``. Used to disambiguate wall times during a repeated interval. (A
11311131
repeated interval occurs when clocks are rolled back at the end of daylight saving
11321132
time or when the UTC offset for the current zone is decreased for political reasons.)
1133-
The value 0 (1) represents the earlier (later) of the two moments with the same wall
1134-
time representation.
1133+
The values 0 and 1 represent, respectively, the earlier and later of the two
1134+
moments with the same wall time representation.
11351135

11361136
.. versionadded:: 3.6
11371137

@@ -1156,16 +1156,16 @@ Supported operations:
11561156
+---------------------------------------+--------------------------------+
11571157

11581158
(1)
1159-
datetime2 is a duration of timedelta removed from datetime1, moving forward in
1160-
time if ``timedelta.days`` > 0, or backward if ``timedelta.days`` < 0. The
1159+
``datetime2`` is a duration of ``timedelta`` removed from ``datetime1``, moving forward in
1160+
time if ``timedelta.days > 0``, or backward if ``timedelta.days < 0``. The
11611161
result has the same :attr:`~.datetime.tzinfo` attribute as the input datetime, and
1162-
datetime2 - datetime1 == timedelta after. :exc:`OverflowError` is raised if
1163-
datetime2.year would be smaller than :const:`MINYEAR` or larger than
1162+
``datetime2 - datetime1 == timedelta`` after. :exc:`OverflowError` is raised if
1163+
``datetime2.year`` would be smaller than :const:`MINYEAR` or larger than
11641164
:const:`MAXYEAR`. Note that no time zone adjustments are done even if the
11651165
input is an aware object.
11661166

11671167
(2)
1168-
Computes the datetime2 such that datetime2 + timedelta == datetime1. As for
1168+
Computes the ``datetime2`` such that ``datetime2 + timedelta == datetime1``. As for
11691169
addition, the result has the same :attr:`~.datetime.tzinfo` attribute as the input
11701170
datetime, and no time zone adjustments are done even if the input is aware.
11711171

@@ -1343,12 +1343,12 @@ Instance methods:
13431343
d.weekday(), yday, dst))
13441344

13451345
where ``yday = d.toordinal() - date(d.year, 1, 1).toordinal() + 1``
1346-
is the day number within the current year starting with ``1`` for January
1346+
is the day number within the current year starting with 1 for January
13471347
1st. The :attr:`~time.struct_time.tm_isdst` flag of the result is set according to the
13481348
:meth:`dst` method: :attr:`.tzinfo` is ``None`` or :meth:`dst` returns
13491349
``None``, :attr:`!tm_isdst` is set to ``-1``; else if :meth:`dst` returns a
1350-
non-zero value, :attr:`!tm_isdst` is set to ``1``; else :attr:`!tm_isdst` is
1351-
set to ``0``.
1350+
non-zero value, :attr:`!tm_isdst` is set to 1; else :attr:`!tm_isdst` is
1351+
set to 0.
13521352

13531353

13541354
.. method:: datetime.utctimetuple()
@@ -1360,7 +1360,7 @@ Instance methods:
13601360
If *d* is aware, *d* is normalized to UTC time, by subtracting
13611361
``d.utcoffset()``, and a :class:`time.struct_time` for the
13621362
normalized time is returned. :attr:`!tm_isdst` is forced to 0. Note
1363-
that an :exc:`OverflowError` may be raised if *d*.year was
1363+
that an :exc:`OverflowError` may be raised if ``d.year`` was
13641364
``MINYEAR`` or ``MAXYEAR`` and UTC adjustment spills over a year
13651365
boundary.
13661366

@@ -1691,7 +1691,7 @@ day, and subject to adjustment via a :class:`tzinfo` object.
16911691
* ``fold in [0, 1]``.
16921692

16931693
If an argument outside those ranges is given, :exc:`ValueError` is raised. All
1694-
default to ``0`` except *tzinfo*, which defaults to :const:`None`.
1694+
default to 0 except *tzinfo*, which defaults to :const:`None`.
16951695

16961696
Class attributes:
16971697

@@ -1746,8 +1746,8 @@ Instance attributes (read-only):
17461746
In ``[0, 1]``. Used to disambiguate wall times during a repeated interval. (A
17471747
repeated interval occurs when clocks are rolled back at the end of daylight saving
17481748
time or when the UTC offset for the current zone is decreased for political reasons.)
1749-
The value 0 (1) represents the earlier (later) of the two moments with the same wall
1750-
time representation.
1749+
The values 0 and 1 represent, respectively, the earlier and later of the two
1750+
moments with the same wall time representation.
17511751

17521752
.. versionadded:: 3.6
17531753

@@ -2036,7 +2036,7 @@ Examples of working with a :class:`.time` object::
20362036
``tz.utcoffset(dt) - tz.dst(dt)``
20372037

20382038
must return the same result for every :class:`.datetime` *dt* with ``dt.tzinfo ==
2039-
tz`` For sane :class:`tzinfo` subclasses, this expression yields the time
2039+
tz``. For sane :class:`tzinfo` subclasses, this expression yields the time
20402040
zone's "standard offset", which should not depend on the date or the time, but
20412041
only on geographic location. The implementation of :meth:`datetime.astimezone`
20422042
relies on this, but cannot detect violations; it's the programmer's
@@ -2073,7 +2073,7 @@ Examples of working with a :class:`.time` object::
20732073
Return the time zone name corresponding to the :class:`.datetime` object *dt*, as
20742074
a string. Nothing about string names is defined by the :mod:`!datetime` module,
20752075
and there's no requirement that it mean anything in particular. For example,
2076-
"GMT", "UTC", "-500", "-5:00", "EDT", "US/Eastern", "America/New York" are all
2076+
``"GMT"``, ``"UTC"``, ``"-500"``, ``"-5:00"``, ``"EDT"``, ``"US/Eastern"``, ``"America/New York"`` are all
20772077
valid replies. Return ``None`` if a string name isn't known. Note that this is
20782078
a method rather than a fixed string primarily because some :class:`tzinfo`
20792079
subclasses will wish to return different names depending on the specific value
@@ -2514,11 +2514,11 @@ information, which are supported in ``datetime.strptime`` but are discarded by
25142514

25152515
For :class:`.time` objects, the format codes for year, month, and day should not
25162516
be used, as :class:`!time` objects have no such values. If they're used anyway,
2517-
``1900`` is substituted for the year, and ``1`` for the month and day.
2517+
``1900`` is substituted for the year, and 1 for the month and day.
25182518

25192519
For :class:`date` objects, the format codes for hours, minutes, seconds, and
25202520
microseconds should not be used, as :class:`date` objects have no such
2521-
values. If they're used anyway, ``0`` is substituted for them.
2521+
values. If they're used anyway, 0 is substituted for them.
25222522

25232523
For the same reason, handling of format strings containing Unicode code points
25242524
that can't be represented in the charset of the current locale is also

0 commit comments

Comments
 (0)