mirror of
https://github.com/sphinx-doc/sphinx.git
synced 2025-02-25 18:55:22 -06:00
Merge pull request #6529 from tk0miya/6528_aware_datetime
format_date(): use "aware" local datetime by default (refs: #6528)
This commit is contained in:
commit
db77706c7a
@ -12,7 +12,7 @@ import os
|
|||||||
import re
|
import re
|
||||||
import warnings
|
import warnings
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
from datetime import datetime
|
from datetime import datetime, timezone
|
||||||
from os import path
|
from os import path
|
||||||
from typing import Callable, Generator, List, Set, Tuple
|
from typing import Callable, Generator, List, Set, Tuple
|
||||||
|
|
||||||
@ -274,7 +274,7 @@ def format_date(format: str, date: datetime = None, language: str = None) -> str
|
|||||||
if source_date_epoch is not None:
|
if source_date_epoch is not None:
|
||||||
date = datetime.utcfromtimestamp(float(source_date_epoch))
|
date = datetime.utcfromtimestamp(float(source_date_epoch))
|
||||||
else:
|
else:
|
||||||
date = datetime.utcnow()
|
date = datetime.now(timezone.utc).astimezone()
|
||||||
|
|
||||||
result = []
|
result = []
|
||||||
tokens = date_format_re.split(format)
|
tokens = date_format_re.split(format)
|
||||||
|
Loading…
Reference in New Issue
Block a user