Skip to content

Commit d8a87d3

Browse files
gkevinzhenggcf-owl-bot[bot]
gkevinzheng
and
gcf-owl-bot[bot]
authored
fix: Fixed DeprecationWarning for datetime objects for Python 3.12 (#824)
* fix: Fixed DeprecationWarning for datetime objects for Python 3.12 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent 11de952 commit d8a87d3

5 files changed

Lines changed: 13 additions & 15 deletions

File tree

‎packages/google-cloud-logging/google/cloud/logging_v2/handlers/transports/background_thread.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,9 @@ def enqueue(self, record, message, **kwargs):
240240
queue_entry = {
241241
"message": message,
242242
"severity": _helpers._normalize_severity(record.levelno),
243-
"timestamp": datetime.datetime.utcfromtimestamp(record.created),
243+
"timestamp": datetime.datetime.fromtimestamp(
244+
record.created, datetime.timezone.utc
245+
),
244246
}
245247
queue_entry.update(kwargs)
246248
self._queue.put_nowait(queue_entry)

‎packages/google-cloud-logging/pytest.ini‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@ filterwarnings =
1313
ignore:datetime.datetime.utcfromtimestamp\(\) is deprecated:DeprecationWarning:proto.datetime_helpers
1414
# Remove once release PR https://github.com/googleapis/python-api-core/pull/555 is merged
1515
ignore:datetime.datetime.utcnow\(\) is deprecated:DeprecationWarning:google.api_core.datetime_helpers
16-
# Remove once https://github.com/googleapis/python-logging/issues/818 is fixed
17-
ignore:datetime.datetime.utcfromtimestamp\(\) is deprecated:DeprecationWarning:google.cloud.logging_v2.handlers.transports
18-
ignore:datetime.datetime.utcnow\(\) is deprecated:DeprecationWarning:tests.unit.test__http
19-
ignore:datetime.datetime.utcnow\(\) is deprecated:DeprecationWarning:tests.unit.test_entries
2016
# Remove once a version of grpcio newer than 1.59.3 is released to PyPI
2117
ignore:datetime.datetime.utcnow\(\) is deprecated:DeprecationWarning:grpc._channel
2218
# Remove after support for Python 3.7 is dropped

‎packages/google-cloud-logging/tests/system/test_system.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ def test_log_text_with_timestamp(self):
336336
text_payload = "System test: test_log_text_with_timestamp"
337337
gapic_logger = Config.CLIENT.logger(self._logger_name("log_text_ts"))
338338
http_logger = Config.HTTP_CLIENT.logger(self._logger_name("log_text_ts_http"))
339-
now = datetime.utcnow()
339+
now = datetime.now(timezone.utc)
340340
loggers = (
341341
[gapic_logger]
342342
if Config.use_mtls == "always"
@@ -356,7 +356,7 @@ def test_log_text_with_resource(self):
356356

357357
gapic_logger = Config.CLIENT.logger(self._logger_name("log_text_res"))
358358
http_logger = Config.HTTP_CLIENT.logger(self._logger_name("log_text_res_http"))
359-
now = datetime.utcnow()
359+
now = datetime.now(timezone.utc)
360360
loggers = (
361361
[gapic_logger]
362362
if Config.use_mtls == "always"

‎packages/google-cloud-logging/tests/unit/test__http.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,9 @@ def test_ctor(self):
122122
@staticmethod
123123
def _make_timestamp():
124124
import datetime
125-
from google.cloud._helpers import UTC
125+
from datetime import timezone
126126

127-
NOW = datetime.datetime.utcnow().replace(tzinfo=UTC)
127+
NOW = datetime.datetime.now(timezone.utc)
128128
return NOW, _datetime_to_rfc3339_w_nanos(NOW)
129129

130130
def test_list_entries_with_limits(self):

‎packages/google-cloud-logging/tests/unit/test_entries.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -200,14 +200,14 @@ def test_from_api_repr_missing_data_no_loggers(self):
200200

201201
def test_from_api_repr_w_loggers_no_logger_match(self):
202202
from datetime import datetime
203-
from google.cloud._helpers import UTC
203+
from datetime import timezone
204204
from google.cloud.logging import Resource
205205

206206
klass = self._get_target_class()
207207
client = _Client(self.PROJECT)
208208
SEVERITY = "CRITICAL"
209209
IID = "IID"
210-
NOW = datetime.utcnow().replace(tzinfo=UTC)
210+
NOW = datetime.now(timezone.utc)
211211
TIMESTAMP = _datetime_to_rfc3339_w_nanos(NOW)
212212
LOG_NAME = "projects/%s/logs/%s" % (self.PROJECT, self.LOGGER_NAME)
213213
LABELS = {"foo": "bar", "baz": "qux"}
@@ -283,11 +283,11 @@ def test_from_api_repr_w_loggers_no_logger_match(self):
283283
def test_from_api_repr_w_loggers_w_logger_match(self):
284284
from datetime import datetime
285285
from datetime import timedelta
286-
from google.cloud._helpers import UTC
286+
from datetime import timezone
287287

288288
client = _Client(self.PROJECT)
289289
IID = "IID"
290-
NOW = datetime.utcnow().replace(tzinfo=UTC)
290+
NOW = datetime.now(timezone.utc)
291291
LATER = NOW + timedelta(seconds=1)
292292
TIMESTAMP = _datetime_to_rfc3339_w_nanos(NOW)
293293
RECEIVED = _datetime_to_rfc3339_w_nanos(LATER)
@@ -341,11 +341,11 @@ def test_from_api_repr_w_loggers_w_logger_match(self):
341341
def test_from_api_repr_w_folder_path(self):
342342
from datetime import datetime
343343
from datetime import timedelta
344-
from google.cloud._helpers import UTC
344+
from datetime import timezone
345345

346346
client = _Client(self.PROJECT)
347347
IID = "IID"
348-
NOW = datetime.utcnow().replace(tzinfo=UTC)
348+
NOW = datetime.now(timezone.utc)
349349
LATER = NOW + timedelta(seconds=1)
350350
TIMESTAMP = _datetime_to_rfc3339_w_nanos(NOW)
351351
RECEIVED = _datetime_to_rfc3339_w_nanos(LATER)

0 commit comments

Comments
 (0)