Skip to content

Commit

Permalink
fix: Fixed DeprecationWarning for datetime objects for Python 3.12 (#824
Browse files Browse the repository at this point in the history
)

* 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>
  • Loading branch information
gkevinzheng and gcf-owl-bot[bot] authored Dec 8, 2023
1 parent af76e38 commit 2384981
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,9 @@ def enqueue(self, record, message, **kwargs):
queue_entry = {
"message": message,
"severity": _helpers._normalize_severity(record.levelno),
"timestamp": datetime.datetime.utcfromtimestamp(record.created),
"timestamp": datetime.datetime.fromtimestamp(
record.created, datetime.timezone.utc
),
}
queue_entry.update(kwargs)
self._queue.put_nowait(queue_entry)
Expand Down
4 changes: 0 additions & 4 deletions pytest.ini
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@ filterwarnings =
ignore:datetime.datetime.utcfromtimestamp\(\) is deprecated:DeprecationWarning:proto.datetime_helpers
# Remove once release PR https://github.com/googleapis/python-api-core/pull/555 is merged
ignore:datetime.datetime.utcnow\(\) is deprecated:DeprecationWarning:google.api_core.datetime_helpers
# Remove once https://github.com/googleapis/python-logging/issues/818 is fixed
ignore:datetime.datetime.utcfromtimestamp\(\) is deprecated:DeprecationWarning:google.cloud.logging_v2.handlers.transports
ignore:datetime.datetime.utcnow\(\) is deprecated:DeprecationWarning:tests.unit.test__http
ignore:datetime.datetime.utcnow\(\) is deprecated:DeprecationWarning:tests.unit.test_entries
# Remove once a version of grpcio newer than 1.59.3 is released to PyPI
ignore:datetime.datetime.utcnow\(\) is deprecated:DeprecationWarning:grpc._channel
# Remove after support for Python 3.7 is dropped
Expand Down
4 changes: 2 additions & 2 deletions tests/system/test_system.py
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ def test_log_text_with_timestamp(self):
text_payload = "System test: test_log_text_with_timestamp"
gapic_logger = Config.CLIENT.logger(self._logger_name("log_text_ts"))
http_logger = Config.HTTP_CLIENT.logger(self._logger_name("log_text_ts_http"))
now = datetime.utcnow()
now = datetime.now(timezone.utc)
loggers = (
[gapic_logger]
if Config.use_mtls == "always"
Expand All @@ -356,7 +356,7 @@ def test_log_text_with_resource(self):

gapic_logger = Config.CLIENT.logger(self._logger_name("log_text_res"))
http_logger = Config.HTTP_CLIENT.logger(self._logger_name("log_text_res_http"))
now = datetime.utcnow()
now = datetime.now(timezone.utc)
loggers = (
[gapic_logger]
if Config.use_mtls == "always"
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/test__http.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,9 @@ def test_ctor(self):
@staticmethod
def _make_timestamp():
import datetime
from google.cloud._helpers import UTC
from datetime import timezone

NOW = datetime.datetime.utcnow().replace(tzinfo=UTC)
NOW = datetime.datetime.now(timezone.utc)
return NOW, _datetime_to_rfc3339_w_nanos(NOW)

def test_list_entries_with_limits(self):
Expand Down
12 changes: 6 additions & 6 deletions tests/unit/test_entries.py
Original file line number Diff line number Diff line change
Expand Up @@ -200,14 +200,14 @@ def test_from_api_repr_missing_data_no_loggers(self):

def test_from_api_repr_w_loggers_no_logger_match(self):
from datetime import datetime
from google.cloud._helpers import UTC
from datetime import timezone
from google.cloud.logging import Resource

klass = self._get_target_class()
client = _Client(self.PROJECT)
SEVERITY = "CRITICAL"
IID = "IID"
NOW = datetime.utcnow().replace(tzinfo=UTC)
NOW = datetime.now(timezone.utc)
TIMESTAMP = _datetime_to_rfc3339_w_nanos(NOW)
LOG_NAME = "projects/%s/logs/%s" % (self.PROJECT, self.LOGGER_NAME)
LABELS = {"foo": "bar", "baz": "qux"}
Expand Down Expand Up @@ -283,11 +283,11 @@ def test_from_api_repr_w_loggers_no_logger_match(self):
def test_from_api_repr_w_loggers_w_logger_match(self):
from datetime import datetime
from datetime import timedelta
from google.cloud._helpers import UTC
from datetime import timezone

client = _Client(self.PROJECT)
IID = "IID"
NOW = datetime.utcnow().replace(tzinfo=UTC)
NOW = datetime.now(timezone.utc)
LATER = NOW + timedelta(seconds=1)
TIMESTAMP = _datetime_to_rfc3339_w_nanos(NOW)
RECEIVED = _datetime_to_rfc3339_w_nanos(LATER)
Expand Down Expand Up @@ -341,11 +341,11 @@ def test_from_api_repr_w_loggers_w_logger_match(self):
def test_from_api_repr_w_folder_path(self):
from datetime import datetime
from datetime import timedelta
from google.cloud._helpers import UTC
from datetime import timezone

client = _Client(self.PROJECT)
IID = "IID"
NOW = datetime.utcnow().replace(tzinfo=UTC)
NOW = datetime.now(timezone.utc)
LATER = NOW + timedelta(seconds=1)
TIMESTAMP = _datetime_to_rfc3339_w_nanos(NOW)
RECEIVED = _datetime_to_rfc3339_w_nanos(LATER)
Expand Down

0 comments on commit 2384981

Please sign in to comment.