Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Only support zoneinfo for python 3.9+ #5271

Merged
merged 2 commits into from
Mar 20, 2024
Merged

Only support zoneinfo for python 3.9+ #5271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c54bc6e
Only support zoneinfo for python 3.9+
chipkent Mar 20, 2024
ff78e2b
Only support zoneinfo for python 3.9+
chipkent Mar 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions py/server/deephaven/time.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
""" This module defines functions for handling Deephaven date/time data. """

import datetime
import zoneinfo
import sys
import pytz
from typing import Union, Optional, Literal

Expand Down Expand Up @@ -186,8 +186,10 @@ def _tzinfo_to_j_time_zone(tzi: datetime.tzinfo) -> TimeZone:

# Handle zoneinfo time zones

if isinstance(tzi, zoneinfo.ZoneInfo):
return _JDateTimeUtils.parseTimeZone(tzi.key)
if sys.version_info >= (3, 9):
import zoneinfo
if isinstance(tzi, zoneinfo.ZoneInfo):
return _JDateTimeUtils.parseTimeZone(tzi.key)

# Handle constant UTC offset time zones (datetime.timezone)

Expand Down
12 changes: 7 additions & 5 deletions py/server/tests/test_time.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import unittest
from time import sleep
import datetime
import zoneinfo
import sys
import pandas as pd
import numpy as np

Expand Down Expand Up @@ -119,10 +119,12 @@ def test_to_j_time_zone(self):
to_j_time_zone(dt)
self.fail("Expected DHError")

dttz = zoneinfo.ZoneInfo("America/New_York")
dt = datetime.datetime(2022, 7, 7, 14, 21, 17, 123456, tzinfo=dttz)
self.assertEqual(to_j_time_zone(dttz), to_j_time_zone("America/New_York"))
self.assertEqual(to_j_time_zone(dt), to_j_time_zone("America/New_York"))
if sys.version_info >= (3, 9):
import zoneinfo
dttz = zoneinfo.ZoneInfo("America/New_York")
dt = datetime.datetime(2022, 7, 7, 14, 21, 17, 123456, tzinfo=dttz)
self.assertEqual(to_j_time_zone(dttz), to_j_time_zone("America/New_York"))
self.assertEqual(to_j_time_zone(dt), to_j_time_zone("America/New_York"))

with self.assertRaises(TypeError):
to_j_time_zone(False)
Expand Down
Loading