Commit9cdb642

authored

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

1 parent09edde9 commit9cdb642Copy full SHA for 9cdb642

File tree

+18

-5

lines changed

+18

-5

lines changed

Lines changed: 4 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1553,8 +1553,7 @@ def fromisoformat(cls, time_string):`
`1553`	`1553`	`exceptException:`
`1554`	`1554`	`raiseValueError(f'Invalid isoformat string:{time_string!r}')`
`1555`	`1555`
`1556`		`-`
`1557`		`-defstrftime(self,fmt):`
	`1556`	`+defstrftime(self,format):`
`1558`	`1557`	`"""Format using strftime(). The date part of the timestamp passed`
`1559`	`1558`	`to underlying strftime should not be used.`
`1560`	`1559`	`"""`
`@@ -1563,7 +1562,7 @@ def strftime(self, fmt):`
`1563`	`1562`	`timetuple= (1900,1,1,`
`1564`	`1563`	`self._hour,self._minute,self._second,`
`1565`	`1564`	`0,1,-1)`
`1566`		`-return_wrap_strftime(self,fmt,timetuple)`
	`1565`	`+return_wrap_strftime(self,format,timetuple)`
`1567`	`1566`
`1568`	`1567`	`def__format__(self,fmt):`
`1569`	`1568`	`ifnotisinstance(fmt,str):`
`@@ -1787,14 +1786,14 @@ def _fromtimestamp(cls, t, utc, tz):`
`1787`	`1786`	`returnresult`
`1788`	`1787`
`1789`	`1788`	`@classmethod`
`1790`		`-deffromtimestamp(cls,t,tz=None):`
	`1789`	`+deffromtimestamp(cls,timestamp,tz=None):`
`1791`	`1790`	`"""Construct a datetime from a POSIX timestamp (like time.time()).`
`1792`	`1791`
`1793`	`1792`	`A timezone info object may be passed in as well.`
`1794`	`1793`	`"""`
`1795`	`1794`	`_check_tzinfo_arg(tz)`
`1796`	`1795`
`1797`		`-returncls._fromtimestamp(t,tzisnotNone,tz)`
	`1796`	`+returncls._fromtimestamp(timestamp,tzisnotNone,tz)`
`1798`	`1797`
`1799`	`1798`	`@classmethod`
`1800`	`1799`	`defutcfromtimestamp(cls,t):`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2426,6 +2426,12 @@ def test_fromtimestamp(self):`
`2426`	`2426`	`got=self.theclass.fromtimestamp(ts)`
`2427`	`2427`	`self.verify_field_equality(expected,got)`
`2428`	`2428`
	`2429`	`+deftest_fromtimestamp_keyword_arg(self):`
	`2430`	`+importtime`
	`2431`	`+`
	`2432`	`+# gh-85432: The parameter was named "t" in the pure-Python impl.`
	`2433`	`+self.theclass.fromtimestamp(timestamp=time.time())`
	`2434`	`+`
`2429`	`2435`	`deftest_utcfromtimestamp(self):`
`2430`	`2436`	`importtime`
`2431`	`2437`
`@@ -3528,6 +3534,9 @@ def test_strftime(self):`
`3528`	`3534`	`exceptUnicodeEncodeError:`
`3529`	`3535`	`pass`
`3530`	`3536`
	`3537`	`+# gh-85432: The parameter was named "fmt" in the pure-Python impl.`
	`3538`	`+t.strftime(format="%f")`
	`3539`	`+`
`3531`	`3540`	`deftest_format(self):`
`3532`	`3541`	`t=self.theclass(1,2,3,4)`
`3533`	`3542`	`self.assertEqual(t.__format__(''),str(t))`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,5 @@`
	`1`	`+Rename the fmt parameter of the pure-Python implementation of`
	`2`	+:meth:`datetime.time.strftime` to format. Rename the t parameter of
	`3`	+:meth:`datetime.datetime.fromtimestamp` to timestamp. These changes mean
	`4`	`+the parameter names in the pure-Python implementation now match the`
	`5`	`+parameter names in the C implementation. Patch by Alex Waygood.`

Comments

(0)