Skip to content

Commit 96fcc89

Browse files
committed
BUG: Pandas can't restore index from parquet with offset-specified timezone pandas-dev#35997
1 parent 1a576eb commit 96fcc89

File tree

2 files changed

+24
-2
lines changed

2 files changed

+24
-2
lines changed

pandas/_libs/tslibs/timezones.pyx

+9-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ from pytz.tzinfo import BaseTzInfo as _pytz_BaseTzInfo
1515

1616
UTC = pytz.utc
1717

18-
18+
import re
1919
import numpy as np
2020

2121
cimport numpy as cnp
@@ -103,7 +103,14 @@ cpdef inline tzinfo maybe_get_tz(object tz):
103103
if isinstance(tz, _dateutil_tzfile) and '.tar.gz' in tz._filename:
104104
tz._filename = zone
105105
else:
106-
tz = pytz.timezone(tz)
106+
if tz.startswith('+') or tz.startswith('-') or tz.startswith('UTC+') or tz.startswith('UTC-'):
107+
m = re.match(r'(?P<sign>[+-])(?P<hour>\d{2}):(?P<minutes>\d{2})', tz).groupdict()
108+
if m['sign'] == '-':
109+
tz = pytz.FixedOffset(-60 * int(m['hour']) + int(m['minutes']))
110+
else:
111+
tz = pytz.FixedOffset(60*int(m['hour']) + int(m['minutes']))
112+
else:
113+
tz = pytz.timezone(tz)
107114
elif is_integer_object(tz):
108115
tz = pytz.FixedOffset(tz / 60)
109116
elif isinstance(tz, tzinfo):

pandas/tests/io/test_parquet.py

+15
Original file line numberDiff line numberDiff line change
@@ -712,6 +712,12 @@ def test_timestamp_nanoseconds(self, pa):
712712
df = pd.DataFrame({"a": pd.date_range("2017-01-01", freq="1n", periods=10)})
713713
check_round_trip(df, pa, write_kwargs={"version": "2.0"})
714714

715+
@td.skip_if_no("pyarrow", min_version="0.14")
716+
def test_timezone_aware_index(self, pa):
717+
idx = [datetime.datetime.now(datetime.timezone.utc)]
718+
df = pd.DataFrame(index=idx)
719+
check_round_trip(df, pa, write_kwargs={"version": "2.0"})
720+
715721
@td.skip_if_no("pyarrow", min_version="0.17")
716722
def test_filter_row_groups(self, pa):
717723
# https://github.com/pandas-dev/pandas/issues/26551
@@ -850,3 +856,12 @@ def test_empty_dataframe(self, fp):
850856
expected = df.copy()
851857
expected.index.name = "index"
852858
check_round_trip(df, fp, expected=expected)
859+
860+
def test_timezone_aware_index(self, fp):
861+
idx = [
862+
datetime.datetime.strptime(
863+
"2019-01-04T16:41:24+0200", "%Y-%m-%dT%H:%M:%S%z"
864+
)
865+
]
866+
df = pd.DataFrame(index=idx)
867+
check_round_trip(df, fp)

0 commit comments

Comments
 (0)