Commit fe81985

authored

Merge pull request matplotlib#25972 from meeseeksmachine/auto-backport-of-pr-25918-on-v3.7.x

Backport PR matplotlib#25918 on branch v3.7.x (migrate from utcfromtimestamp to fromtimestamp)

2 parents 48891e5 + a4e00c7 commit fe81985Copy full SHA for fe81985

File tree

+10

-7

lines changed

+10

-7

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ Removals`
`7`	`7`	`These methods convert from unix timestamps to matplotlib floats, but are not`
`8`	`8`	`used internally to Matplotlib, and should not be needed by end users. To`
`9`	`9`	`convert a unix timestamp to datetime, simply use`
`10`		-`datetime.datetime.utcfromtimestamp`, or to use NumPy `~numpy.datetime64`
	`10`	+`datetime.datetime.fromtimestamp`, or to use NumPy `~numpy.datetime64`
`11`	`11`	``dt = np.datetime64(e*1e6, 'us')``.
`12`	`12`
`13`	`13`	`Locator and Formatter wrapper methods`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`
`23`	`23`	`import matplotlib`
`24`	`24`
	`25`	`+from datetime import timezone`
`25`	`26`	`from datetime import datetime`
`26`	`27`	`import time`
`27`	`28`
`@@ -36,8 +37,8 @@`
`36`	`37`
`37`	`38`	`# Parse year using SOURCE_DATE_EPOCH, falling back to current time.`
`38`	`39`	`# https://reproducible-builds.org/specs/source-date-epoch/`
`39`		`-sourceyear = datetime.utcfromtimestamp(`
`40`		`- int(os.environ.get('SOURCE_DATE_EPOCH', time.time()))).year`
	`40`	`+sourceyear = datetime.fromtimestamp(`
	`41`	`+ int(os.environ.get('SOURCE_DATE_EPOCH', time.time())), timezone.utc).year`
`41`	`42`
`42`	`43`	`# If your extensions are in another directory, add it here. If the directory`
`43`	`44`	`# is relative to the documentation root, use os.path.abspath to make it`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`"""`
`6`	`6`
`7`	`7`	`import codecs`
	`8`	`+from datetime import timezone`
`8`	`9`	`from datetime import datetime`
`9`	`10`	`from enum import Enum`
`10`	`11`	`from functools import total_ordering`
`@@ -153,7 +154,7 @@ def _create_pdf_info_dict(backend, metadata):`
`153`	`154`	`# See https://reproducible-builds.org/specs/source-date-epoch/`
`154`	`155`	`source_date_epoch = os.getenv("SOURCE_DATE_EPOCH")`
`155`	`156`	`if source_date_epoch:`
`156`		`- source_date = datetime.utcfromtimestamp(int(source_date_epoch))`
	`157`	`+ source_date = datetime.fromtimestamp(int(source_date_epoch), timezone.utc)`
`157`	`158`	`source_date = source_date.replace(tzinfo=UTC)`
`158`	`159`	`else:`
`159`	`160`	`source_date = datetime.today()`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -841,8 +841,9 @@ def _print_ps(`
`841`	`841`	`# See https://reproducible-builds.org/specs/source-date-epoch/`
`842`	`842`	`source_date_epoch = os.getenv("SOURCE_DATE_EPOCH")`
`843`	`843`	`dsc_comments["CreationDate"] = (`
`844`		`- datetime.datetime.utcfromtimestamp(`
`845`		`- int(source_date_epoch)).strftime("%a %b %d %H:%M:%S %Y")`
	`844`	`+ datetime.datetime.fromtimestamp(`
	`845`	`+ int(source_date_epoch),`
	`846`	`+ datetime.timezone.utc).strftime("%a %b %d %H:%M:%S %Y")`
`846`	`847`	`if source_date_epoch`
`847`	`848`	`else time.ctime())`
`848`	`849`	`dsc_comments = "\n".join(`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -410,7 +410,7 @@ def _write_metadata(self, metadata):`
`410`	`410`	`# See https://reproducible-builds.org/specs/source-date-epoch/`
`411`	`411`	`date = os.getenv("SOURCE_DATE_EPOCH")`
`412`	`412`	`if date:`
`413`		`- date = datetime.datetime.utcfromtimestamp(int(date))`
	`413`	`+ date = datetime.datetime.fromtimestamp(int(date), datetime.timezone.utc)`
`414`	`414`	`metadata['Date'] = date.replace(tzinfo=UTC).isoformat()`
`415`	`415`	`else:`
`416`	`416`	`metadata['Date'] = datetime.datetime.today().isoformat()`

Comments

(0)