@@ -48,7 +48,7 @@ Aware and Naive Objects
48
48
-----------------------
49
49
50
50
Date and time objects may be categorized as "aware" or "naive" depending on
51
- whether or not they include timezone information.
51
+ whether or not they include time zone information.
52
52
53
53
With sufficient knowledge of applicable algorithmic and political time
54
54
adjustments, such as time zone and daylight saving time information,
@@ -58,7 +58,7 @@ interpretation. [#]_
58
58
59
59
A **naive ** object does not contain enough information to unambiguously locate
60
60
itself relative to other date/time objects. Whether a naive object represents
61
- Coordinated Universal Time (UTC), local time, or time in some other timezone is
61
+ Coordinated Universal Time (UTC), local time, or time in some other time zone is
62
62
purely up to the program, just like it is up to the program whether a
63
63
particular number represents metres, miles, or mass. Naive objects are easy to
64
64
understand and to work with, at the cost of ignoring some aspects of reality.
@@ -70,9 +70,9 @@ These :class:`tzinfo` objects capture information about the offset from UTC
70
70
time, the time zone name, and whether daylight saving time is in effect.
71
71
72
72
Only one concrete :class: `tzinfo ` class, the :class: `timezone ` class, is
73
- supplied by the :mod: `!datetime ` module. The :class: `timezone ` class can
74
- represent simple timezones with fixed offsets from UTC, such as UTC itself or
75
- North American EST and EDT timezones . Supporting timezones at deeper levels of
73
+ supplied by the :mod: `!datetime ` module. The :class: `! timezone ` class can
74
+ represent simple time zones with fixed offsets from UTC, such as UTC itself or
75
+ North American EST and EDT time zones . Supporting time zones at deeper levels of
76
76
detail is up to the application. The rules for time adjustment across the
77
77
world are more political than rational, change frequently, and there is no
78
78
standard suitable for every application aside from UTC.
@@ -95,7 +95,7 @@ The :mod:`!datetime` module exports the following constants:
95
95
96
96
.. attribute :: UTC
97
97
98
- Alias for the UTC timezone singleton :attr: `datetime.timezone.utc `.
98
+ Alias for the UTC time zone singleton :attr: `datetime.timezone.utc `.
99
99
100
100
.. versionadded :: 3.11
101
101
@@ -869,7 +869,7 @@ Other constructors, all class methods:
869
869
870
870
.. classmethod :: datetime.today()
871
871
872
- Return the current local datetime , with :attr: `.tzinfo ` ``None ``.
872
+ Return the current local date and time , with :attr: `.tzinfo ` ``None ``.
873
873
874
874
Equivalent to::
875
875
@@ -1070,7 +1070,7 @@ Other constructors, all class methods:
1070
1070
Return a :class: `.datetime ` corresponding to *date_string *, parsed according to
1071
1071
*format *.
1072
1072
1073
- If *format * does not contain microseconds or timezone information, this is equivalent to::
1073
+ If *format * does not contain microseconds or time zone information, this is equivalent to::
1074
1074
1075
1075
datetime(*(time.strptime(date_string, format)[0:6]))
1076
1076
@@ -1311,22 +1311,22 @@ Instance methods:
1311
1311
1312
1312
If provided, *tz * must be an instance of a :class: `tzinfo ` subclass, and its
1313
1313
:meth: `utcoffset ` and :meth: `dst ` methods must not return ``None ``. If *self *
1314
- is naive, it is presumed to represent time in the system timezone .
1314
+ is naive, it is presumed to represent time in the system time zone .
1315
1315
1316
1316
If called without arguments (or with ``tz=None ``) the system local
1317
- timezone is assumed for the target timezone . The ``.tzinfo `` attribute of the converted
1317
+ time zone is assumed for the target time zone . The ``.tzinfo `` attribute of the converted
1318
1318
datetime instance will be set to an instance of :class: `timezone `
1319
1319
with the zone name and offset obtained from the OS.
1320
1320
1321
1321
If ``self.tzinfo `` is *tz *, ``self.astimezone(tz) `` is equal to *self *: no
1322
1322
adjustment of date or time data is performed. Else the result is local
1323
- time in the timezone *tz *, representing the same UTC time as *self *: after
1323
+ time in the time zone *tz *, representing the same UTC time as *self *: after
1324
1324
``astz = dt.astimezone(tz) ``, ``astz - astz.utcoffset() `` will have
1325
1325
the same date and time data as ``dt - dt.utcoffset() ``.
1326
1326
1327
- If you merely want to attach a time zone object *tz * to a datetime *dt * without
1327
+ If you merely want to attach a :class: ` timezone ` object *tz * to a datetime *dt * without
1328
1328
adjustment of date and time data, use ``dt.replace(tzinfo=tz) ``. If you
1329
- merely want to remove the time zone object from an aware datetime *dt * without
1329
+ merely want to remove the :class: ` !timezone ` object from an aware datetime *dt * without
1330
1330
conversion of date and time data, use ``dt.replace(tzinfo=None) ``.
1331
1331
1332
1332
Note that the default :meth: `tzinfo.fromutc ` method can be overridden in a
@@ -1336,7 +1336,7 @@ Instance methods:
1336
1336
def astimezone(self, tz):
1337
1337
if self.tzinfo is tz:
1338
1338
return self
1339
- # Convert self to UTC, and attach the new time zone object.
1339
+ # Convert self to UTC, and attach the new timezone object.
1340
1340
utc = (self - self.utcoffset()).replace(tzinfo=tz)
1341
1341
# Convert from UTC to tz's local time.
1342
1342
return tz.fromutc(utc)
@@ -1450,7 +1450,7 @@ Instance methods:
1450
1450
1451
1451
There is no method to obtain the POSIX timestamp directly from a
1452
1452
naive :class: `.datetime ` instance representing UTC time. If your
1453
- application uses this convention and your system timezone is not
1453
+ application uses this convention and your system time zone is not
1454
1454
set to UTC, you can obtain the POSIX timestamp by supplying
1455
1455
``tzinfo=timezone.utc ``::
1456
1456
@@ -2021,7 +2021,7 @@ Examples of working with a :class:`.time` object::
2021
2021
supply implementations of the standard :class: `tzinfo ` methods needed by the
2022
2022
:class: `.datetime ` methods you use. The :mod: `!datetime ` module provides
2023
2023
:class: `timezone `, a simple concrete subclass of :class: `tzinfo ` which can
2024
- represent timezones with fixed offset from UTC such as UTC itself or North
2024
+ represent time zones with fixed offset from UTC such as UTC itself or North
2025
2025
American EST and EDT.
2026
2026
2027
2027
Special requirement for pickling: A :class: `tzinfo ` subclass must have an
@@ -2146,7 +2146,7 @@ When a :class:`.datetime` object is passed in response to a :class:`.datetime`
2146
2146
method, ``dt.tzinfo `` is the same object as *self *. :class: `tzinfo ` methods can
2147
2147
rely on this, unless user code calls :class: `tzinfo ` methods directly. The
2148
2148
intent is that the :class: `tzinfo ` methods interpret *dt * as being in local
2149
- time, and not need worry about objects in other timezones .
2149
+ time, and not need worry about objects in other time zones .
2150
2150
2151
2151
There is one more :class: `tzinfo ` method that a subclass may wish to override:
2152
2152
@@ -2263,12 +2263,12 @@ only EST (fixed offset -5 hours), or only EDT (fixed offset -4 hours)).
2263
2263
:mod: `zoneinfo `
2264
2264
The :mod: `!datetime ` module has a basic :class: `timezone ` class (for
2265
2265
handling arbitrary fixed offsets from UTC) and its :attr: `timezone.utc `
2266
- attribute (a UTC timezone instance).
2266
+ attribute (a UTC :class: ` ! timezone` instance).
2267
2267
2268
- ``zoneinfo `` brings the *IANA timezone database * (also known as the Olson
2268
+ ``zoneinfo `` brings the *IANA time zone database * (also known as the Olson
2269
2269
database) to Python, and its usage is recommended.
2270
2270
2271
- `IANA timezone database <https://www.iana.org/time-zones >`_
2271
+ `IANA time zone database <https://www.iana.org/time-zones >`_
2272
2272
The Time Zone Database (often called tz, tzdata or zoneinfo) contains code
2273
2273
and data that represent the history of local time for many representative
2274
2274
locations around the globe. It is updated periodically to reflect changes
@@ -2282,10 +2282,10 @@ only EST (fixed offset -5 hours), or only EDT (fixed offset -4 hours)).
2282
2282
-------------------------
2283
2283
2284
2284
The :class: `timezone ` class is a subclass of :class: `tzinfo `, each
2285
- instance of which represents a timezone defined by a fixed offset from
2285
+ instance of which represents a time zone defined by a fixed offset from
2286
2286
UTC.
2287
2287
2288
- Objects of this class cannot be used to represent timezone information in the
2288
+ Objects of this class cannot be used to represent time zone information in the
2289
2289
locations where different offsets are used in different days of the year or
2290
2290
where historical changes have been made to civil time.
2291
2291
@@ -2346,7 +2346,7 @@ Class attributes:
2346
2346
2347
2347
.. attribute :: timezone.utc
2348
2348
2349
- The UTC timezone , ``timezone(timedelta(0)) ``.
2349
+ The UTC time zone , ``timezone(timedelta(0)) ``.
2350
2350
2351
2351
2352
2352
.. index ::
@@ -2555,7 +2555,7 @@ Using ``datetime.strptime(date_string, format)`` is equivalent to::
2555
2555
2556
2556
datetime(*(time.strptime(date_string, format)[0:6]))
2557
2557
2558
- except when the format includes sub-second components or timezone offset
2558
+ except when the format includes sub-second components or time zone offset
2559
2559
information, which are supported in ``datetime.strptime `` but are discarded by
2560
2560
``time.strptime ``.
2561
2561
0 commit comments