Skip to content

Commit 1e03482

Browse files
committed
fi
1 parent fa3889b commit 1e03482

File tree

2 files changed

+1
-21
lines changed

2 files changed

+1
-21
lines changed

doc/source/whatsnew/v0.23.0.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@ Reshaping
502502
- Bug in :func:`Dataframe.pivot_table` which fails when the ``aggfunc`` arg is of type string. The behavior is now consistent with other methods like ``agg`` and ``apply`` (:issue:`18713`)
503503
- Bug in :func:`DataFrame.merge` in which merging using ``Index`` objects as vectors raised an Exception (:issue:`19038`)
504504
- Bug in :func:`DataFrame.stack`, :func:`DataFrame.unstack`, :func:`Series.unstack` which were not returning subclasses (:issue:`15563`)
505-
- Bug in timezone comparisons, manifesting as a conversion of the index to UTC when ``.reset_index()`` (:issue:`18523`)
505+
- Bug in timezone comparisons, manifesting as a conversion of the index to UTC in ``.concat()`` (:issue:`18523`)
506506
-
507507

508508
Numeric

pandas/tests/indexes/datetimes/test_construction.py

-20
Original file line numberDiff line numberDiff line change
@@ -443,26 +443,6 @@ def test_000constructor_resolution(self):
443443

444444
assert idx.nanosecond[0] == t1.nanosecond
445445

446-
def test_concat(self):
447-
idx1 = pd.date_range('2011-01-01', periods=3, freq='H',
448-
tz='Europe/Paris')
449-
idx2 = pd.date_range(start=idx1[0], end=idx1[-1], freq='H')
450-
df1 = pd.DataFrame({'a': [1, 2, 3]}, index=idx1)
451-
df2 = pd.DataFrame({'b': [1, 2, 3]}, index=idx2)
452-
res = pd.concat([df1, df2], axis=1)
453-
454-
assert str(res.index.tzinfo) == str(df1.index.tzinfo)
455-
assert str(res.index.tzinfo) == str(df2.index.tzinfo)
456-
457-
idx3 = pd.date_range('2011-01-01', periods=3,
458-
freq='H', tz='Asia/Tokyo')
459-
df3 = pd.DataFrame({'b': [1, 2, 3]}, index=idx3)
460-
res = pd.concat([df1, df3], axis=1)
461-
462-
assert str(res.index.tzinfo) == 'UTC'
463-
assert str(res.index.tzinfo) != str(df1.index.tzinfo)
464-
assert str(res.index.tzinfo) != str(df3.index.tzinfo)
465-
466446

467447
class TestTimeSeries(object):
468448

0 commit comments

Comments
 (0)