Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit92c735f

Browse files
authored
Merge pull request#107 from donbowman/fix-tz
2 parents2b42568 +81ca2f7 commit92c735f

File tree

6 files changed

+11
-8
lines changed

6 files changed

+11
-8
lines changed

‎.github/workflows/code_quality.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636

3737
strategy:
3838
matrix:
39-
python-version:["3.7", "3.8", "3.9"]
39+
python-version:["3.9", "3.10", "3.11", "3.12", "3.13"]
4040

4141
steps:
4242
-name:Set up Python ${{ matrix.python-version }}

‎json_logging/__init__.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ def config_root_logger():
6161
ifENABLE_JSON_LOGGING:
6262
ENABLE_JSON_LOGGING_DEBUGand_logger.debug("Update root logger to using JSONLogFormatter")
6363

64-
global_default_formatter
6564
util.update_formatter_for_loggers([logging.root],_default_formatter)
6665

6766

‎json_logging/dto.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
fromdatetimeimportdatetime
1+
fromdatetimeimportdatetime,timezone
22

33
fromjson_loggingimportutil
44

@@ -32,14 +32,14 @@ class DefaultRequestResponseDTO(RequestResponseDTOBase):
3232

3333
def__init__(self,request,**kwargs):
3434
super(DefaultRequestResponseDTO,self).__init__(request,**kwargs)
35-
utcnow=datetime.utcnow()
35+
utcnow=datetime.now(timezone.utc)
3636
self._request_start=utcnow
3737
self["request_received_at"]=util.iso_time_format(utcnow)
3838

3939
# noinspection PyAttributeOutsideInit
4040
defon_request_complete(self,response):
4141
super(DefaultRequestResponseDTO,self).on_request_complete(response)
42-
utcnow=datetime.utcnow()
42+
utcnow=datetime.now(timezone.utc)
4343
time_delta=utcnow-self._request_start
4444
self["response_time_ms"]=int(time_delta.total_seconds())*1000+int(time_delta.microseconds/1000)
4545
self["response_sent_at"]=util.iso_time_format(utcnow)

‎json_logging/formatters.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
importlogging
22
importsys
33
importtraceback
4-
fromdatetimeimportdatetime
4+
fromdatetimeimportdatetime,timezone
55

66
importjson_logging
77

@@ -61,7 +61,7 @@ def format(self, record):
6161
returnjson_logging.JSON_SERIALIZER(log_object)
6262

6363
def_format_log_object(self,record,request_util):
64-
utcnow=datetime.utcnow()
64+
utcnow=datetime.now(timezone.utc).replace(tzinfo=None)
6565

6666
base_obj= {
6767
"written_at":json_logging.util.iso_time_format(utcnow),

‎tests/conftest.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
"""Global fixtures and settings for the pytest test suite"""
22
importsys
33
importos
4+
fromhelpersimportconstants
45

56
# Add test helper modules to search path with out making "tests" a Python package
67
sys.path.append(os.path.join(os.path.dirname(__file__),"helpers"))
8+
9+
ifsys.version_info.major>3or (sys.version_info.major==3andsys.version_info.minor>=12):
10+
constants.STANDARD_MSG_ATTRIBUTES.add('taskName')
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
sanic
1+
sanic==20.3.0
22
requests
33
pytest
44
-e .

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp