mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

gh-85432: Harmonise parameter names between C and pure-Python implementations of datetime.time.strftime, datetime.datetime.fromtimestamp (#99993)

Browse source
This commit is contained in:
Alex Waygood 2022-12-22 21:57:18 +00:00 • committed by GitHub
parent 09edde95f4
commit 9cdb642997
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Lib/datetime.py
View file

@ -1553,8 +1553,7 @@ class time:
except Exception:
raise ValueError(f'Invalid isoformat string: {time_string!r}')
def strftime(self, fmt):
def strftime(self, format):
"""Format using strftime(). The date part of the timestamp passed
to underlying strftime should not be used.
"""
@ -1563,7 +1562,7 @@ class time:
timetuple = (1900, 1, 1,
self._hour, self._minute, self._second,
0, 1, -1)
return _wrap_strftime(self, fmt, timetuple)
return _wrap_strftime(self, format, timetuple)
def __format__(self, fmt):
if not isinstance(fmt, str):
@ -1787,14 +1786,14 @@ class datetime(date):
return result
@classmethod
def fromtimestamp(cls, t, tz=None):
def fromtimestamp(cls, timestamp, tz=None):
"""Construct a datetime from a POSIX timestamp (like time.time()).
A timezone info object may be passed in as well.
"""
_check_tzinfo_arg(tz)
return cls._fromtimestamp(t, tz is not None, tz)
return cls._fromtimestamp(timestamp, tz is not None, tz)
@classmethod
def utcfromtimestamp(cls, t):